Skip to content

Replace pycryptodome with pycrypto #56039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dwoz merged 2 commits into from
Feb 1, 2020
Merged

Replace pycryptodome with pycrypto #56039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69a3d33
Replace pycryptodome with pycrypto
s0undt3ch Jan 31, 2020
ac90bb4
Allow pycrypto to be included in parsed requirements
s0undt3ch Jan 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ repos:
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/pytest.txt
- --remove-line=^pycrypto==(.*)$

- id: pip-tools-compile
alias: compile-darwin-py2.7-zmq-requirements
Expand All @@ -30,7 +29,6 @@ repos:
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/pytest.txt
- --remove-line=^pycrypto==(.*)$
- --passthrough-line-from-input=^pyobjc(.*)$

- id: pip-tools-compile
Expand All @@ -46,7 +44,6 @@ repos:
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/pytest.txt
- --remove-line=^pycrypto==(.*)$

- id: pip-tools-compile
alias: compile-cloud-py2.7-requirements
Expand Down Expand Up @@ -99,7 +96,6 @@ repos:
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/pytest.txt
- --remove-line=^pycrypto==(.*)$

- id: pip-tools-compile
alias: compile-cloud-py3.4-requirements
Expand Down Expand Up @@ -132,7 +128,6 @@ repos:
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/pytest.txt
- --remove-line=^pycrypto==(.*)$

- id: pip-tools-compile
alias: compile-darwin-py3.5-zmq-requirements
Expand All @@ -147,7 +142,6 @@ repos:
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/pytest.txt
- --remove-line=^pycrypto==(.*)$
- --passthrough-line-from-input=^pyobjc(.*)$

- id: pip-tools-compile
Expand All @@ -163,7 +157,6 @@ repos:
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/pytest.txt
- --remove-line=^pycrypto==(.*)$

- id: pip-tools-compile
alias: compile-cloud-py3.5-requirements
Expand Down Expand Up @@ -234,7 +227,6 @@ repos:
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/pytest.txt
- --remove-line=^pycrypto==(.*)$

- id: pip-tools-compile
alias: compile-darwin-py3.6-zmq-requirements
Expand All @@ -249,7 +241,6 @@ repos:
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/pytest.txt
- --remove-line=^pycrypto==(.*)$
- --passthrough-line-from-input=^pyobjc(.*)$

- id: pip-tools-compile
Expand All @@ -265,7 +256,6 @@ repos:
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/pytest.txt
- --remove-line=^pycrypto==(.*)$

- id: pip-tools-compile
alias: compile-cloud-py3.6-requirements
Expand Down Expand Up @@ -336,7 +326,6 @@ repos:
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/pytest.txt
- --remove-line=^pycrypto==(.*)$

- id: pip-tools-compile
alias: compile-darwin-py3.7-zmq-requirements
Expand All @@ -351,7 +340,6 @@ repos:
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/pytest.txt
- --remove-line=^pycrypto==(.*)$
- --passthrough-line-from-input=^pyobjc(.*)$

- id: pip-tools-compile
Expand All @@ -367,7 +355,6 @@ repos:
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/pytest.txt
- --remove-line=^pycrypto==(.*)$

- id: pip-tools-compile
alias: compile-cloud-py3.7-requirements
Expand Down
2 changes: 1 addition & 1 deletion requirements/crypto.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pycryptodome; sys.platform != 'win32'
pycrypto>=2.6.1; sys.platform not in 'win32,darwin'
pycryptodomex; sys.platform == 'win32'
3 changes: 0 additions & 3 deletions requirements/static/linux.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ more-itertools==5.0.0
moto
paramiko>=2.1.6
psutil
# Let's install pycryptodome instead of pycrypto because of pycrypto's outstanding security issues
# PyCrypto, if pulled, will be removed from the generated static requirements
pycryptodome
pygit2
pyinotify
pyopenssl
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/py2.7/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ pyaml==19.4.1 # via moto
pyasn1-modules==0.2.4 # via google-auth
pyasn1==0.4.5
pycparser==2.19
pycryptodome==3.8.1 ; sys_platform != "win32"
pycryptodome==3.8.1
pynacl==1.3.0 # via paramiko
pyopenssl==19.0.0
pyparsing==2.4.5 # via packaging
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/py2.7/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ pyaml==19.4.1 # via moto
pyasn1-modules==0.2.4 # via google-auth
pyasn1==0.4.5 # via paramiko, pyasn1-modules, rsa
pycparser==2.19 # via cffi
pycryptodome==3.8.1 ; sys_platform != "win32"
pycrypto==2.6.1 ; sys_platform not in "win32,darwin"
pycryptodome==3.8.1 # via python-jose
pygit2==0.28.2
pyinotify==0.9.6
pynacl==1.3.0 # via paramiko
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/py3.4/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ pyaml==19.4.1 # via moto
pyasn1-modules==0.2.4 # via google-auth
pyasn1==0.4.5 # via paramiko, pyasn1-modules, rsa
pycparser==2.19 # via cffi
pycryptodome==3.8.1 ; sys_platform != "win32"
pycrypto==2.6.1 ; sys_platform not in "win32,darwin"
pycryptodome==3.8.1 # via python-jose
pygit2==0.28.2
pyinotify==0.9.6
pynacl==1.3.0 # via paramiko
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/py3.5/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ pyaml==19.4.1 # via moto
pyasn1-modules==0.2.4 # via google-auth
pyasn1==0.4.5
pycparser==2.19
pycryptodome==3.8.1 ; sys_platform != "win32"
pycryptodome==3.8.1
pynacl==1.3.0 # via paramiko
pyopenssl==19.0.0
pyparsing==2.4.5 # via packaging
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/py3.5/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ pyaml==19.4.1 # via moto
pyasn1-modules==0.2.4 # via google-auth
pyasn1==0.4.5 # via paramiko, pyasn1-modules, rsa
pycparser==2.19 # via cffi
pycryptodome==3.8.1 ; sys_platform != "win32"
pycrypto==2.6.1 ; sys_platform not in "win32,darwin"
pycryptodome==3.8.1 # via python-jose
pygit2==0.28.2
pyinotify==0.9.6
pynacl==1.3.0 # via paramiko
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/py3.6/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ pyaml==19.4.1 # via moto
pyasn1-modules==0.2.4 # via google-auth
pyasn1==0.4.5
pycparser==2.19
pycryptodome==3.8.1 ; sys_platform != "win32"
pycryptodome==3.8.1
pynacl==1.3.0 # via paramiko
pyopenssl==19.0.0
pyparsing==2.4.5 # via packaging
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/py3.6/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ pyaml==19.4.1 # via moto
pyasn1-modules==0.2.4 # via google-auth
pyasn1==0.4.5 # via paramiko, pyasn1-modules, rsa
pycparser==2.19 # via cffi
pycryptodome==3.8.1 ; sys_platform != "win32"
pycrypto==2.6.1 ; sys_platform not in "win32,darwin"
pycryptodome==3.8.1 # via python-jose
pygit2==0.28.2
pyinotify==0.9.6
pynacl==1.3.0 # via paramiko
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/py3.7/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ pyaml==19.4.1 # via moto
pyasn1-modules==0.2.4 # via google-auth
pyasn1==0.4.5
pycparser==2.19
pycryptodome==3.8.1 ; sys_platform != "win32"
pycryptodome==3.8.1
pynacl==1.3.0 # via paramiko
pyopenssl==19.0.0
pyparsing==2.4.5 # via packaging
Expand Down
4 changes: 3 additions & 1 deletion requirements/static/py3.7/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ atomicwrites==1.3.0 # via pytest
attrs==19.1.0 # via pytest
aws-xray-sdk==0.95 # via moto
backports.functools-lru-cache==1.5 # via cheroot
backports.ssl-match-hostname==3.7.0.1 # via websocket-client
bcrypt==3.1.6 # via paramiko
boto3==1.9.132
boto==2.49.0
Expand Down Expand Up @@ -73,7 +74,8 @@ pyaml==19.4.1 # via moto
pyasn1-modules==0.2.4 # via google-auth
pyasn1==0.4.5 # via paramiko, pyasn1-modules, rsa
pycparser==2.19 # via cffi
pycryptodome==3.8.1 ; sys_platform != "win32"
pycrypto==2.6.1 ; sys_platform not in "win32,darwin"
pycryptodome==3.8.1 # via python-jose
pygit2==0.28.2
pyinotify==0.9.6
pynacl==1.3.0 # via paramiko
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ def _parse_requirements_file(requirements_file):
except ValueError:
pkg, pyverspec = line, ''
pyverspec = pyverspec.strip()
if pyverspec:
if pyverspec and (not pkg.startswith('pycrypto') or pkg.startswith('pycryptodome')):
_, op, ver = pyverspec.split(' ', 2)
if not _check_ver(platform.python_version(), _parse_op(op), _parse_ver(ver)):
continue
Expand Down