Skip to content

Commit 60f4da3

Browse files
authored
Merge pull request #43 from hugovk/update-versions
BLD/TST: Update Python versions
2 parents eaa0f63 + 5dc55d8 commit 60f4da3

File tree

5 files changed

+10
-259
lines changed

5 files changed

+10
-259
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ matrix:
55
- python: 2.7
66
- python: 3.4
77
- python: 3.5
8+
- python: 3.6
89
- python: "nightly"
910
env: PRE=--pre
1011
allow_failures:

appveyor.yml

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,25 @@
22
# Windows
33

44
environment:
5-
global:
6-
# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
7-
# /E:ON and /V:ON options are not enabled in the batch script intepreter
8-
# See: https://stackoverflow.com/a/13751649/163740
9-
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci\\appveyor\\run_with_env.cmd"
10-
115
matrix:
12-
- PYTHON: "C:\\Python27_32"
13-
PYTHON_VERSION: "2.7"
14-
PYTHON_ARCH: "32"
15-
16-
- PYTHON: "C:\\Python27_64"
17-
PYTHON_VERSION: "2.7"
18-
PYTHON_ARCH: "64"
19-
20-
- PYTHON: "C:\\Python34_32"
21-
PYTHON_VERSION: "3.4.3"
22-
PYTHON_ARCH: "32"
23-
24-
- PYTHON: "C:\\Python34_64"
25-
PYTHON_VERSION: "3.4.3"
26-
PYTHON_ARCH: "64"
27-
6+
- PYTHON: "C:\\Python27"
7+
- PYTHON: "C:\\Python27-x64"
8+
- PYTHON: "C:\\Python34"
9+
- PYTHON: "C:\\Python34-x64"
2810
- PYTHON: "C:\\Python35"
29-
PYTHON_VERSION: "3.5.0"
30-
PYTHON_ARCH: "32"
31-
3211
- PYTHON: "C:\\Python35-x64"
33-
PYTHON_VERSION: "3.5.0"
34-
PYTHON_ARCH: "64"
12+
- PYTHON: "C:\\Python36"
13+
- PYTHON: "C:\\Python36-x64"
3514

3615
install:
37-
# Install Python (from the official .msi of https://python.org) and pip when
38-
# not already installed.
39-
- "powershell ./ci/appveyor/install.ps1"
4016
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
4117

4218
# Check that we have the expected version and architecture for Python
4319
- "python --version"
4420
- "python -c \"import struct; print(struct.calcsize('P') * 8)\""
4521

4622
# Install the build and runtime dependencies of the project.
47-
- "%CMD_IN_ENV% pip install -v six nose pytest pytest-cov coverage"
23+
- "pip install -v six nose pytest pytest-cov coverage"
4824

4925
# Install the generated wheel package to test it
5026
- "python setup.py install"

ci/appveyor/install.ps1

Lines changed: 0 additions & 180 deletions
This file was deleted.

ci/appveyor/run_with_env.cmd

Lines changed: 0 additions & 47 deletions
This file was deleted.

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
platforms='Cross platform (Linux, Mac OSX, Windows)',
1111
install_requires=['six'],
1212
license="BSD",
13+
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
1314
classifiers=['Development Status :: 4 - Beta',
1415
'Programming Language :: Python :: 2',
1516
'Programming Language :: Python :: 2.7',
1617
'Programming Language :: Python :: 3',
17-
'Programming Language :: Python :: 3.3',
1818
'Programming Language :: Python :: 3.4',
1919
'Programming Language :: Python :: 3.5',
20+
'Programming Language :: Python :: 3.6',
2021
],
2122
keywords='cycle kwargs',
2223
)

0 commit comments

Comments
 (0)