From 8faaa0928c8ac38c2e753532f864ef1bb39d3803 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 13 Nov 2019 14:14:35 +0000 Subject: [PATCH] Fix crypto requirements generation --- .pre-commit-config.yaml | 123 ++++++++++++++++++++++++++++++++++++++++ requirements/crypto.txt | 2 + requirements/zeromq.txt | 4 +- 3 files changed, 126 insertions(+), 3 deletions(-) create mode 100644 requirements/crypto.txt diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0e976f71c1d..9a12175cf67 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -63,6 +63,34 @@ repos: - -v - --py-version=2.7 + - id: pip-tools-compile + alias: compile-linux-crypto-py2.7-requirements + name: Linux Py2.7 Crypto Requirements + files: ^requirements/(crypto\.txt|static/crypto\.in)$ + args: + - -v + - --py-version=2.7 + - --platform=linux + - --out-prefix=linux + - id: pip-tools-compile + alias: compile-darwin-crypto-py2.7-requirements + name: Darwin Py2.7 Crypto Requirements + files: ^requirements/(crypto\.txt|static/crypto\.in)$ + args: + - -v + - --py-version=2.7 + - --platform=darwin + - --out-prefix=darwin + - id: pip-tools-compile + alias: compile-windows-crypto-py2.7-requirements + name: Windows Py2.7 Crypto Requirements + files: ^requirements/(crypto\.txt|static/crypto\.in)$ + args: + - -v + - --py-version=2.7 + - --platform=windows + - --out-prefix=windows + - id: pip-tools-compile alias: compile-linux-py3.4-zmq-requirements @@ -86,6 +114,16 @@ repos: - -v - --py-version=3.4 + - id: pip-tools-compile + alias: compile-linux-crypto-py3.4-requirements + name: Linux Py3.4 Crypto Requirements + files: ^requirements/(crypto\.txt|static/crypto\.in)$ + args: + - -v + - --py-version=3.4 + - --platform=linux + - --out-prefix=linux + - id: pip-tools-compile alias: compile-linux-py3.5-zmq-requirements name: Linux Py3.5 ZeroMQ Requirements @@ -146,6 +184,34 @@ repos: - --py-version=3.5 - --platform=linux + - id: pip-tools-compile + alias: compile-linux-crypto-py3.5-requirements + name: Linux Py3.5 Crypto Requirements + files: ^requirements/(crypto\.txt|static/crypto\.in)$ + args: + - -v + - --py-version=3.5 + - --platform=linux + - --out-prefix=linux + - id: pip-tools-compile + alias: compile-darwin-crypto-py3.5-requirements + name: Darwin Py3.5 Crypto Requirements + files: ^requirements/(crypto\.txt|static/crypto\.in)$ + args: + - -v + - --py-version=3.5 + - --platform=darwin + - --out-prefix=darwin + - id: pip-tools-compile + alias: compile-windows-crypto-py3.5-requirements + name: Windows Py3.5 Crypto Requirements + files: ^requirements/(crypto\.txt|static/crypto\.in)$ + args: + - -v + - --py-version=3.5 + - --platform=windows + - --out-prefix=windows + - id: pip-tools-compile alias: compile-linux-py3.6-zmq-requirements name: Linux Py3.6 ZeroMQ Requirements @@ -206,6 +272,34 @@ repos: - --py-version=3.6 - --platform=linux + - id: pip-tools-compile + alias: compile-linux-crypto-py3.6-requirements + name: Linux Py3.6 Crypto Requirements + files: ^requirements/(crypto\.txt|static/crypto\.in)$ + args: + - -v + - --py-version=3.6 + - --platform=linux + - --out-prefix=linux + - id: pip-tools-compile + alias: compile-darwin-crypto-py3.6-requirements + name: Darwin Py3.6 Crypto Requirements + files: ^requirements/(crypto\.txt|static/crypto\.in)$ + args: + - -v + - --py-version=3.6 + - --platform=darwin + - --out-prefix=darwin + - id: pip-tools-compile + alias: compile-windows-crypto-py3.6-requirements + name: Windows Py3.6 Crypto Requirements + files: ^requirements/(crypto\.txt|static/crypto\.in)$ + args: + - -v + - --py-version=3.6 + - --platform=windows + - --out-prefix=windows + - id: pip-tools-compile alias: compile-linux-py3.7-zmq-requirements name: Linux Py3.7 ZeroMQ Requirements @@ -266,6 +360,35 @@ repos: - --py-version=3.7 - --platform=linux + - id: pip-tools-compile + alias: compile-linux-crypto-py3.7-requirements + name: Linux Py3.7 Crypto Requirements + files: ^requirements/(crypto\.txt|static/crypto\.in)$ + args: + - -v + - --py-version=3.7 + - --platform=linux + - --out-prefix=linux + - id: pip-tools-compile + alias: compile-darwin-crypto-py3.7-requirements + name: Darwin Py3.7 Crypto Requirements + files: ^requirements/(crypto\.txt|static/crypto\.in)$ + args: + - -v + - --py-version=3.7 + - --platform=darwin + - --out-prefix=darwin + - id: pip-tools-compile + alias: compile-windows-crypto-py3.7-requirements + name: Windows Py3.7 Crypto Requirements + files: ^requirements/(crypto\.txt|static/crypto\.in)$ + args: + - -v + - --py-version=3.7 + - --platform=windows + - --out-prefix=windows + + - repo: https://github.com/saltstack/salt-nox-pre-commit rev: master hooks: diff --git a/requirements/crypto.txt b/requirements/crypto.txt new file mode 100644 index 00000000000..c98b7f77656 --- /dev/null +++ b/requirements/crypto.txt @@ -0,0 +1,2 @@ +pycryptodome; sys.platform != 'win32' +pycryptodomex; sys.platform == 'win32' diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt index 6e987f400d5..609f09dad08 100644 --- a/requirements/zeromq.txt +++ b/requirements/zeromq.txt @@ -1,7 +1,5 @@ -r base.txt +-r crypto.txt -# PyCrypto has issues on Windows, while pycryptodomex does not -pycrypto>=2.6.1; sys.platform != 'win32' -pycryptodomex; sys.platform == 'win32' pyzmq>=2.2.0,<17.1.0; python_version == '3.4' # pyzmq 17.1.0 stopped building wheels for python3.4 pyzmq>=2.2.0; python_version != '3.4'