diff --git a/.ci/kitchen-centos7-py3-pycryptodome b/.ci/kitchen-centos7-py3-pycryptodome new file mode 100644 index 000000000000..c93570cba7d5 --- /dev/null +++ b/.ci/kitchen-centos7-py3-pycryptodome @@ -0,0 +1,16 @@ +@Library('salt@master-1.7') _ + +runTestSuite( + concurrent_builds: 1, + distro_name: 'centos', + distro_version: '7', + env: env, + golden_images_branch: 'master', + jenkins_slave_label: 'kitchen-slave', + nox_env_name: 'runtests-zeromq-pycryptodome', + nox_passthrough_opts: '--ssh-tests', + python_version: 'py3', + testrun_timeout: 6, + use_spot_instances: true) + +// vim: ft=groovy diff --git a/.ci/kitchen-centos7-py3-pycryptodomex b/.ci/kitchen-centos7-py3-pycryptodomex index 836ee316a633..c93570cba7d5 100644 --- a/.ci/kitchen-centos7-py3-pycryptodomex +++ b/.ci/kitchen-centos7-py3-pycryptodomex @@ -7,7 +7,7 @@ runTestSuite( env: env, golden_images_branch: 'master', jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-zeromq-pycryptodomex', + nox_env_name: 'runtests-zeromq-pycryptodome', nox_passthrough_opts: '--ssh-tests', python_version: 'py3', testrun_timeout: 6, diff --git a/.ci/kitchen-ubuntu1604-py3-pycryptodome b/.ci/kitchen-ubuntu1604-py3-pycryptodome new file mode 100644 index 000000000000..024614c04599 --- /dev/null +++ b/.ci/kitchen-ubuntu1604-py3-pycryptodome @@ -0,0 +1,16 @@ +@Library('salt@master-1.7') _ + +runTestSuite( + concurrent_builds: 1, + distro_name: 'ubuntu', + distro_version: '1604', + env: env, + golden_images_branch: 'master', + jenkins_slave_label: 'kitchen-slave', + nox_env_name: 'runtests-zeromq-pycryptodome', + nox_passthrough_opts: '--ssh-tests', + python_version: 'py3', + testrun_timeout: 6, + use_spot_instances: true) + +// vim: ft=groovy diff --git a/.ci/kitchen-ubuntu1604-py3-pycryptodomex b/.ci/kitchen-ubuntu1604-py3-pycryptodomex index efae604860c0..024614c04599 100644 --- a/.ci/kitchen-ubuntu1604-py3-pycryptodomex +++ b/.ci/kitchen-ubuntu1604-py3-pycryptodomex @@ -7,7 +7,7 @@ runTestSuite( env: env, golden_images_branch: 'master', jenkins_slave_label: 'kitchen-slave', - nox_env_name: 'runtests-zeromq-pycryptodomex', + nox_env_name: 'runtests-zeromq-pycryptodome', nox_passthrough_opts: '--ssh-tests', python_version: 'py3', testrun_timeout: 6, diff --git a/noxfile.py b/noxfile.py index 886004ecae7b..cbc931627493 100644 --- a/noxfile.py +++ b/noxfile.py @@ -489,24 +489,22 @@ def _runtests(session, coverage, cmd_args): @nox.session(python=_PYTHON_VERSIONS, name="runtests-parametrized") @nox.parametrize("coverage", [False, True]) @nox.parametrize("transport", ["zeromq", "tcp"]) -@nox.parametrize("crypto", [None, "m2crypto", "pycryptodomex"]) +@nox.parametrize("crypto", [None, "m2crypto", "pycryptodome"]) def runtests_parametrized(session, coverage, transport, crypto): # Install requirements _install_requirements(session, transport, "unittest-xml-reporting==2.5.2") if crypto: - if crypto == "m2crypto": - session.run( - "pip", - "uninstall", - "-y", - "pycrypto", - "pycryptodome", - "pycryptodomex", - silent=True, - ) - else: - session.run("pip", "uninstall", "-y", "m2crypto", silent=True) + session.run( + "pip", + "uninstall", + "-y", + "m2crypto", + "pycrypto", + "pycryptodome", + "pycryptodomex", + silent=True, + ) distro_constraints = _get_distro_pip_constraints(session, transport) install_command = [ "--progress-bar=off", @@ -601,40 +599,40 @@ def runtests_zeromq_m2crypto(session, coverage): ) -@nox.session(python=_PYTHON_VERSIONS, name="runtests-pycryptodomex") +@nox.session(python=_PYTHON_VERSIONS, name="runtests-pycryptodome") @nox.parametrize("coverage", [False, True]) -def runtests_pycryptodomex(session, coverage): +def runtests_pycryptodome(session, coverage): """ - runtests.py session with zeromq transport and pycryptodomex + runtests.py session with zeromq transport and pycryptodome """ session.notify( - "runtests-parametrized-{}(coverage={}, crypto='pycryptodomex', transport='zeromq')".format( + "runtests-parametrized-{}(coverage={}, crypto='pycryptodome', transport='zeromq')".format( session.python, coverage ) ) -@nox.session(python=_PYTHON_VERSIONS, name="runtests-tcp-pycryptodomex") +@nox.session(python=_PYTHON_VERSIONS, name="runtests-tcp-pycryptodome") @nox.parametrize("coverage", [False, True]) -def runtests_tcp_pycryptodomex(session, coverage): +def runtests_tcp_pycryptodome(session, coverage): """ - runtests.py session with TCP transport and pycryptodomex + runtests.py session with TCP transport and pycryptodome """ session.notify( - "runtests-parametrized-{}(coverage={}, crypto='pycryptodomex', transport='tcp')".format( + "runtests-parametrized-{}(coverage={}, crypto='pycryptodome', transport='tcp')".format( session.python, coverage ) ) -@nox.session(python=_PYTHON_VERSIONS, name="runtests-zeromq-pycryptodomex") +@nox.session(python=_PYTHON_VERSIONS, name="runtests-zeromq-pycryptodome") @nox.parametrize("coverage", [False, True]) -def runtests_zeromq_pycryptodomex(session, coverage): +def runtests_zeromq_pycryptodome(session, coverage): """ - runtests.py session with zeromq transport and pycryptodomex + runtests.py session with zeromq transport and pycryptodome """ session.notify( - "runtests-parametrized-{}(coverage={}, crypto='pycryptodomex', transport='zeromq')".format( + "runtests-parametrized-{}(coverage={}, crypto='pycryptodome', transport='zeromq')".format( session.python, coverage ) ) @@ -675,24 +673,22 @@ def runtests_tornado(session, coverage): @nox.session(python=_PYTHON_VERSIONS, name="pytest-parametrized") @nox.parametrize("coverage", [False, True]) @nox.parametrize("transport", ["zeromq", "tcp"]) -@nox.parametrize("crypto", [None, "m2crypto", "pycryptodomex"]) +@nox.parametrize("crypto", [None, "m2crypto", "pycryptodome"]) def pytest_parametrized(session, coverage, transport, crypto): # Install requirements _install_requirements(session, transport) if crypto: - if crypto == "m2crypto": - session.run( - "pip", - "uninstall", - "-y", - "pycrypto", - "pycryptodome", - "pycryptodomex", - silent=True, - ) - else: - session.run("pip", "uninstall", "-y", "m2crypto", silent=True) + session.run( + "pip", + "uninstall", + "-y", + "m2crypto", + "pycrypto", + "pycryptodome", + "pycryptodomex", + silent=True, + ) distro_constraints = _get_distro_pip_constraints(session, transport) install_command = [ "--progress-bar=off", @@ -793,40 +789,40 @@ def pytest_zeromq_m2crypto(session, coverage): ) -@nox.session(python=_PYTHON_VERSIONS, name="pytest-pycryptodomex") +@nox.session(python=_PYTHON_VERSIONS, name="pytest-pycryptodome") @nox.parametrize("coverage", [False, True]) -def pytest_pycryptodomex(session, coverage): +def pytest_pycryptodome(session, coverage): """ - pytest session with zeromq transport and pycryptodomex + pytest session with zeromq transport and pycryptodome """ session.notify( - "pytest-parametrized-{}(coverage={}, crypto='pycryptodomex', transport='zeromq')".format( + "pytest-parametrized-{}(coverage={}, crypto='pycryptodome', transport='zeromq')".format( session.python, coverage ) ) -@nox.session(python=_PYTHON_VERSIONS, name="pytest-tcp-pycryptodomex") +@nox.session(python=_PYTHON_VERSIONS, name="pytest-tcp-pycryptodome") @nox.parametrize("coverage", [False, True]) -def pytest_tcp_pycryptodomex(session, coverage): +def pytest_tcp_pycryptodome(session, coverage): """ - pytest session with TCP transport and pycryptodomex + pytest session with TCP transport and pycryptodome """ session.notify( - "pytest-parametrized-{}(coverage={}, crypto='pycryptodomex', transport='tcp')".format( + "pytest-parametrized-{}(coverage={}, crypto='pycryptodome', transport='tcp')".format( session.python, coverage ) ) -@nox.session(python=_PYTHON_VERSIONS, name="pytest-zeromq-pycryptodomex") +@nox.session(python=_PYTHON_VERSIONS, name="pytest-zeromq-pycryptodome") @nox.parametrize("coverage", [False, True]) -def pytest_zeromq_pycryptodomex(session, coverage): +def pytest_zeromq_pycryptodome(session, coverage): """ - pytest session with zeromq transport and pycryptodomex + pytest session with zeromq transport and pycryptodome """ session.notify( - "pytest-parametrized-{}(coverage={}, crypto='pycryptodomex', transport='zeromq')".format( + "pytest-parametrized-{}(coverage={}, crypto='pycryptodome', transport='zeromq')".format( session.python, coverage ) ) diff --git a/pkg/osx/req.txt b/pkg/osx/req.txt index 8ac69e559855..c6516187b580 100644 --- a/pkg/osx/req.txt +++ b/pkg/osx/req.txt @@ -19,7 +19,7 @@ msgpack-python==0.5.6 psutil==5.6.6 pyasn1==0.4.5 pycparser==2.19 -pycryptodome==3.8.1 +pycryptodomex==3.9.7 python-dateutil==2.8.0 python-gnupg==0.4.4 pyyaml==5.1.2 diff --git a/pkg/smartos/esky/zeromq_requirements.txt b/pkg/smartos/esky/zeromq_requirements.txt index d69fa5c080c1..4086cf28e485 100644 --- a/pkg/smartos/esky/zeromq_requirements.txt +++ b/pkg/smartos/esky/zeromq_requirements.txt @@ -1,6 +1,6 @@ # Need to set a specific version of pyzmq, so can't use the main project's requirements file... have to copy it in and modify... #-r ../../../requirements/zeromq.txt -r ../../../requirements/base.txt -pycrypto>=2.6.1 +pycryptodomex==3.9.7 pyzmq -r requirements.txt diff --git a/pkg/suse/salt.spec b/pkg/suse/salt.spec index e3e678af3b40..a17d2381ce71 100644 --- a/pkg/suse/salt.spec +++ b/pkg/suse/salt.spec @@ -74,7 +74,7 @@ BuildRequires: python-ioflo >= 1.1.7 BuildRequires: python-raet >= 0.6.0 %endif # requirements/zeromq.txt -BuildRequires: python-pycrypto >= 2.6.1 +BuildRequires: pycryptodomex >= 3.9.7 BuildRequires: python-pyzmq >= 2.2.0 %if %{with test} # requirements/dev_python27.txt @@ -121,7 +121,7 @@ Recommends: python-gnupg # Recommends: salt-raet # requirements/zeromq.txt %endif -Requires: python-pycrypto >= 2.6.1 +Requires: pycryptodomex >= 3.9.7 Requires: python-pyzmq >= 2.2.0 # %if 0%{?suse_version} diff --git a/pkg/windows/req.txt b/pkg/windows/req.txt index af94d761e572..518ecb79c4cb 100644 --- a/pkg/windows/req.txt +++ b/pkg/windows/req.txt @@ -19,7 +19,7 @@ msgpack-python==0.5.6 psutil==5.6.6 pyasn1==0.4.5 pycparser==2.19 -pycryptodomex==3.8.1 +pycryptodomex==3.9.7 pycurl==7.43.0.5 pymssql==2.1.4 PyMySQL==0.9.3 diff --git a/requirements/crypto.txt b/requirements/crypto.txt index 9a62bb31f808..00e98d3ec6e8 100644 --- a/requirements/crypto.txt +++ b/requirements/crypto.txt @@ -1,2 +1 @@ -pycrypto>=2.6.1; sys.platform not in 'win32,darwin' -pycryptodomex; sys.platform == 'win32' +pycryptodomex>=3.9.7 diff --git a/requirements/static/crypto.in b/requirements/static/crypto.in index cbd603104b61..83e67bcfc7e0 100644 --- a/requirements/static/crypto.in +++ b/requirements/static/crypto.in @@ -1,2 +1,2 @@ m2crypto -pycryptodomex +pycryptodome diff --git a/requirements/static/py3.5/darwin-crypto.txt b/requirements/static/py3.5/darwin-crypto.txt index 492a8bd18558..f8596cb3a8d3 100644 --- a/requirements/static/py3.5/darwin-crypto.txt +++ b/requirements/static/py3.5/darwin-crypto.txt @@ -5,4 +5,4 @@ # pip-compile -o requirements/static/py3.5/darwin-crypto.txt -v requirements/static/crypto.in # m2crypto==0.35.2 -pycryptodomex==3.9.0 +pycryptodome==3.9.7 diff --git a/requirements/static/py3.5/darwin.txt b/requirements/static/py3.5/darwin.txt index 0b1aba1a7cfb..9ae8c16f259d 100644 --- a/requirements/static/py3.5/darwin.txt +++ b/requirements/static/py3.5/darwin.txt @@ -81,7 +81,8 @@ 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 +pycryptodome==3.8.1 # via python-jose +pycryptodomex==3.9.7 pynacl==1.3.0 # via paramiko pyopenssl==19.0.0 pyparsing==2.4.5 # via packaging diff --git a/requirements/static/py3.5/linux-crypto.txt b/requirements/static/py3.5/linux-crypto.txt index 6cdeaecccc4d..35db7b2249eb 100644 --- a/requirements/static/py3.5/linux-crypto.txt +++ b/requirements/static/py3.5/linux-crypto.txt @@ -5,4 +5,4 @@ # pip-compile -o requirements/static/py3.5/linux-crypto.txt -v requirements/static/crypto.in # m2crypto==0.35.2 -pycryptodomex==3.9.3 +pycryptodome==3.9.7 diff --git a/requirements/static/py3.5/linux.txt b/requirements/static/py3.5/linux.txt index 14666c9a6eab..53e78cef4178 100644 --- a/requirements/static/py3.5/linux.txt +++ b/requirements/static/py3.5/linux.txt @@ -74,8 +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 -pycrypto==2.6.1 ; sys_platform not in "win32,darwin" pycryptodome==3.8.1 # via python-jose +pycryptodomex==3.9.7 pygit2==0.28.2 pyinotify==0.9.6 pynacl==1.3.0 # via paramiko diff --git a/requirements/static/py3.5/windows-crypto.txt b/requirements/static/py3.5/windows-crypto.txt index 091858543a9c..28c21a0e2cf0 100644 --- a/requirements/static/py3.5/windows-crypto.txt +++ b/requirements/static/py3.5/windows-crypto.txt @@ -5,4 +5,4 @@ # pip-compile -o requirements/static/py3.5/windows-crypto.txt -v requirements/static/crypto.in # m2crypto==0.35.2 -pycryptodomex==3.9.0 +pycryptodome==3.9.7 diff --git a/requirements/static/py3.5/windows.txt b/requirements/static/py3.5/windows.txt index 6c6c5b5d7709..4eae4c7b60f7 100644 --- a/requirements/static/py3.5/windows.txt +++ b/requirements/static/py3.5/windows.txt @@ -69,7 +69,7 @@ pyasn1-modules==0.2.4 # via google-auth pyasn1==0.4.5 pycparser==2.19 pycryptodome==3.8.1 # via python-jose -pycryptodomex==3.8.1 ; sys_platform == "win32" +pycryptodomex==3.9.7 pycurl==7.43.0.5 pygit2==0.28.2 pymssql==2.1.4 diff --git a/requirements/static/py3.6/darwin-crypto.txt b/requirements/static/py3.6/darwin-crypto.txt index 3cc68e7cab08..0d098423c8be 100644 --- a/requirements/static/py3.6/darwin-crypto.txt +++ b/requirements/static/py3.6/darwin-crypto.txt @@ -5,4 +5,4 @@ # pip-compile -o requirements/static/py3.6/darwin-crypto.txt -v requirements/static/crypto.in # m2crypto==0.35.2 -pycryptodomex==3.9.0 +pycryptodome==3.9.7 diff --git a/requirements/static/py3.6/darwin.txt b/requirements/static/py3.6/darwin.txt index f535ab50668d..5fd292fc63b5 100644 --- a/requirements/static/py3.6/darwin.txt +++ b/requirements/static/py3.6/darwin.txt @@ -80,7 +80,8 @@ 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 +pycryptodome==3.8.1 # via python-jose +pycryptodomex==3.9.7 pynacl==1.3.0 # via paramiko pyopenssl==19.0.0 pyparsing==2.4.5 # via packaging diff --git a/requirements/static/py3.6/linux-crypto.txt b/requirements/static/py3.6/linux-crypto.txt index efb7b5dc6eaa..7e6ebc005b9c 100644 --- a/requirements/static/py3.6/linux-crypto.txt +++ b/requirements/static/py3.6/linux-crypto.txt @@ -5,4 +5,4 @@ # pip-compile -o requirements/static/py3.6/linux-crypto.txt -v requirements/static/crypto.in # m2crypto==0.35.2 -pycryptodomex==3.9.3 +pycryptodome==3.9.7 diff --git a/requirements/static/py3.6/linux.txt b/requirements/static/py3.6/linux.txt index fe71cde741db..3db9e5b73c47 100644 --- a/requirements/static/py3.6/linux.txt +++ b/requirements/static/py3.6/linux.txt @@ -73,8 +73,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 -pycrypto==2.6.1 ; sys_platform not in "win32,darwin" pycryptodome==3.8.1 # via python-jose +pycryptodomex==3.9.7 pygit2==0.28.2 pyinotify==0.9.6 pynacl==1.3.0 # via paramiko diff --git a/requirements/static/py3.6/windows-crypto.txt b/requirements/static/py3.6/windows-crypto.txt index 6f6886495685..5665fa7133ca 100644 --- a/requirements/static/py3.6/windows-crypto.txt +++ b/requirements/static/py3.6/windows-crypto.txt @@ -5,4 +5,4 @@ # pip-compile -o requirements/static/py3.6/windows-crypto.txt -v requirements/static/crypto.in # m2crypto==0.35.2 -pycryptodomex==3.9.0 +pycryptodome==3.9.7 diff --git a/requirements/static/py3.6/windows.txt b/requirements/static/py3.6/windows.txt index f92d366eb481..5c30543ca72e 100644 --- a/requirements/static/py3.6/windows.txt +++ b/requirements/static/py3.6/windows.txt @@ -68,7 +68,7 @@ pyasn1-modules==0.2.4 # via google-auth pyasn1==0.4.5 pycparser==2.19 pycryptodome==3.8.1 # via python-jose -pycryptodomex==3.8.1 ; sys_platform == "win32" +pycryptodomex==3.9.7 pycurl==7.43.0.5 pygit2==0.28.2 pymssql==2.1.4 diff --git a/requirements/static/py3.7/darwin-crypto.txt b/requirements/static/py3.7/darwin-crypto.txt index 0a4ffcf4c8d4..05a5ffe9f965 100644 --- a/requirements/static/py3.7/darwin-crypto.txt +++ b/requirements/static/py3.7/darwin-crypto.txt @@ -5,4 +5,4 @@ # pip-compile -o requirements/static/py3.7/darwin-crypto.txt -v requirements/static/crypto.in # m2crypto==0.35.2 -pycryptodomex==3.9.0 +pycryptodome==3.9.7 diff --git a/requirements/static/py3.7/darwin.txt b/requirements/static/py3.7/darwin.txt index bcb24aa1d741..c04ab2ad16da 100644 --- a/requirements/static/py3.7/darwin.txt +++ b/requirements/static/py3.7/darwin.txt @@ -79,7 +79,8 @@ 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 +pycryptodome==3.8.1 # via python-jose +pycryptodomex==3.9.7 pynacl==1.3.0 # via paramiko pyopenssl==19.0.0 pyparsing==2.4.5 # via packaging diff --git a/requirements/static/py3.7/linux-crypto.txt b/requirements/static/py3.7/linux-crypto.txt index 1139152146b9..274db5e5748a 100644 --- a/requirements/static/py3.7/linux-crypto.txt +++ b/requirements/static/py3.7/linux-crypto.txt @@ -5,4 +5,4 @@ # pip-compile -o requirements/static/py3.7/linux-crypto.txt -v requirements/static/crypto.in # m2crypto==0.35.2 -pycryptodomex==3.9.3 +pycryptodome==3.9.7 diff --git a/requirements/static/py3.7/linux.txt b/requirements/static/py3.7/linux.txt index 4705805999f8..e6f8d306aa01 100644 --- a/requirements/static/py3.7/linux.txt +++ b/requirements/static/py3.7/linux.txt @@ -73,8 +73,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 -pycrypto==2.6.1 ; sys_platform not in "win32,darwin" pycryptodome==3.8.1 # via python-jose +pycryptodomex==3.9.7 pygit2==0.28.2 pyinotify==0.9.6 pynacl==1.3.0 # via paramiko diff --git a/requirements/static/py3.7/windows-crypto.txt b/requirements/static/py3.7/windows-crypto.txt index 82aeec9d3bfd..a6c0e83145de 100644 --- a/requirements/static/py3.7/windows-crypto.txt +++ b/requirements/static/py3.7/windows-crypto.txt @@ -5,4 +5,4 @@ # pip-compile -o requirements/static/py3.7/windows-crypto.txt -v requirements/static/crypto.in # m2crypto==0.35.2 -pycryptodomex==3.9.0 +pycryptodome==3.9.7 diff --git a/requirements/static/py3.7/windows.txt b/requirements/static/py3.7/windows.txt index 158d50a1733d..b82612ba72e0 100644 --- a/requirements/static/py3.7/windows.txt +++ b/requirements/static/py3.7/windows.txt @@ -67,7 +67,7 @@ pyasn1-modules==0.2.4 # via google-auth pyasn1==0.4.5 pycparser==2.19 pycryptodome==3.8.1 # via python-jose -pycryptodomex==3.8.1 ; sys_platform == "win32" +pycryptodomex==3.9.7 pycurl==7.43.0.5 pygit2==0.28.2 pymssql==2.1.4 diff --git a/requirements/static/py3.8/darwin-crypto.txt b/requirements/static/py3.8/darwin-crypto.txt index b1edfefdabe5..5190502a8d8f 100644 --- a/requirements/static/py3.8/darwin-crypto.txt +++ b/requirements/static/py3.8/darwin-crypto.txt @@ -5,4 +5,4 @@ # pip-compile -o requirements/static/py3.8/darwin-crypto.txt -v requirements/static/crypto.in # m2crypto==0.35.2 -pycryptodomex==3.9.0 +pycryptodome==3.9.7 diff --git a/requirements/static/py3.8/darwin.txt b/requirements/static/py3.8/darwin.txt index b0847425b045..79c6321ccfc3 100644 --- a/requirements/static/py3.8/darwin.txt +++ b/requirements/static/py3.8/darwin.txt @@ -78,7 +78,8 @@ 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 +pycryptodome==3.8.1 # via python-jose +pycryptodomex==3.9.7 pynacl==1.3.0 # via paramiko pyopenssl==19.0.0 pyparsing==2.4.5 # via packaging diff --git a/requirements/static/py3.8/docs.txt b/requirements/static/py3.8/docs.txt index ab3ce4ada778..f7959ad7da39 100644 --- a/requirements/static/py3.8/docs.txt +++ b/requirements/static/py3.8/docs.txt @@ -20,7 +20,7 @@ pytz==2019.1 # via babel requests==2.22.0 # via sphinx six==1.12.0 # via packaging snowballstemmer==1.2.1 # via sphinx -sphinx==2.0.1 +sphinx==3.0.2 sphinxcontrib-applehelp==1.0.1 # via sphinx sphinxcontrib-devhelp==1.0.1 # via sphinx sphinxcontrib-htmlhelp==1.0.2 # via sphinx diff --git a/requirements/static/py3.8/linux-crypto.txt b/requirements/static/py3.8/linux-crypto.txt index f625936c6eec..4882f2e627d2 100644 --- a/requirements/static/py3.8/linux-crypto.txt +++ b/requirements/static/py3.8/linux-crypto.txt @@ -5,4 +5,4 @@ # pip-compile -o requirements/static/py3.8/linux-crypto.txt -v requirements/static/crypto.in # m2crypto==0.35.2 -pycryptodomex==3.9.3 +pycryptodome==3.9.7 diff --git a/requirements/static/py3.8/linux.txt b/requirements/static/py3.8/linux.txt index ff243d023d39..1593ca7c233b 100644 --- a/requirements/static/py3.8/linux.txt +++ b/requirements/static/py3.8/linux.txt @@ -72,8 +72,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 -pycrypto==2.6.1 ; sys_platform not in "win32,darwin" pycryptodome==3.8.1 # via python-jose +pycryptodomex==3.9.7 pygit2==0.28.2 pyinotify==0.9.6 pynacl==1.3.0 # via paramiko diff --git a/requirements/static/py3.9/darwin-crypto.txt b/requirements/static/py3.9/darwin-crypto.txt index 838b5c329f87..843c712b173c 100644 --- a/requirements/static/py3.9/darwin-crypto.txt +++ b/requirements/static/py3.9/darwin-crypto.txt @@ -5,4 +5,4 @@ # pip-compile -o requirements/static/py3.9/darwin-crypto.txt -v requirements/static/crypto.in # m2crypto==0.35.2 -pycryptodomex==3.9.0 +pycryptodome==3.9.7 diff --git a/requirements/static/py3.9/darwin.txt b/requirements/static/py3.9/darwin.txt index 1dac5926f0e4..a4a7f0d2b0cb 100644 --- a/requirements/static/py3.9/darwin.txt +++ b/requirements/static/py3.9/darwin.txt @@ -78,7 +78,8 @@ 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 +pycryptodome==3.8.1 # via python-jose +pycryptodomex==3.9.7 pynacl==1.3.0 # via paramiko pyopenssl==19.0.0 pyparsing==2.4.5 # via packaging diff --git a/requirements/static/py3.9/docs.txt b/requirements/static/py3.9/docs.txt index 89552f5688d5..4ac09c37781f 100644 --- a/requirements/static/py3.9/docs.txt +++ b/requirements/static/py3.9/docs.txt @@ -20,7 +20,7 @@ pytz==2019.1 # via babel requests==2.22.0 # via sphinx six==1.12.0 # via packaging snowballstemmer==1.2.1 # via sphinx -sphinx==2.0.1 +sphinx==3.0.2 sphinxcontrib-applehelp==1.0.1 # via sphinx sphinxcontrib-devhelp==1.0.1 # via sphinx sphinxcontrib-htmlhelp==1.0.2 # via sphinx diff --git a/requirements/static/py3.9/linux-crypto.txt b/requirements/static/py3.9/linux-crypto.txt index 148f8bec31c0..60034822b0d4 100644 --- a/requirements/static/py3.9/linux-crypto.txt +++ b/requirements/static/py3.9/linux-crypto.txt @@ -5,4 +5,4 @@ # pip-compile -o requirements/static/py3.9/linux-crypto.txt -v requirements/static/crypto.in # m2crypto==0.35.2 -pycryptodomex==3.9.3 +pycryptodome==3.9.7 diff --git a/requirements/static/py3.9/linux.txt b/requirements/static/py3.9/linux.txt index d4fc7f39d44a..c36c666eb63f 100644 --- a/requirements/static/py3.9/linux.txt +++ b/requirements/static/py3.9/linux.txt @@ -72,8 +72,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 -pycrypto==2.6.1 ; sys_platform not in "win32,darwin" pycryptodome==3.8.1 # via python-jose +pycryptodomex==3.9.7 pygit2==0.28.2 pyinotify==0.9.6 pynacl==1.3.0 # via paramiko