requirements: Add mock; update py.test

While it'd be technically more correct to split these out into dev
requirements, I think a little bit of an overhaul of our bootstrap
process overdue. We can save that work for then. For now, this smooths
a kink in the docker-compose work we're doing.

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/requirements.in b/requirements.in
index 9d6405dbcf54f17d6eac7d11e672c539376866ef..dd5bce9e38569750b05388b4910c51bd91acaabf 100644 (file)
--- a/requirements.in
+++ b/requirements.in
@@ -34,7 +34,8 @@ boto3
 cryptography>=2.7
 nose
 pip-tools
-pytest==3.7.1
+pytest
+mock
 requests
 tox
 xmltodict

diff --git a/requirements.txt b/requirements.txt
index a54b78f0d8538c3590c53b7d39c6eeb0be1a352c..37e86007e12e8c82a40cce2aace2792dc2e0508d 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
-#    pip-compile --output-file=- requirements.in
+#    pip-compile requirements.in
 #
 ansible==2.9.24
     # via teuthology
@@ -12,8 +12,6 @@ appdirs==1.4.4
     # via openstacksdk
 argparse==1.4.0
     # via teuthology
-atomicwrites==1.4.0
-    # via pytest
 attrs==21.2.0
     # via
     #   cmd2
@@ -95,6 +93,8 @@ humanfriendly==9.2
     # via teuthology
 idna==3.2
     # via requests
+iniconfig==1.1.1
+    # via pytest
 ipy==1.1
     # via teuthology
 iso8601==0.1.16
@@ -126,8 +126,8 @@ manhole==1.8.0
     # via teuthology
 markupsafe==2.0.1
     # via jinja2
-more-itertools==8.8.0
-    # via pytest
+mock==4.0.3
+    # via teuthology
 msgpack==1.0.2
     # via oslo.serialization
 munch==2.5.0
@@ -181,6 +181,7 @@ oslo.utils==4.9.2
 packaging==21.0
     # via
     #   oslo.utils
+    #   pytest
     #   tox
 paramiko==2.7.2
     # via teuthology
@@ -307,7 +308,6 @@ six==1.16.0
     #   munch
     #   oslo.i18n
     #   pyopenssl
-    #   pytest
     #   python-dateutil
     #   python-keystoneclient
     #   tox
@@ -326,6 +326,7 @@ stevedore==3.3.0
 toml==0.10.2
     # via
     #   teuthology
+    #   pytest
     #   tox
 tomli==1.2.1
     # via pep517

diff --git a/tox.ini b/tox.ini
index 6497d3a38de3da91b5a1a018d9bbfcdfba78c660..3e77fd4012122359d5a2134448652837c3860ca5 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,6 @@ install_command = pip install --upgrade {opts} {packages}
 passenv = HOME
 deps=
   -r{toxinidir}/requirements.txt
-  mock==2.0.0
   pytest-cov==2.8.1
   coverage==4.5.4
 log_format = %(asctime)s %(levelname)s %(message)s
@@ -34,7 +33,6 @@ deps=
   -r{toxinidir}/requirements.txt
   sphinx
   sphinxcontrib-programoutput
-  mock==2.0.0
 commands=
     sphinx-apidoc -f -o . ../teuthology ../teuthology/test ../teuthology/orchestra/test ../teuthology/task/test
     sphinx-build -b html -d {envtmpdir}/doctrees .  {envtmpdir}/html
@@ -45,7 +43,6 @@ passenv = HOME OS_REGION_NAME OS_AUTH_URL OS_TENANT_ID OS_TENANT_NAME OS_PASSWOR
 sitepackages=True
 deps=
   -r{toxinidir}/requirements.txt
-  mock==2.0.0
 
 commands=py.test -v {posargs:teuthology/openstack/test/test_openstack.py}
 basepython=python3
@@ -55,7 +52,6 @@ passenv = HOME OS_REGION_NAME OS_AUTH_URL OS_TENANT_ID OS_TENANT_NAME OS_PASSWOR
 basepython=python3
 deps=
     -r{toxinidir}/requirements.txt
-    mock==2.0.0
 
 commands=
     py.test -v {posargs} teuthology/openstack/test/openstack-integration.py