Merge pull request #6 from s0undt3ch/hotfix/mock-reqs

Requirements Fixes
saltstack · Apr 26, 2019 · 90212e5 · 90212e5
2 parents bb496a4 + e91c81b
commit 90212e5
Show file tree

Hide file tree

Showing 124 changed files with 321 additions and 173 deletions.
diff --git a/requirements/static/arch.in b/requirements/static/arch.in
@@ -12,7 +12,7 @@ GitPython
 jsonschema<=2.6.0
 keyring==5.7.1
 kubernetes<4.0
-mock>=2.0.0; python_version < '3.0'
+mock>=2.0.0; python_version < '3.6'
 more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5

diff --git a/requirements/static/centos-6.in b/requirements/static/centos-6.in
@@ -14,7 +14,7 @@ junos-eznc
 jxmlease
 keyring==5.7.1
 kubernetes<4.0
-mock>=2.0.0; python_version < '3.0'
+mock>=2.0.0; python_version < '3.6'
 more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5

diff --git a/requirements/static/centos-7.in b/requirements/static/centos-7.in
@@ -15,7 +15,7 @@ jxmlease
 kazoo
 keyring==5.7.1
 kubernetes<4.0
-mock>=2.0.0; python_version < '3.0'
+mock>=2.0.0; python_version < '3.6'
 more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5

diff --git a/requirements/static/debian-8.in b/requirements/static/debian-8.in
@@ -14,7 +14,7 @@ junos-eznc
 jxmlease
 keyring==5.7.1
 kubernetes<4.0
-mock>=2.0.0; python_version < '3.0'
+mock>=2.0.0; python_version < '3.6'
 more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5

diff --git a/requirements/static/debian-9.in b/requirements/static/debian-9.in
@@ -14,7 +14,7 @@ junos-eznc
 jxmlease
 keyring==5.7.1
 kubernetes<4.0
-mock>=2.0.0; python_version < '3.0'
+mock>=2.0.0; python_version < '3.6'
 more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5

diff --git a/requirements/static/fedora-28.in b/requirements/static/fedora-28.in
@@ -14,7 +14,7 @@ junos-eznc
 jxmlease
 keyring==5.7.1
 kubernetes<4.0
-mock>=2.0.0; python_version < '3.0'
+mock>=2.0.0; python_version < '3.6'
 more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5

diff --git a/requirements/static/fedora-29.in b/requirements/static/fedora-29.in
@@ -14,7 +14,7 @@ junos-eznc
 jxmlease
 keyring==5.7.1
 kubernetes<4.0
-mock>=2.0.0; python_version < '3.0'
+mock>=2.0.0; python_version < '3.6'
 more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5

diff --git a/requirements/static/opensuse-42.in b/requirements/static/opensuse-42.in
@@ -14,7 +14,7 @@ hgtools
 jsonschema<=2.6.0
 keyring==5.7.1
 kubernetes<4.0
-mock>=2.0.0; python_version < '3.0'
+mock>=2.0.0; python_version < '3.6'
 more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5

diff --git a/requirements/static/opensuse-leap-15.in b/requirements/static/opensuse-leap-15.in
@@ -14,7 +14,7 @@ hgtools
 jsonschema<=2.6.0
 keyring==5.7.1
 kubernetes<4.0
-mock>=2.0.0; python_version < '3.0'
+mock>=2.0.0; python_version < '3.6'
 more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5

diff --git a/requirements/static/osx.in b/requirements/static/osx.in
@@ -14,7 +14,7 @@ junos-eznc
 jxmlease
 keyring==5.7.1
 kubernetes<4.0
-mock>=2.0.0; python_version < '3.0'
+mock>=2.0.0; python_version < '3.6'
 more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5

diff --git a/requirements/static/py2.7/raet-arch.txt b/requirements/static/py2.7/raet-arch.txt
@@ -55,7 +55,7 @@ kubernetes==3.0.0
 libnacl==1.6.1
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6

diff --git a/requirements/static/py2.7/raet-centos-6.txt b/requirements/static/py2.7/raet-centos-6.txt
@@ -59,7 +59,7 @@ libnacl==1.6.1
 lxml==4.3.3               # via junos-eznc, ncclient
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6

diff --git a/requirements/static/py2.7/raet-centos-7.txt b/requirements/static/py2.7/raet-centos-7.txt
@@ -59,7 +59,7 @@ libnacl==1.6.1
 lxml==4.3.3               # via junos-eznc, ncclient
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6

diff --git a/requirements/static/py2.7/raet-debian-8.txt b/requirements/static/py2.7/raet-debian-8.txt
@@ -58,7 +58,7 @@ libnacl==1.6.1
 lxml==4.3.3               # via junos-eznc, ncclient
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6

diff --git a/requirements/static/py2.7/raet-debian-9.txt b/requirements/static/py2.7/raet-debian-9.txt
@@ -58,7 +58,7 @@ libnacl==1.6.1
 lxml==4.3.3               # via junos-eznc, ncclient
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6

diff --git a/requirements/static/py2.7/raet-fedora-28.txt b/requirements/static/py2.7/raet-fedora-28.txt
@@ -59,7 +59,7 @@ libnacl==1.6.1
 lxml==4.3.3               # via junos-eznc, ncclient
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6

diff --git a/requirements/static/py2.7/raet-fedora-29.txt b/requirements/static/py2.7/raet-fedora-29.txt
@@ -59,7 +59,7 @@ libnacl==1.6.1
 lxml==4.3.3               # via junos-eznc, ncclient
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6

diff --git a/requirements/static/py2.7/raet-opensuse-42.txt b/requirements/static/py2.7/raet-opensuse-42.txt
@@ -56,7 +56,7 @@ kubernetes==3.0.0
 libnacl==1.6.1
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6

diff --git a/requirements/static/py2.7/raet-opensuse-leap-15.txt b/requirements/static/py2.7/raet-opensuse-leap-15.txt
@@ -56,7 +56,7 @@ kubernetes==3.0.0
 libnacl==1.6.1
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6

diff --git a/requirements/static/py2.7/raet-osx.txt b/requirements/static/py2.7/raet-osx.txt
@@ -55,7 +55,7 @@ libnacl==1.6.1
 lxml==4.3.3               # via junos-eznc, ncclient
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6

diff --git a/requirements/static/py2.7/raet-ubuntu-14.04.txt b/requirements/static/py2.7/raet-ubuntu-14.04.txt
@@ -58,7 +58,7 @@ libnacl==1.6.1
 lxml==4.3.3               # via junos-eznc, ncclient
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6

diff --git a/requirements/static/py2.7/raet-ubuntu-16.04.txt b/requirements/static/py2.7/raet-ubuntu-16.04.txt
@@ -58,7 +58,7 @@ libnacl==1.6.1
 lxml==4.3.3               # via junos-eznc, ncclient
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6

diff --git a/requirements/static/py2.7/raet-ubuntu-18.04.txt b/requirements/static/py2.7/raet-ubuntu-18.04.txt
@@ -58,7 +58,7 @@ libnacl==1.6.1
 lxml==4.3.3               # via junos-eznc, ncclient
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6

diff --git a/requirements/static/py2.7/raet-windows.txt b/requirements/static/py2.7/raet-windows.txt
@@ -7,45 +7,58 @@
 asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
+aws-sam-translator==1.11.0  # via cfn-lint
+aws-xray-sdk==2.4.2       # via moto
 backports-abc==0.5        # via tornado
 backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
+backports.tempfile==1.0   # via moto
+backports.weakref==1.0.post1  # via backports.tempfile
 boto3==1.9.132
 boto==2.49.0
-botocore==1.12.132        # via boto3, s3transfer
+botocore==1.12.132        # via aws-xray-sdk, boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
 certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2              # via cryptography
+cfn-lint==0.19.1          # via moto
 chardet==3.0.4            # via requests
 colorama==0.4.1           # via pytest
+cookies==2.2.1            # via responses
 coverage==4.5.3           # via pytest-cov
-cryptography==2.6.1       # via pyopenssl
+cryptography==2.6.1       # via moto, pyopenssl
 dmidecode==0.9.0
 dnspython==1.16.0
 docker-pycreds==0.4.0     # via docker
 docker==2.7.0
 docutils==0.14            # via botocore
-enum34==1.1.6             # via cryptography, raet
+ecdsa==0.13.2             # via python-jose
+enum34==1.1.6             # via aws-sam-translator, aws-xray-sdk, cryptography, raet
 funcsigs==1.0.2           # via mock, pytest
 functools32==3.2.3.post2  # via jsonschema
+future==0.17.1            # via aws-xray-sdk, python-jose
 futures==3.2.0 ; python_version < "3.0"
 google-auth==1.6.3        # via kubernetes
-idna==2.8                 # via requests
+idna==2.8                 # via moto, requests
 ioflo==1.7.5
 ipaddress==1.0.22         # via cryptography, docker, kubernetes
 jinja2==2.10.1
 jmespath==0.9.4           # via boto3, botocore
+jsondiff==1.1.2           # via moto
+jsonpatch==1.23           # via cfn-lint
+jsonpickle==1.1           # via aws-xray-sdk
+jsonpointer==2.0          # via jsonpatch
 jsonschema==2.6.0
 keyring==5.7.1
 kubernetes==3.0.0
 libnacl==1.6.1
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
+moto==1.3.8
 msgpack-python==0.5.6
 msgpack==0.6.1
 patch==1.16
-pathlib2==2.3.3           # via pytest
+pathlib2==2.3.3           # via cfn-lint, pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 psutil==5.6.1
@@ -61,28 +74,34 @@ pytest-salt==2018.12.8
 pytest-tempdir==2018.8.11
 pytest-timeout==1.3.3
 pytest==4.4.1
-python-dateutil==2.8.0    # via botocore, kubernetes
+python-dateutil==2.8.0    # via botocore, kubernetes, moto
 python-etcd==0.4.5
 python-gnupg==0.4.4
+python-jose==3.0.1        # via moto
+pytz==2019.1              # via moto
 pyvmomi==6.7.1.2018.12
 pywin32==223
 pyyaml==3.13
 raet==0.6.8
 requests==2.21.0
+responses==0.10.6         # via moto
 rfc3987==1.3.8
-rsa==4.0                  # via google-auth
+rsa==4.0                  # via google-auth, python-jose
 s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scandir==1.10.0           # via pathlib2
 sed==0.3.1
 setproctitle==1.1.10
 singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, pathlib2, pyopenssl, pytest, python-dateutil, pyvmomi, raet, salttesting, singledispatch, websocket-client
+six==1.12.0               # via aws-sam-translator, cfn-lint, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, websocket-client
 strict-rfc3339==0.7
 supervisor==3.3.5 ; python_version < "3"
 timelib==0.2.4
 tornado==4.5.3 ; python_version < "3"
 urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
 virtualenv==16.4.3
 websocket-client==0.40.0  # via docker, kubernetes
+werkzeug==0.15.2          # via moto
 wmi==1.4.9
+wrapt==1.11.1             # via aws-xray-sdk
+xmltodict==0.12.0         # via moto
diff --git a/requirements/static/py2.7/tcp-arch.txt b/requirements/static/py2.7/tcp-arch.txt
@@ -53,7 +53,7 @@ keyring==5.7.1
 kubernetes==3.0.0
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6

diff --git a/requirements/static/py2.7/tcp-centos-6.txt b/requirements/static/py2.7/tcp-centos-6.txt
@@ -57,7 +57,7 @@ kubernetes==3.0.0
 lxml==4.3.3               # via junos-eznc, ncclient
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6

diff --git a/requirements/static/py2.7/tcp-centos-7.txt b/requirements/static/py2.7/tcp-centos-7.txt
@@ -57,7 +57,7 @@ kubernetes==3.0.0
 lxml==4.3.3               # via junos-eznc, ncclient
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6

diff --git a/requirements/static/py2.7/tcp-debian-8.txt b/requirements/static/py2.7/tcp-debian-8.txt
@@ -56,7 +56,7 @@ kubernetes==3.0.0
 lxml==4.3.3               # via junos-eznc, ncclient
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6

diff --git a/requirements/static/py2.7/tcp-debian-9.txt b/requirements/static/py2.7/tcp-debian-9.txt
@@ -56,7 +56,7 @@ kubernetes==3.0.0
 lxml==4.3.3               # via junos-eznc, ncclient
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6

diff --git a/requirements/static/py2.7/tcp-fedora-28.txt b/requirements/static/py2.7/tcp-fedora-28.txt
@@ -57,7 +57,7 @@ kubernetes==3.0.0
 lxml==4.3.3               # via junos-eznc, ncclient
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6

diff --git a/requirements/static/py2.7/tcp-fedora-29.txt b/requirements/static/py2.7/tcp-fedora-29.txt
@@ -57,7 +57,7 @@ kubernetes==3.0.0
 lxml==4.3.3               # via junos-eznc, ncclient
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6

diff --git a/requirements/static/py2.7/tcp-opensuse-42.txt b/requirements/static/py2.7/tcp-opensuse-42.txt
@@ -54,7 +54,7 @@ keyring==5.7.1
 kubernetes==3.0.0
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6

diff --git a/requirements/static/py2.7/tcp-opensuse-leap-15.txt b/requirements/static/py2.7/tcp-opensuse-leap-15.txt
@@ -54,7 +54,7 @@ keyring==5.7.1
 kubernetes==3.0.0
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6

diff --git a/requirements/static/py2.7/tcp-osx.txt b/requirements/static/py2.7/tcp-osx.txt
@@ -53,7 +53,7 @@ kubernetes==3.0.0
 lxml==4.3.3               # via junos-eznc, ncclient
 markupsafe==1.1.1
 meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.0"
+mock==2.0.0 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6