- removed Python 3.2 from CI/unit tests and list of supported interpreters
- bumped minimum cryptography version to 1.1 - added missing pyasn1 line from requirements in README [skip ci]
This commit is contained in:
@@ -3,7 +3,6 @@ python:
|
||||
- "3.5"
|
||||
- "3.4"
|
||||
- "3.3"
|
||||
- "3.2"
|
||||
- "2.7"
|
||||
- "pypy"
|
||||
- "pypy3"
|
||||
@@ -21,9 +20,6 @@ matrix:
|
||||
# add a test of setup.py using python 3.3
|
||||
- python: 3.3
|
||||
env: TOXENV=setup33
|
||||
# add a test of setup.py using python 3.2
|
||||
- python: 3.2
|
||||
env: TOXENV=setup32
|
||||
# add a setup.py test using python 2.7
|
||||
- python: 2.7
|
||||
env: TOXENV=setup27
|
||||
|
||||
@@ -41,9 +41,9 @@ Documentation
|
||||
Requirements
|
||||
------------
|
||||
|
||||
- Python >= 2.7
|
||||
- Python 3 >= 3.3; Python 2 >= 2.7
|
||||
|
||||
Tested with: 3.4, 3.3, 3.2, 2.7
|
||||
Tested with: 3.5, 3.4, 3.3, 2.7
|
||||
|
||||
- `Cryptography <https://pypi.python.org/pypi/cryptography>`_
|
||||
|
||||
@@ -51,6 +51,8 @@ Requirements
|
||||
|
||||
- `singledispatch <https://pypi.python.org/pypi/singledispatch>`_
|
||||
|
||||
- `pyasn1 <https://pypi.python.org/pypi/pyasn1/>`_
|
||||
|
||||
- `six <https://pypi.python.org/pypi/six>`_
|
||||
|
||||
License
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
cryptography>=0.8
|
||||
cryptography>=1.1
|
||||
enum34
|
||||
pyasn1
|
||||
six>=1.7.2
|
||||
|
||||
2
setup.py
2
setup.py
@@ -58,9 +58,9 @@ setup(
|
||||
'Operating System :: Microsoft :: Windows',
|
||||
'Intended Audience :: Developers',
|
||||
'Programming Language :: Python',
|
||||
'Programming Language :: Python :: 3.5',
|
||||
'Programming Language :: Python :: 3.4',
|
||||
'Programming Language :: Python :: 3.3',
|
||||
'Programming Language :: Python :: 3.2',
|
||||
'Programming Language :: Python :: 2.7',
|
||||
'Programming Language :: Python :: Implementation :: CPython',
|
||||
'Topic :: Security',
|
||||
|
||||
16
tox.ini
16
tox.ini
@@ -1,5 +1,5 @@
|
||||
[tox]
|
||||
envlist = pypy, pypy3, py27, py32, py33, py34, py35, pep8, setup35, setup34, setup33, setup32, setup27
|
||||
envlist = pypy, pypy3, py27, py33, py34, py35, pep8, setup35, setup34, setup33, setup27
|
||||
skipsdist = True
|
||||
|
||||
[pytest]
|
||||
@@ -15,18 +15,14 @@ max-line-length = 160
|
||||
passenv = HOME ARCHFLAGS LDFLAGS CFLAGS INCLUDE LIB LD_LIBRARY_PATH PATH
|
||||
deps =
|
||||
# deps for everything
|
||||
cryptography>=1.1
|
||||
enum34
|
||||
pyasn1
|
||||
six>=1.7.2
|
||||
singledispatch
|
||||
pytest
|
||||
pytest-cov
|
||||
# deps for python != 3.2
|
||||
py{py,py3,27,33,34,35}: cryptography>=0.8
|
||||
# py32 is getting annoying to support
|
||||
py32: cryptography>=0.8,<0.9
|
||||
py32: cffi<=1.1.0
|
||||
py32: coverage<=3.7.1
|
||||
|
||||
install_command = pip install {opts} --no-cache-dir {packages}
|
||||
commands =
|
||||
py.test --cov pgpy --cov-report term-missing tests/
|
||||
@@ -55,12 +51,6 @@ basepython = python3.3
|
||||
whitelist_externals = {[test-setup]whitelist_externals}
|
||||
commands = {[test-setup]commands}
|
||||
|
||||
[testenv:setup32]
|
||||
recreate = True
|
||||
basepython = python3.2
|
||||
whitelist_externals = {[test-setup]whitelist_externals}
|
||||
commands = {[test-setup]commands}
|
||||
|
||||
[testenv:setup27]
|
||||
recreate = True
|
||||
deps = pip
|
||||
|
||||
Reference in New Issue
Block a user