From 461b198978b9b266ac4900cd390a52dcdb3b42e7 Mon Sep 17 00:00:00 2001 From: Salt Admin Date: Thu, 19 Mar 2020 11:59:11 -0600 Subject: [PATCH 01/11] Update dependencies, remove req_ext.txt --- pkg/osx/build_env.sh | 8 -------- pkg/osx/req.txt | 9 ++++----- pkg/osx/req_ext.txt | 2 -- setup.py | 1 - 4 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 pkg/osx/req_ext.txt diff --git a/pkg/osx/build_env.sh b/pkg/osx/build_env.sh index 71f716b38c78..461cfb7cc29f 100755 --- a/pkg/osx/build_env.sh +++ b/pkg/osx/build_env.sh @@ -286,14 +286,6 @@ echo "########################################################################## $PIP install -r $SRCDIR/pkg/osx/req.txt \ --no-cache-dir -echo "################################################################################" -echo "Installing Salt Dependencies with pip (build_ext)" -echo "################################################################################" -$PIP install -r $SRCDIR/pkg/osx/req_ext.txt \ - --global-option=build_ext \ - --global-option="-I$INSTALL_DIR/include" \ - --no-cache-dir - echo "--------------------------------------------------------------------------------" echo "Create Symlink to certifi for openssl" echo "--------------------------------------------------------------------------------" diff --git a/pkg/osx/req.txt b/pkg/osx/req.txt index b51ee6917f43..1c65a78014cc 100644 --- a/pkg/osx/req.txt +++ b/pkg/osx/req.txt @@ -5,10 +5,10 @@ certifi cffi==1.12.2 CherryPy==17.4.1 click==7.0 +cryptography==2.6.1 enum34==1.1.6 futures==3.2.0 ; python_version < "3.0" -gitdb==0.6.4 -gitpython==2.1.11 +gitpython==2.1.15 idna==2.8 ipaddress==1.0.22 jinja2==2.10.1 @@ -20,8 +20,8 @@ psutil==5.6.1 pyasn1==0.4.5 pycparser==2.19 pycryptodome==3.8.1 -pyobjc==5.1.2 -pyopenssl +pyobjc==5.3 +pyopenssl==19.0.0 python-dateutil==2.8.0 python-gnupg==0.4.4 pyyaml==5.1.2 @@ -29,6 +29,5 @@ pyzmq==18.0.1 requests==2.21.0 setproctitle singledispatch==3.4.0.3; python_version < '3.4' -smmap==0.9.0 timelib==0.2.4 vultr==1.0.1 diff --git a/pkg/osx/req_ext.txt b/pkg/osx/req_ext.txt deleted file mode 100644 index 76f7628a78e8..000000000000 --- a/pkg/osx/req_ext.txt +++ /dev/null @@ -1,2 +0,0 @@ -cryptography==2.6.1 -pyopenssl==19.0.0 diff --git a/setup.py b/setup.py index 48b779997dff..4265fc1b5ce0 100755 --- a/setup.py +++ b/setup.py @@ -109,7 +109,6 @@ SALT_LONG_DESCRIPTION_FILE = os.path.join(os.path.abspath(SETUP_DIRNAME), 'README.rst') SALT_OSX_REQS = [ os.path.join(os.path.abspath(SETUP_DIRNAME), 'pkg', 'osx', 'req.txt'), - os.path.join(os.path.abspath(SETUP_DIRNAME), 'pkg', 'osx', 'req_ext.txt') ] SALT_WINDOWS_REQS = [ os.path.join(os.path.abspath(SETUP_DIRNAME), 'pkg', 'windows', 'req.txt'), From 1fa9864e3d81acbcc713ca458774638378be4222 Mon Sep 17 00:00:00 2001 From: Salt Admin Date: Thu, 19 Mar 2020 12:08:16 -0600 Subject: [PATCH 02/11] Don't set a version for pyopenssl --- pkg/osx/req.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/osx/req.txt b/pkg/osx/req.txt index 1c65a78014cc..da953cdf9f52 100644 --- a/pkg/osx/req.txt +++ b/pkg/osx/req.txt @@ -21,7 +21,7 @@ pyasn1==0.4.5 pycparser==2.19 pycryptodome==3.8.1 pyobjc==5.3 -pyopenssl==19.0.0 +pyopenssl python-dateutil==2.8.0 python-gnupg==0.4.4 pyyaml==5.1.2 From 732ecc83c19d27102683dd61657640b2c20d37f1 Mon Sep 17 00:00:00 2001 From: Salt Admin Date: Thu, 19 Mar 2020 12:52:52 -0600 Subject: [PATCH 03/11] Update pre-commit config --- .pre-commit-config.yaml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 25cf9b07077c..ef9e59c43041 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,13 +19,12 @@ repos: - id: pip-tools-compile alias: compile-darwin-py2.7-zmq-requirements name: Darwin Py2.7 ZeroMQ Requirements - files: ^(pkg/osx/(req|req_ext)\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$ + files: ^(pkg/osx/req\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$ args: - -v - --py-version=2.7 - --platform=darwin - --include=pkg/osx/req.txt - - --include=pkg/osx/req_ext.txt - --include=requirements/base.txt - --include=requirements/zeromq.txt - --include=requirements/pytest.txt @@ -132,13 +131,12 @@ repos: - id: pip-tools-compile alias: compile-darwin-py3.5-zmq-requirements name: Darwin Py3.5 ZeroMQ Requirements - files: ^(pkg/osx/(req|req_ext)\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$ + files: ^(pkg/osx/req\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$ args: - -v - --py-version=3.5 - --platform=darwin - --include=pkg/osx/req.txt - - --include=pkg/osx/req_ext.txt - --include=requirements/base.txt - --include=requirements/zeromq.txt - --include=requirements/pytest.txt @@ -231,13 +229,12 @@ repos: - id: pip-tools-compile alias: compile-darwin-py3.6-zmq-requirements name: Darwin Py3.6 ZeroMQ Requirements - files: ^(pkg/osx/(req|req_ext)\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$ + files: ^(pkg/osx/req\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$ args: - -v - --py-version=3.6 - --platform=darwin - --include=pkg/osx/req.txt - - --include=pkg/osx/req_ext.txt - --include=requirements/base.txt - --include=requirements/zeromq.txt - --include=requirements/pytest.txt @@ -330,13 +327,12 @@ repos: - id: pip-tools-compile alias: compile-darwin-py3.7-zmq-requirements name: Darwin Py3.7 ZeroMQ Requirements - files: ^(pkg/osx/(req|req_ext)\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$ + files: ^(pkg/osx/req\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$ args: - -v - --py-version=3.7 - --platform=darwin - --include=pkg/osx/req.txt - - --include=pkg/osx/req_ext.txt - --include=requirements/base.txt - --include=requirements/zeromq.txt - --include=requirements/pytest.txt From fda8abf4a84601e3b4b890d9288ab95f2fa67afb Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 19 Mar 2020 18:59:11 +0000 Subject: [PATCH 04/11] Update static requirements --- requirements/static/py2.7/darwin.txt | 8 +++----- requirements/static/py2.7/windows.txt | 8 +++----- requirements/static/py3.5/darwin.txt | 8 +++----- requirements/static/py3.5/windows.txt | 5 +---- requirements/static/py3.6/darwin.txt | 8 +++----- requirements/static/py3.6/windows.txt | 5 +---- requirements/static/py3.7/darwin.txt | 8 +++----- requirements/static/py3.7/windows.txt | 5 +---- 8 files changed, 18 insertions(+), 37 deletions(-) diff --git a/requirements/static/py2.7/darwin.txt b/requirements/static/py2.7/darwin.txt index ea5d60a34b29..e8160d4c06e0 100644 --- a/requirements/static/py2.7/darwin.txt +++ b/requirements/static/py2.7/darwin.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile -o requirements/static/py2.7/darwin.txt -v pkg/osx/req.txt pkg/osx/req_ext.txt requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/darwin.in +# pip-compile -o requirements/static/py2.7/darwin.txt -v pkg/osx/req.txt requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/darwin.in # apache-libcloud==2.4.0 appdirs==1.4.3 # via virtualenv @@ -49,8 +49,7 @@ future==0.17.1 # via python-jose futures==3.2.0 ; python_version < "3.0" genshi==0.7.3 gitdb2==2.0.5 # via gitpython -gitdb==0.6.4 -gitpython==2.1.11 +gitpython==2.1.15 google-auth==1.6.3 # via kubernetes idna==2.8 importlib-metadata==0.23 # via importlib-resources, pluggy, pytest, virtualenv @@ -122,7 +121,6 @@ setproctitle==1.1.10 singledispatch==3.4.0.3 ; python_version < "3.4" six==1.12.0 # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, vcert, virtualenv, websocket-client smmap2==2.0.5 # via gitdb2 -smmap==0.9.0 strict-rfc3339==0.7 supervisor==3.3.5 ; python_version < "3" tempora==1.14.1 # via portend @@ -143,4 +141,4 @@ yamlordereddictloader==0.4.0 zc.lockfile==1.4 # via cherrypy zipp==0.6.0 # via importlib-metadata, importlib-resources # Passthrough dependencies from pkg/osx/req.txt -pyobjc==5.1.2 +pyobjc==5.3 diff --git a/requirements/static/py2.7/windows.txt b/requirements/static/py2.7/windows.txt index 340ca703070e..9bdd743187ed 100644 --- a/requirements/static/py2.7/windows.txt +++ b/requirements/static/py2.7/windows.txt @@ -35,15 +35,14 @@ docker-pycreds==0.4.0 # via docker docker==2.7.0 docutils==0.14 # via botocore ecdsa==0.13.3 # via python-jose -enum34==1.1.6 +enum34==1.1.6 ; python_version < "3.4" funcsigs==1.0.2 # via mock, pytest functools32==3.2.3.post2 # via jsonschema future==0.17.1 # via python-jose -futures==3.2.0 ; python_version < "3.0" +futures==3.3.0 ; python_version < "3.0" genshi==0.7.3 gitdb2==2.0.5 # via gitpython -gitdb==0.6.4 -gitpython==2.1.10 +gitpython==2.1.15 google-auth==1.6.3 # via kubernetes idna==2.8 importlib-metadata==0.23 # via pluggy, pytest @@ -114,7 +113,6 @@ setproctitle==1.1.10 singledispatch==3.4.0.3 ; python_version < "3.4" six==1.12.0 # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, packaging, pathlib2, pygit2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client smmap2==2.0.5 # via gitdb2 -smmap==0.9.0 strict-rfc3339==0.7 supervisor==3.3.5 ; python_version < "3" tempora==1.14.1 # via portend diff --git a/requirements/static/py3.5/darwin.txt b/requirements/static/py3.5/darwin.txt index ed303ecfb2d3..3f9aa79f6006 100644 --- a/requirements/static/py3.5/darwin.txt +++ b/requirements/static/py3.5/darwin.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile -o requirements/static/py3.5/darwin.txt -v pkg/osx/req.txt pkg/osx/req_ext.txt requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/darwin.in +# pip-compile -o requirements/static/py3.5/darwin.txt -v pkg/osx/req.txt requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/darwin.in # apache-libcloud==2.4.0 appdirs==1.4.3 # via virtualenv @@ -41,8 +41,7 @@ filelock==3.0.12 # via virtualenv future==0.17.1 # via python-jose genshi==0.7.3 gitdb2==2.0.5 # via gitpython -gitdb==0.6.4 -gitpython==2.1.11 +gitpython==2.1.15 google-auth==1.6.3 # via kubernetes idna==2.8 importlib-metadata==0.23 # via importlib-resources, pluggy, pytest, virtualenv @@ -110,7 +109,6 @@ scp==0.13.2 # via junos-eznc setproctitle==1.1.10 six==1.12.0 # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, vcert, virtualenv, websocket-client smmap2==2.0.5 # via gitdb2 -smmap==0.9.0 strict-rfc3339==0.7 tempora==1.14.1 # via portend timelib==0.2.4 @@ -128,4 +126,4 @@ yamlordereddictloader==0.4.0 zc.lockfile==1.4 # via cherrypy zipp==0.6.0 # via importlib-metadata, importlib-resources # Passthrough dependencies from pkg/osx/req.txt -pyobjc==5.1.2 +pyobjc==5.3 diff --git a/requirements/static/py3.5/windows.txt b/requirements/static/py3.5/windows.txt index ff3940c2a86f..1156d66d2d36 100644 --- a/requirements/static/py3.5/windows.txt +++ b/requirements/static/py3.5/windows.txt @@ -30,12 +30,10 @@ docker-pycreds==0.4.0 # via docker docker==2.7.0 docutils==0.14 # via botocore ecdsa==0.13.3 # via python-jose -enum34==1.1.6 future==0.17.1 # via python-jose genshi==0.7.3 gitdb2==2.0.5 # via gitpython -gitdb==0.6.4 -gitpython==2.1.10 +gitpython==2.1.15 google-auth==1.6.3 # via kubernetes idna==2.8 importlib-metadata==0.23 # via pluggy, pytest @@ -103,7 +101,6 @@ sed==0.3.1 setproctitle==1.1.10 six==1.12.0 # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, packaging, pathlib2, pygit2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client smmap2==2.0.5 # via gitdb2 -smmap==0.9.0 strict-rfc3339==0.7 tempora==1.14.1 # via portend timelib==0.2.4 diff --git a/requirements/static/py3.6/darwin.txt b/requirements/static/py3.6/darwin.txt index e2c69cf7d24a..8c7c9fc14a54 100644 --- a/requirements/static/py3.6/darwin.txt +++ b/requirements/static/py3.6/darwin.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile -o requirements/static/py3.6/darwin.txt -v pkg/osx/req.txt pkg/osx/req_ext.txt requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/darwin.in +# pip-compile -o requirements/static/py3.6/darwin.txt -v pkg/osx/req.txt requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/darwin.in # apache-libcloud==2.4.0 appdirs==1.4.3 # via virtualenv @@ -41,8 +41,7 @@ filelock==3.0.12 # via virtualenv future==0.17.1 # via python-jose genshi==0.7.3 gitdb2==2.0.5 # via gitpython -gitdb==0.6.4 -gitpython==2.1.11 +gitpython==2.1.15 google-auth==1.6.3 # via kubernetes idna==2.8 importlib-metadata==0.23 # via importlib-resources, pluggy, pytest, virtualenv @@ -109,7 +108,6 @@ scp==0.13.2 # via junos-eznc setproctitle==1.1.10 six==1.12.0 # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, vcert, virtualenv, websocket-client smmap2==2.0.5 # via gitdb2 -smmap==0.9.0 strict-rfc3339==0.7 tempora==1.14.1 # via portend timelib==0.2.4 @@ -127,4 +125,4 @@ yamlordereddictloader==0.4.0 zc.lockfile==1.4 # via cherrypy zipp==0.6.0 # via importlib-metadata, importlib-resources # Passthrough dependencies from pkg/osx/req.txt -pyobjc==5.1.2 +pyobjc==5.3 diff --git a/requirements/static/py3.6/windows.txt b/requirements/static/py3.6/windows.txt index 73638629c2e7..9a648f5724ab 100644 --- a/requirements/static/py3.6/windows.txt +++ b/requirements/static/py3.6/windows.txt @@ -30,12 +30,10 @@ docker-pycreds==0.4.0 # via docker docker==2.7.0 docutils==0.14 # via botocore ecdsa==0.13.3 # via python-jose -enum34==1.1.6 future==0.17.1 # via python-jose genshi==0.7.3 gitdb2==2.0.5 # via gitpython -gitdb==0.6.4 -gitpython==2.1.10 +gitpython==2.1.15 google-auth==1.6.3 # via kubernetes idna==2.8 importlib-metadata==0.23 # via pluggy, pytest @@ -102,7 +100,6 @@ sed==0.3.1 setproctitle==1.1.10 six==1.12.0 # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, packaging, pygit2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client smmap2==2.0.5 # via gitdb2 -smmap==0.9.0 strict-rfc3339==0.7 tempora==1.14.1 # via portend timelib==0.2.4 diff --git a/requirements/static/py3.7/darwin.txt b/requirements/static/py3.7/darwin.txt index 14b7c3e643c0..6165de90d328 100644 --- a/requirements/static/py3.7/darwin.txt +++ b/requirements/static/py3.7/darwin.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile -o requirements/static/py3.7/darwin.txt -v pkg/osx/req.txt pkg/osx/req_ext.txt requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/darwin.in +# pip-compile -o requirements/static/py3.7/darwin.txt -v pkg/osx/req.txt requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/darwin.in # apache-libcloud==2.4.0 appdirs==1.4.3 # via virtualenv @@ -41,8 +41,7 @@ filelock==3.0.12 # via virtualenv future==0.17.1 # via python-jose genshi==0.7.3 gitdb2==2.0.5 # via gitpython -gitdb==0.6.4 -gitpython==2.1.11 +gitpython==2.1.15 google-auth==1.6.3 # via kubernetes idna==2.8 importlib-metadata==0.23 # via pluggy, pytest, virtualenv @@ -108,7 +107,6 @@ scp==0.13.2 # via junos-eznc setproctitle==1.1.10 six==1.12.0 # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, vcert, virtualenv, websocket-client smmap2==2.0.5 # via gitdb2 -smmap==0.9.0 strict-rfc3339==0.7 tempora==1.14.1 # via portend timelib==0.2.4 @@ -126,4 +124,4 @@ yamlordereddictloader==0.4.0 zc.lockfile==1.4 # via cherrypy zipp==0.6.0 # via importlib-metadata # Passthrough dependencies from pkg/osx/req.txt -pyobjc==5.1.2 +pyobjc==5.3 diff --git a/requirements/static/py3.7/windows.txt b/requirements/static/py3.7/windows.txt index 32ea9cedbb0d..2f0b6fd342b9 100644 --- a/requirements/static/py3.7/windows.txt +++ b/requirements/static/py3.7/windows.txt @@ -30,12 +30,10 @@ docker-pycreds==0.4.0 # via docker docker==2.7.0 docutils==0.14 # via botocore ecdsa==0.13.3 # via python-jose -enum34==1.1.6 future==0.17.1 # via python-jose genshi==0.7.3 gitdb2==2.0.5 # via gitpython -gitdb==0.6.4 -gitpython==2.1.10 +gitpython==2.1.15 google-auth==1.6.3 # via kubernetes idna==2.8 importlib-metadata==0.23 # via pluggy, pytest @@ -102,7 +100,6 @@ sed==0.3.1 setproctitle==1.1.10 six==1.12.0 # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, packaging, pygit2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client smmap2==2.0.5 # via gitdb2 -smmap==0.9.0 strict-rfc3339==0.7 tempora==1.14.1 # via portend timelib==0.2.4 From 30ca5d04ecc4e7282ac87c3355a49d4b408aaeda Mon Sep 17 00:00:00 2001 From: Salt Admin Date: Thu, 19 Mar 2020 14:53:18 -0600 Subject: [PATCH 05/11] Remove cryptography, it gets installed by pyopenssl --- pkg/osx/req.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/osx/req.txt b/pkg/osx/req.txt index da953cdf9f52..08bd249009d0 100644 --- a/pkg/osx/req.txt +++ b/pkg/osx/req.txt @@ -5,7 +5,6 @@ certifi cffi==1.12.2 CherryPy==17.4.1 click==7.0 -cryptography==2.6.1 enum34==1.1.6 futures==3.2.0 ; python_version < "3.0" gitpython==2.1.15 From be4a272d079649f9ed0bbc5e4c53c82f56cdec73 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 19 Mar 2020 21:15:41 +0000 Subject: [PATCH 06/11] Update static requirements --- requirements/static/py2.7/darwin.txt | 2 +- requirements/static/py3.5/darwin.txt | 2 +- requirements/static/py3.6/darwin.txt | 2 +- requirements/static/py3.7/darwin.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/static/py2.7/darwin.txt b/requirements/static/py2.7/darwin.txt index e8160d4c06e0..feb46456f138 100644 --- a/requirements/static/py2.7/darwin.txt +++ b/requirements/static/py2.7/darwin.txt @@ -34,7 +34,7 @@ configparser==4.0.2 # via importlib-metadata contextlib2==0.6.0.post1 # via cherrypy, importlib-metadata, importlib-resources, virtualenv cookies==2.2.1 # via responses croniter==0.3.29 -cryptography==2.6.1 +cryptography==2.6.1 # via moto, paramiko, pyopenssl, vcert distlib==0.3.0 # via virtualenv dnspython==1.16.0 docker-pycreds==0.4.0 # via docker diff --git a/requirements/static/py3.5/darwin.txt b/requirements/static/py3.5/darwin.txt index 3f9aa79f6006..c7155a5b5a94 100644 --- a/requirements/static/py3.5/darwin.txt +++ b/requirements/static/py3.5/darwin.txt @@ -29,7 +29,7 @@ click==7.0 clustershell==1.8.1 contextlib2==0.5.5 # via cherrypy croniter==0.3.29 -cryptography==2.6.1 +cryptography==2.6.1 # via moto, paramiko, pyopenssl, vcert distlib==0.3.0 # via virtualenv dnspython==1.16.0 docker-pycreds==0.4.0 # via docker diff --git a/requirements/static/py3.6/darwin.txt b/requirements/static/py3.6/darwin.txt index 8c7c9fc14a54..039c2e8d83b5 100644 --- a/requirements/static/py3.6/darwin.txt +++ b/requirements/static/py3.6/darwin.txt @@ -29,7 +29,7 @@ click==7.0 clustershell==1.8.1 contextlib2==0.5.5 # via cherrypy croniter==0.3.29 -cryptography==2.6.1 +cryptography==2.6.1 # via moto, paramiko, pyopenssl, vcert distlib==0.3.0 # via virtualenv dnspython==1.16.0 docker-pycreds==0.4.0 # via docker diff --git a/requirements/static/py3.7/darwin.txt b/requirements/static/py3.7/darwin.txt index 6165de90d328..852be9fcc0fe 100644 --- a/requirements/static/py3.7/darwin.txt +++ b/requirements/static/py3.7/darwin.txt @@ -29,7 +29,7 @@ click==7.0 clustershell==1.8.1 contextlib2==0.5.5 # via cherrypy croniter==0.3.29 -cryptography==2.6.1 +cryptography==2.6.1 # via moto, paramiko, pyopenssl, vcert distlib==0.3.0 # via virtualenv dnspython==1.16.0 docker-pycreds==0.4.0 # via docker From 04e5cde9dd36cae88f53f8f7b2cbd6a42ed39dbf Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 19 Mar 2020 21:16:48 +0000 Subject: [PATCH 07/11] `pkg/osx/req_ext.txt` no longer exists --- noxfile.py | 1 - 1 file changed, 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 96a11c057083..fdb9b5bfcc18 100644 --- a/noxfile.py +++ b/noxfile.py @@ -301,7 +301,6 @@ def _install_requirements(session, transport, *extra_requirements): elif sys.platform.startswith('darwin'): requirements_files = [ os.path.join('pkg', 'osx', 'req.txt'), - os.path.join('pkg', 'osx', 'req_ext.txt'), os.path.join('requirements', 'static', 'darwin.in') ] From 6b2ac2be64b7ebb4a8efe78cfd4ed776f3105e04 Mon Sep 17 00:00:00 2001 From: twangboy Date: Fri, 20 Mar 2020 14:07:15 -0600 Subject: [PATCH 08/11] Remove pyobjc, enforce pip install location --- pkg/osx/build_env.sh | 14 +++++++++++++- pkg/osx/req.txt | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pkg/osx/build_env.sh b/pkg/osx/build_env.sh index 461cfb7cc29f..14cb3dd46c7b 100755 --- a/pkg/osx/build_env.sh +++ b/pkg/osx/build_env.sh @@ -284,7 +284,19 @@ echo "########################################################################## echo "Installing Salt Dependencies with pip (normal)" echo "################################################################################" $PIP install -r $SRCDIR/pkg/osx/req.txt \ - --no-cache-dir + --target=$PYDIR/site-packages \ + --ignore-installed \ + --no-cache-dir \ + --upgrade + +#echo "################################################################################" +#echo "Installing Salt Dependencies with pip (build_ext)" +#echo "################################################################################" +#$PIP install -r $SRCDIR/pkg/osx/req_ext.txt \ +# --global-option=build_ext \ +# --global-option="-I$INSTALL_DIR/include" \ +# --ignore-installed \ +# --no-cache-dir echo "--------------------------------------------------------------------------------" echo "Create Symlink to certifi for openssl" diff --git a/pkg/osx/req.txt b/pkg/osx/req.txt index 08bd249009d0..17e9fb9ba6a1 100644 --- a/pkg/osx/req.txt +++ b/pkg/osx/req.txt @@ -5,6 +5,7 @@ certifi cffi==1.12.2 CherryPy==17.4.1 click==7.0 +cryptography==2.8 enum34==1.1.6 futures==3.2.0 ; python_version < "3.0" gitpython==2.1.15 @@ -19,8 +20,7 @@ psutil==5.6.1 pyasn1==0.4.5 pycparser==2.19 pycryptodome==3.8.1 -pyobjc==5.3 -pyopenssl +pyopenssl==19.1.0 python-dateutil==2.8.0 python-gnupg==0.4.4 pyyaml==5.1.2 From e7f08d53497d91c2965c9b6c704c7082ceece8de Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 20 Mar 2020 20:14:35 +0000 Subject: [PATCH 09/11] Update static requirements --- requirements/static/py2.7/darwin.txt | 8 +++----- requirements/static/py3.5/darwin.txt | 8 +++----- requirements/static/py3.6/darwin.txt | 8 +++----- requirements/static/py3.7/darwin.txt | 8 +++----- 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/requirements/static/py2.7/darwin.txt b/requirements/static/py2.7/darwin.txt index feb46456f138..037934808e7c 100644 --- a/requirements/static/py2.7/darwin.txt +++ b/requirements/static/py2.7/darwin.txt @@ -7,7 +7,7 @@ apache-libcloud==2.4.0 appdirs==1.4.3 # via virtualenv argh==0.26.2 # via watchdog -asn1crypto==1.3.0 # via certvalidator, cryptography, oscrypto +asn1crypto==1.3.0 # via certvalidator, oscrypto atomicwrites==1.3.0 # via pytest attrs==19.1.0 # via pytest aws-xray-sdk==0.95 # via moto @@ -34,7 +34,7 @@ configparser==4.0.2 # via importlib-metadata contextlib2==0.6.0.post1 # via cherrypy, importlib-metadata, importlib-resources, virtualenv cookies==2.2.1 # via responses croniter==0.3.29 -cryptography==2.6.1 # via moto, paramiko, pyopenssl, vcert +cryptography==2.8 distlib==0.3.0 # via virtualenv dnspython==1.16.0 docker-pycreds==0.4.0 # via docker @@ -92,7 +92,7 @@ pyasn1==0.4.5 pycparser==2.19 pycryptodome==3.8.1 pynacl==1.3.0 # via paramiko -pyopenssl==19.0.0 +pyopenssl==19.1.0 pyparsing==2.4.5 # via packaging pyserial==3.4 # via junos-eznc pytest-helpers-namespace==2019.1.8 @@ -140,5 +140,3 @@ xmltodict==0.12.0 # via moto yamlordereddictloader==0.4.0 zc.lockfile==1.4 # via cherrypy zipp==0.6.0 # via importlib-metadata, importlib-resources -# Passthrough dependencies from pkg/osx/req.txt -pyobjc==5.3 diff --git a/requirements/static/py3.5/darwin.txt b/requirements/static/py3.5/darwin.txt index c7155a5b5a94..2ac6e9e322f7 100644 --- a/requirements/static/py3.5/darwin.txt +++ b/requirements/static/py3.5/darwin.txt @@ -7,7 +7,7 @@ apache-libcloud==2.4.0 appdirs==1.4.3 # via virtualenv argh==0.26.2 # via watchdog -asn1crypto==1.3.0 # via certvalidator, cryptography, oscrypto +asn1crypto==1.3.0 # via certvalidator, oscrypto atomicwrites==1.3.0 # via pytest attrs==19.1.0 # via pytest aws-xray-sdk==0.95 # via moto @@ -29,7 +29,7 @@ click==7.0 clustershell==1.8.1 contextlib2==0.5.5 # via cherrypy croniter==0.3.29 -cryptography==2.6.1 # via moto, paramiko, pyopenssl, vcert +cryptography==2.8 distlib==0.3.0 # via virtualenv dnspython==1.16.0 docker-pycreds==0.4.0 # via docker @@ -83,7 +83,7 @@ pyasn1==0.4.5 pycparser==2.19 pycryptodome==3.8.1 pynacl==1.3.0 # via paramiko -pyopenssl==19.0.0 +pyopenssl==19.1.0 pyparsing==2.4.5 # via packaging pyserial==3.4 # via junos-eznc pytest-helpers-namespace==2019.1.8 @@ -125,5 +125,3 @@ xmltodict==0.12.0 # via moto yamlordereddictloader==0.4.0 zc.lockfile==1.4 # via cherrypy zipp==0.6.0 # via importlib-metadata, importlib-resources -# Passthrough dependencies from pkg/osx/req.txt -pyobjc==5.3 diff --git a/requirements/static/py3.6/darwin.txt b/requirements/static/py3.6/darwin.txt index 039c2e8d83b5..f87526ae0618 100644 --- a/requirements/static/py3.6/darwin.txt +++ b/requirements/static/py3.6/darwin.txt @@ -7,7 +7,7 @@ apache-libcloud==2.4.0 appdirs==1.4.3 # via virtualenv argh==0.26.2 # via watchdog -asn1crypto==1.3.0 # via certvalidator, cryptography, oscrypto +asn1crypto==1.3.0 # via certvalidator, oscrypto atomicwrites==1.3.0 # via pytest attrs==19.1.0 # via pytest aws-xray-sdk==0.95 # via moto @@ -29,7 +29,7 @@ click==7.0 clustershell==1.8.1 contextlib2==0.5.5 # via cherrypy croniter==0.3.29 -cryptography==2.6.1 # via moto, paramiko, pyopenssl, vcert +cryptography==2.8 distlib==0.3.0 # via virtualenv dnspython==1.16.0 docker-pycreds==0.4.0 # via docker @@ -82,7 +82,7 @@ pyasn1==0.4.5 pycparser==2.19 pycryptodome==3.8.1 pynacl==1.3.0 # via paramiko -pyopenssl==19.0.0 +pyopenssl==19.1.0 pyparsing==2.4.5 # via packaging pyserial==3.4 # via junos-eznc pytest-helpers-namespace==2019.1.8 @@ -124,5 +124,3 @@ xmltodict==0.12.0 # via moto yamlordereddictloader==0.4.0 zc.lockfile==1.4 # via cherrypy zipp==0.6.0 # via importlib-metadata, importlib-resources -# Passthrough dependencies from pkg/osx/req.txt -pyobjc==5.3 diff --git a/requirements/static/py3.7/darwin.txt b/requirements/static/py3.7/darwin.txt index 852be9fcc0fe..d55a2c638404 100644 --- a/requirements/static/py3.7/darwin.txt +++ b/requirements/static/py3.7/darwin.txt @@ -7,7 +7,7 @@ apache-libcloud==2.4.0 appdirs==1.4.3 # via virtualenv argh==0.26.2 # via watchdog -asn1crypto==1.3.0 # via certvalidator, cryptography, oscrypto +asn1crypto==1.3.0 # via certvalidator, oscrypto atomicwrites==1.3.0 # via pytest attrs==19.1.0 # via pytest aws-xray-sdk==0.95 # via moto @@ -29,7 +29,7 @@ click==7.0 clustershell==1.8.1 contextlib2==0.5.5 # via cherrypy croniter==0.3.29 -cryptography==2.6.1 # via moto, paramiko, pyopenssl, vcert +cryptography==2.8 distlib==0.3.0 # via virtualenv dnspython==1.16.0 docker-pycreds==0.4.0 # via docker @@ -81,7 +81,7 @@ pyasn1==0.4.5 pycparser==2.19 pycryptodome==3.8.1 pynacl==1.3.0 # via paramiko -pyopenssl==19.0.0 +pyopenssl==19.1.0 pyparsing==2.4.5 # via packaging pyserial==3.4 # via junos-eznc pytest-helpers-namespace==2019.1.8 @@ -123,5 +123,3 @@ xmltodict==0.12.0 # via moto yamlordereddictloader==0.4.0 zc.lockfile==1.4 # via cherrypy zipp==0.6.0 # via importlib-metadata -# Passthrough dependencies from pkg/osx/req.txt -pyobjc==5.3 From 02dfe4119c5a3c0be64676c7b5a6016951f06ca6 Mon Sep 17 00:00:00 2001 From: twangboy Date: Fri, 20 Mar 2020 16:44:20 -0600 Subject: [PATCH 10/11] Add pyobjc in its own requirements file --- pkg/osx/build_env.sh | 9 +++++++++ pkg/osx/req_pyobjc.txt | 7 +++++++ setup.py | 1 + 3 files changed, 17 insertions(+) create mode 100644 pkg/osx/req_pyobjc.txt diff --git a/pkg/osx/build_env.sh b/pkg/osx/build_env.sh index 14cb3dd46c7b..80e7d74d17a6 100755 --- a/pkg/osx/build_env.sh +++ b/pkg/osx/build_env.sh @@ -289,6 +289,15 @@ $PIP install -r $SRCDIR/pkg/osx/req.txt \ --no-cache-dir \ --upgrade +echo "################################################################################" +echo "Installing PyOBJ C Dependencies with pip (normal)" +echo "################################################################################" +$PIP install -r $SRCDIR/pkg/osx/req_pyobjc.txt \ + --target=$PYDIR/site-packages \ + --ignore-installed \ + --no-cache-dir \ + --upgrade + #echo "################################################################################" #echo "Installing Salt Dependencies with pip (build_ext)" #echo "################################################################################" diff --git a/pkg/osx/req_pyobjc.txt b/pkg/osx/req_pyobjc.txt new file mode 100644 index 000000000000..68f8e07a3dd6 --- /dev/null +++ b/pkg/osx/req_pyobjc.txt @@ -0,0 +1,7 @@ +pyobjc==5.3 +pyobjc-framework-AdSupport==5.3 +pyobjc-framework-BusinessChat==5.3 +pyobjc-framework-NaturalLanguage==5.3 +pyobjc-framework-Network==5.3 +pyobjc-framework-UserNotifications==5.3 +pyobjc-framework-VideoSubscriberAccount==5.3 diff --git a/setup.py b/setup.py index 4265fc1b5ce0..b65185723247 100755 --- a/setup.py +++ b/setup.py @@ -109,6 +109,7 @@ SALT_LONG_DESCRIPTION_FILE = os.path.join(os.path.abspath(SETUP_DIRNAME), 'README.rst') SALT_OSX_REQS = [ os.path.join(os.path.abspath(SETUP_DIRNAME), 'pkg', 'osx', 'req.txt'), + os.path.join(os.path.abspath(SETUP_DIRNAME), 'pkg', 'osx', 'req_pyobjc.txt') ] SALT_WINDOWS_REQS = [ os.path.join(os.path.abspath(SETUP_DIRNAME), 'pkg', 'windows', 'req.txt'), From 3bda8ddb8217d4514bdbfb2c09e0a0fd0827ad38 Mon Sep 17 00:00:00 2001 From: twangboy Date: Fri, 20 Mar 2020 17:52:59 -0600 Subject: [PATCH 11/11] Update noxfile and pre-commit --- .pre-commit-config.yaml | 12 ++++++++---- noxfile.py | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ef9e59c43041..12993feb1380 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,12 +19,13 @@ repos: - id: pip-tools-compile alias: compile-darwin-py2.7-zmq-requirements name: Darwin Py2.7 ZeroMQ Requirements - files: ^(pkg/osx/req\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$ + files: ^(pkg/osx/(req|req_pyobjc)\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$ args: - -v - --py-version=2.7 - --platform=darwin - --include=pkg/osx/req.txt + - --include=pkg/osx/req_pyobjc.txt - --include=requirements/base.txt - --include=requirements/zeromq.txt - --include=requirements/pytest.txt @@ -131,12 +132,13 @@ repos: - id: pip-tools-compile alias: compile-darwin-py3.5-zmq-requirements name: Darwin Py3.5 ZeroMQ Requirements - files: ^(pkg/osx/req\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$ + files: ^(pkg/osx/(req|req_pyobjc)\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$ args: - -v - --py-version=3.5 - --platform=darwin - --include=pkg/osx/req.txt + - --include=pkg/osx/req_pyobjc.txt - --include=requirements/base.txt - --include=requirements/zeromq.txt - --include=requirements/pytest.txt @@ -229,12 +231,13 @@ repos: - id: pip-tools-compile alias: compile-darwin-py3.6-zmq-requirements name: Darwin Py3.6 ZeroMQ Requirements - files: ^(pkg/osx/req\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$ + files: ^(pkg/osx/(req|req_pyobjc)\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$ args: - -v - --py-version=3.6 - --platform=darwin - --include=pkg/osx/req.txt + - --include=pkg/osx/req_pyobjc.txt - --include=requirements/base.txt - --include=requirements/zeromq.txt - --include=requirements/pytest.txt @@ -327,12 +330,13 @@ repos: - id: pip-tools-compile alias: compile-darwin-py3.7-zmq-requirements name: Darwin Py3.7 ZeroMQ Requirements - files: ^(pkg/osx/req\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$ + files: ^(pkg/osx/(req|req_pyobjc)\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$ args: - -v - --py-version=3.7 - --platform=darwin - --include=pkg/osx/req.txt + - --include=pkg/osx/req_pyobjc.txt - --include=requirements/base.txt - --include=requirements/zeromq.txt - --include=requirements/pytest.txt diff --git a/noxfile.py b/noxfile.py index fdb9b5bfcc18..5c70e0788cf2 100644 --- a/noxfile.py +++ b/noxfile.py @@ -301,6 +301,7 @@ def _install_requirements(session, transport, *extra_requirements): elif sys.platform.startswith('darwin'): requirements_files = [ os.path.join('pkg', 'osx', 'req.txt'), + os.path.join('pkg', 'osx', 'req_pyobjc.txt'), os.path.join('requirements', 'static', 'darwin.in') ]