Skip to content

Commit

Permalink
Merge pull request #569 from Carreau/nep-29
Browse files Browse the repository at this point in the history
  • Loading branch information
Carreau committed Jun 17, 2020
2 parents 7af90e7 + 8119130 commit 2848497
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 20 deletions.
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ python:
- "nightly"
- 3.8
- 3.7
- 3.6
- 3.5
- 2.7
install:
- pip install --upgrade pip
- pip install .
Expand Down
14 changes: 8 additions & 6 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,20 @@ build: false

environment:
matrix:
- PYTHON: "C:\\Python36-x64"
PYTHON_VERSION: "3.6.x"

- PYTHON: "C:\\Python37-x64"
PYTHON_VERSION: "3.7.x"
PYTHON_ARCH: "64"

- PYTHON: "C:\\Python34-x64"
PYTHON_VERSION: "3.4.x"
- PYTHON: "C:\\Python38"
PYTHON_VERSION: "3.8.x"
PYTHON_ARCH: "32"

- PYTHON: "C:\\Python27-x64"
PYTHON_VERSION: "2.7.x"
- PYTHON: "C:\\Python38-x64"
PYTHON_VERSION: "3.8.x"
PYTHON_ARCH: "64"


init:
- "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"

Expand Down
14 changes: 3 additions & 11 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import sys

v = sys.version_info
if v[:2] < (2,7) or (v[0] >= 3 and v[:2] < (3,4)):
error = "ERROR: %s requires Python version 2.7 or 3.4 or above." % name
if v[:2] < (3,7):
error = "ERROR: %s requires Python version 3.7 or above." % name
print(error, file=sys.stderr)
sys.exit(1)

Expand Down Expand Up @@ -59,18 +59,14 @@
license = 'BSD',
platforms = "Linux, Mac OS X, Windows",
keywords = ['Interactive', 'Interpreter', 'Shell', 'Web'],
python_requires = '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
python_requires = '>=3.7',
classifiers = [
'Intended Audience :: Developers',
'Intended Audience :: System Administrators',
'Intended Audience :: Science/Research',
'License :: OSI Approved :: BSD License',
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
],
)

Expand All @@ -87,10 +83,6 @@

extras_require = setuptools_args['extras_require'] = {
'test': ['pytest'],
'test:python_version=="2.7"': ["mock"],
# -- SUPPORT UNIFORM-WHEELS: Extra packages for Python 2.7
# SEE: https://bitbucket.org/pypa/wheel/ , CHANGES.txt (v0.24.0)
':python_version=="2.7"': ["enum34"],
}

if 'setuptools' in sys.modules:
Expand Down

0 comments on commit 2848497

Please sign in to comment.