Skip to content

Commit f71d1cf

Browse files
committed
Update deps for 3.3 & 3.7 support
Signed-off-by: Joffrey F <[email protected]>
1 parent dac943a commit f71d1cf

File tree

5 files changed

+19
-7
lines changed

5 files changed

+19
-7
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ matrix:
1010
env: TOXENV=py35
1111
- python: 3.6
1212
env: TOXENV=py36
13+
- python: 3.7
14+
env: TOXENV=py37
15+
dist: xenial
16+
sudo: true
1317
- env: TOXENV=flake8
1418

1519
install:

requirements.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ appdirs==1.4.3
22
asn1crypto==0.22.0
33
backports.ssl-match-hostname==3.5.0.1
44
cffi==1.10.0
5-
cryptography==1.9
5+
cryptography==1.9; python_version == '3.3'
6+
cryptography==2.3; python_version > '3.3'
67
docker-pycreds==0.3.0
78
enum34==1.1.6
89
idna==2.5
@@ -12,7 +13,8 @@ pycparser==2.17
1213
pyOpenSSL==17.0.0
1314
pyparsing==2.2.0
1415
pypiwin32==219; sys_platform == 'win32' and python_version < '3.6'
15-
pypiwin32==220; sys_platform == 'win32' and python_version >= '3.6'
16+
pypiwin32==223; sys_platform == 'win32' and python_version >= '3.6'
1617
requests==2.14.2
1718
six==1.10.0
1819
websocket-client==0.40.0
20+
urllib3==1.21.1; python_version == '3.3'

setup.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
SOURCE_DIR = os.path.join(ROOT_DIR)
1111

1212
requirements = [
13-
'requests >= 2.14.2, != 2.18.0',
1413
'six >= 1.4.0',
1514
'websocket-client >= 0.32.0',
16-
'docker-pycreds >= 0.3.0'
15+
'docker-pycreds >= 0.3.0',
16+
'requests >= 2.14.2, != 2.18.0',
1717
]
1818

1919
extras_require = {
@@ -27,7 +27,10 @@
2727
# Python 3.6 is only compatible with v220 ; Python < 3.5 is not supported
2828
# on v220 ; ALL versions are broken for v222 (as of 2018-01-26)
2929
':sys_platform == "win32" and python_version < "3.6"': 'pypiwin32==219',
30-
':sys_platform == "win32" and python_version >= "3.6"': 'pypiwin32==220',
30+
':sys_platform == "win32" and python_version >= "3.6"': 'pypiwin32==223',
31+
32+
# urllib3 drops support for Python 3.3 in 1.23
33+
':python_version == "3.3"': 'urllib3 < 1.23',
3134

3235
# If using docker-py over TLS, highly recommend this option is
3336
# pip-installed or pinned.
@@ -38,6 +41,7 @@
3841
# installing the extra dependencies, install the following instead:
3942
# 'requests[security] >= 2.5.2, != 2.11.0, != 2.12.2'
4043
'tls': ['pyOpenSSL>=0.14', 'cryptography>=1.3.4', 'idna>=2.0.0'],
44+
4145
}
4246

4347
version = None
@@ -81,6 +85,7 @@
8185
'Programming Language :: Python :: 3.4',
8286
'Programming Language :: Python :: 3.5',
8387
'Programming Language :: Python :: 3.6',
88+
'Programming Language :: Python :: 3.7',
8489
'Topic :: Utilities',
8590
'License :: OSI Approved :: Apache Software License',
8691
],

test-requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
coverage==3.7.1
22
flake8==3.4.1
33
mock==1.0.1
4-
pytest==2.9.1
4+
pytest==2.9.1; python_version == '3.3'
5+
pytest==3.6.3; python_version > '3.3'
56
pytest-cov==2.1.0
67
pytest-timeout==1.2.1

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py27, py33, py34, py35, py36, flake8
2+
envlist = py27, py34, py35, py36, py37, flake8
33
skipsdist=True
44

55
[testenv]

0 commit comments

Comments
 (0)