Skip to content

Commit

Permalink
Fixed cryptography install
Browse files Browse the repository at this point in the history
Signed-off-by: Andreas Maier <andreas.r.maier@gmx.de>
  • Loading branch information
andy-maier committed Mar 28, 2021
1 parent 186b2d0 commit 09b5313
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 10 deletions.
2 changes: 1 addition & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ safety>=1.9.0; python_version >= '3.5'
# Pip 19.1.1 does not recognize that dparse 0.5.0 has dropped support for Python 3.4
dparse>=0.4.1,<0.5.0; python_version == '2.7'
dparse>=0.4.1,<0.5.0; python_version == '3.4'
dparse>=0.4.1; python_version >= '3.5'
dparse>=0.5.1; python_version >= '3.5'

# PyYAML is pulled in by dparse and python-coveralls, and is already covered in
# requirements.txt. For Python 3.4, the pip version used (19.1.1) updates
Expand Down
34 changes: 27 additions & 7 deletions minimum-constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,27 @@
# for a particular Python version.
# On pypy3 (py36), pip 18.0 is needed to support constraints like cffi!=1.11.3,>=1.8
# pip 10.0.0 introduced the --exclude-editable option.
# pip before 21.0 cannot install cryptography on py39
pip==10.0.1; python_version <= '3.5'
pip==18.0; python_version == '3.6'
pip==18.1; python_version == '3.7'
pip==19.3.1; python_version >= '3.8'
# pip==19.3.1; python_version >= '3.8'
# TODO: Try latest setuptools on py39
pip==19.3.1; python_version == '3.8'
pip==21.0; python_version >= '3.9'
setuptools==39.0.1; python_version <= '3.6'
setuptools==40.6.0; python_version == '3.7'
setuptools==41.5.0; python_version >= '3.8'
# setuptools==41.5.0; python_version >= '3.8'
# TODO: Try latest setuptools on py39
setuptools==41.5.0; python_version == '3.8'
setuptools==51.0.0; python_version >= '3.9'
# setuptools==54.2.0; python_version >= '3.9'
wheel==0.30.0; python_version <= '3.6'
wheel==0.32.0; python_version == '3.7'
wheel==0.33.5; python_version >= '3.8'

# wheel==0.33.5; python_version >= '3.8'
# TODO: Try latest wheel on py39
wheel==0.33.5; python_version == '3.8'
wheel==0.36.2; python_version >= '3.9'

# Direct dependencies for installation (must be consistent with requirements.txt)

Expand All @@ -88,8 +98,15 @@ wheel==0.33.5; python_version >= '3.8'
# tox 3.17 requires six>=1.14.0
six==1.14.0

cryptography==3.4.0
cryptography==3.3; python_version == '2.7'
cryptography==2.8; python_version == '3.4'
cryptography==3.2.1; python_version == '3.5'
cryptography==3.4.7; python_version >= '3.6'

keyring==18.0.0
# TODO: Try latest keyring on py39
# keyring==18.0.0; python_version <= '3.8'
# keyring==23.0.1; python_version >= '3.9'

# PyYAML is also pulled in by dparse and python-coveralls
PyYAML==5.3.1; python_version == '2.7'
Expand All @@ -100,6 +117,9 @@ yamlloader==0.5.5

# Indirect dependencies for installation (must be consistent with requirements.txt, if present)

pywin32-ctypes==0.2.0; sys_platform == 'win32'
cffi==1.14.5


# Direct dependencies for development (must be consistent with dev-requirements.txt)

Expand All @@ -124,7 +144,8 @@ coveralls==2.1.2; python_version >= '3.5'
# Safety CI by pyup.io
safety==1.8.7; python_version <= '3.4'
safety==1.9.0; python_version >= '3.5'
dparse==0.4.1
dparse==0.4.1; python_version <= '3.4'
dparse==0.5.1; python_version >= '3.5'

# Sphinx (no imports, invoked via sphinx-build script):
Sphinx==1.7.6
Expand Down Expand Up @@ -220,7 +241,6 @@ importlib-metadata==0.12; python_version <= '3.7'
iniconfig==1.1.1
isort==4.2.15
Jinja2==2.8
keyring==17.0.0; python_version >= '3.4'
lazy-object-proxy==1.4.2
MarkupSafe==0.23
ordereddict==1.1
Expand Down
19 changes: 17 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,20 @@
# tox 3.17 requires six>=1.14.0
six>=1.14.0

cryptography>=3.4.0
keyring>=18.0.0
# cryptography 2.9 removed support for Python 3.4
# cryptography 3.3 removed support for Python 3.5
# cryptography 3.4 removed support for Python 2.7
cryptography>=3.3,<3.4; python_version == '2.7'
cryptography>=2.8,<2.9; python_version == '3.4'
cryptography>=3.2.1,<3.3; python_version == '3.5'
cryptography>=3.4.7; python_version >= '3.6'

# keyring 19.0.0 removed support for Python 2.7 + 3.4
# keyring 21.0.0 removed support for Python 3.5
keyring>=18.0.0,<19.0.0; python_version == '2.7'
keyring>=18.0.0,<19.0.0; python_version == '3.4'
keyring>=18.0.0,<21.0.0; python_version == '3.5'
keyring>=18.0.0; python_version >= '3.6'

# PyYAML 5.3 removed support for Python 3.4
# PyYAML 5.3 fixed narrow build error on Python 2.7
Expand All @@ -34,3 +46,6 @@ yamlloader>=0.5.5


# Indirect dependencies are not specified in this file, except when needed:

pywin32-ctypes>=0.2.0; sys_platform == 'win32'
cffi>=1.14.5

0 comments on commit 09b5313

Please sign in to comment.