Add Python 3.8 to tests and drop Python 2.7 and 3.4 support
This commit is contained in:
19
.travis.yml
19
.travis.yml
@@ -4,11 +4,10 @@ os:
|
||||
# - osx
|
||||
language: python
|
||||
python:
|
||||
- "3.8"
|
||||
- "3.7"
|
||||
- "3.6"
|
||||
- "3.5"
|
||||
- "3.4"
|
||||
- "2.7"
|
||||
- "pypy"
|
||||
- "pypy3"
|
||||
jobs:
|
||||
@@ -18,6 +17,9 @@ jobs:
|
||||
env: TOXENV=pep8
|
||||
|
||||
# test setup.py using each tested version
|
||||
- python: 3.8
|
||||
env: TOXENV=setup38
|
||||
|
||||
- python: 3.7
|
||||
env: TOXENV=setup37
|
||||
|
||||
@@ -27,19 +29,10 @@ jobs:
|
||||
- python: 3.5
|
||||
env: TOXENV=setup35
|
||||
|
||||
- python: 3.4
|
||||
env: TOXENV=setup34
|
||||
|
||||
- python: 2.7
|
||||
env: TOXENV=setup27
|
||||
|
||||
# do some tests with LC_ALL=C to check for locale variance
|
||||
- python: 3.6
|
||||
env: LC_ALL=C
|
||||
|
||||
- python: 2.7
|
||||
env: LC_ALL=C
|
||||
|
||||
allow_failures:
|
||||
# pep8 failures shouldn't be considered fatal
|
||||
- env: TOXENV=pep8
|
||||
@@ -53,8 +46,8 @@ jobs:
|
||||
install:
|
||||
- sed -i -e 's/^/#/' tests/gnupghome/gpg-agent.conf
|
||||
- ./install_dependencies.${TRAVIS_OS_NAME}.sh
|
||||
# ensure tox and coveralls are installed. pin PyYAML until we drop Python 3.4
|
||||
- pip install tox python-coveralls 'PyYAML==5.2; python_version == "3.4"'
|
||||
# ensure tox and coveralls are installed
|
||||
- pip install tox python-coveralls
|
||||
|
||||
# set TOXENV if it isn't yet
|
||||
before_script:
|
||||
|
||||
@@ -15,4 +15,4 @@ __all__ = ['__author__',
|
||||
__author__ = "Michael Greene"
|
||||
__copyright__ = "Copyright (c) 2014-2019 Security Innovation, Inc"
|
||||
__license__ = "BSD"
|
||||
__version__ = str(LooseVersion("0.5.3"))
|
||||
__version__ = str(LooseVersion("0.6.0-alpha"))
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
cryptography>=2.6
|
||||
enum34; python_version < '3.4'
|
||||
pyasn1
|
||||
six>=1.9.0
|
||||
singledispatch; python_version < '3.4'
|
||||
|
||||
@@ -15,11 +15,10 @@ classifiers =
|
||||
Operating System :: Microsoft :: Windows
|
||||
Intended Audience :: Developers
|
||||
Programming Language :: Python
|
||||
Programming Language :: Python :: 3.8
|
||||
Programming Language :: Python :: 3.7
|
||||
Programming Language :: Python :: 3.6
|
||||
Programming Language :: Python :: 3.5
|
||||
Programming Language :: Python :: 3.4
|
||||
Programming Language :: Python :: 2.7
|
||||
Programming Language :: Python :: Implementation :: CPython
|
||||
Topic :: Security
|
||||
Topic :: Security :: Cryptography
|
||||
@@ -36,12 +35,10 @@ install_requires =
|
||||
cryptography>=2.6
|
||||
pyasn1
|
||||
six>=1.9.0
|
||||
singledispatch; python_version < '3.4'
|
||||
enum34; python_version < '3.4'
|
||||
setup_requires =
|
||||
setuptools
|
||||
wheel
|
||||
python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
|
||||
python_requires = >=3.5
|
||||
|
||||
# doc_requires =
|
||||
# sphinx
|
||||
|
||||
25
tox.ini
25
tox.ini
@@ -1,5 +1,5 @@
|
||||
[tox]
|
||||
envlist = pypy, pypy3, py27, py34, py35, py36, py37, pep8, setup37, setup36, setup35, setup34, setup27
|
||||
envlist = pypy, pypy3, py35, py36, py37, py38, pep8, setup38, setup37, setup36, setup35
|
||||
skipsdist = True
|
||||
|
||||
[pytest]
|
||||
@@ -18,11 +18,9 @@ max-line-length = 160
|
||||
passenv = HOME ARCHFLAGS LDFLAGS CFLAGS INCLUDE LIB LD_LIBRARY_PATH PATH
|
||||
deps =
|
||||
cryptography>=2.6
|
||||
enum34
|
||||
gpg==1.10.0
|
||||
pyasn1
|
||||
six>=1.9.0
|
||||
singledispatch
|
||||
pytest
|
||||
pytest-cov
|
||||
pytest-ordering
|
||||
@@ -38,6 +36,13 @@ commands =
|
||||
pip install -e .
|
||||
rm -rf PGPy.egg-info
|
||||
|
||||
[testenv:setup38]
|
||||
recreate = True
|
||||
basepython = python3.7
|
||||
whitelist_externals = {[test-setup]whitelist_externals}
|
||||
deps =
|
||||
commands = {[test-setup]commands}
|
||||
|
||||
[testenv:setup37]
|
||||
recreate = True
|
||||
basepython = python3.7
|
||||
@@ -59,20 +64,6 @@ whitelist_externals = {[test-setup]whitelist_externals}
|
||||
deps =
|
||||
commands = {[test-setup]commands}
|
||||
|
||||
[testenv:setup34]
|
||||
recreate = True
|
||||
basepython = python3.4
|
||||
whitelist_externals = {[test-setup]whitelist_externals}
|
||||
deps =
|
||||
commands = {[test-setup]commands}
|
||||
|
||||
[testenv:setup27]
|
||||
recreate = True
|
||||
deps = pip
|
||||
basepython = python2.7
|
||||
whitelist_externals = {[test-setup]whitelist_externals}
|
||||
commands = {[test-setup]commands}
|
||||
|
||||
[testenv:pep8]
|
||||
basepython = python3.6
|
||||
deps =
|
||||
|
||||
Reference in New Issue
Block a user