requirements.txt: Update dependenciesbschubert/update-to-pytest-6

This now pulls in pytest > 6.0.1, which has a few breaking changes

Fix #1377

6 files changed, 33 insertions, 34 deletions

diff --git a/requirements/cov-requirements.in b/requirements/cov-requirements.in
index 5acb5cec5..d80d8f4ee 100644
--- a/requirements/cov-requirements.in
+++ b/requirements/cov-requirements.in
@@ -1,4 +1,4 @@
 coverage == 4.4.0
 pytest-cov >= 2.5.0
-pytest >= 3.9,!= 5.4.0,!= 5.4.1
+pytest >= 6.0.1
 Cython
diff --git a/requirements/cov-requirements.txt b/requirements/cov-requirements.txt
index 2934d29ef..3296a3fff 100644
--- a/requirements/cov-requirements.txt
+++ b/requirements/cov-requirements.txt
@@ -1,15 +1,16 @@
 coverage==4.4
-pytest-cov==2.8.1
-pytest==5.4.2
-Cython==0.29.17
+pytest-cov==2.10.0
+pytest==6.0.1
+Cython==0.29.21
 ## The following requirements were added by pip freeze:
 attrs==19.3.0
-importlib-metadata==1.6.0
-more-itertools==8.2.0
-packaging==20.3
+importlib-metadata==1.7.0
+iniconfig==1.0.1
+more-itertools==8.4.0
+packaging==20.4
 pluggy==0.13.1
-py==1.8.1
+py==1.9.0
 pyparsing==2.4.7
-six==1.14.0
-wcwidth==0.1.9
+six==1.15.0
+toml==0.10.1
 zipp==3.1.0
diff --git a/requirements/dev-requirements.in b/requirements/dev-requirements.in
index bba068428..5809351d3 100644
--- a/requirements/dev-requirements.in
+++ b/requirements/dev-requirements.in
@@ -1,8 +1,7 @@
 pexpect
 pylint
-# Pytest 5.4.0 and 5.4.1 have a bug with --basetemp and xdist
-# We should not install those
-pytest >= 3.9,!= 5.4.0,!= 5.4.1
+# Pytest 6.0.0 doesn't play well with pylint
+pytest >= 6.0.1
 pytest-datafiles >= 2.0
 pytest-env
 pytest-xdist
diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt
index 5a8ab1863..b6b9e83b3 100644
--- a/requirements/dev-requirements.txt
+++ b/requirements/dev-requirements.txt
@@ -1,32 +1,31 @@
 pexpect==4.8.0
-pylint==2.5.2
-# Pytest 5.4.0 and 5.4.1 have a bug with --basetemp and xdist
-# We should not install those
-pytest==5.4.2
+pylint==2.5.3
+# Pytest 6.0.0 doesn't play well with pylint
+pytest==6.0.1
 pytest-datafiles==2.0
 pytest-env==0.6.2
-pytest-xdist==1.32.0
-pytest-timeout==1.3.4
+pytest-xdist==1.34.0
+pytest-timeout==1.4.2
 pyftpdlib==1.5.6
 ## The following requirements were added by pip freeze:
 apipkg==1.5
-astroid==2.4.1
+astroid==2.4.2
 attrs==19.3.0
 execnet==1.7.1
-importlib-metadata==1.6.0
+importlib-metadata==1.7.0
+iniconfig==1.0.1
 isort==4.3.21
 lazy-object-proxy==1.4.3
 mccabe==0.6.1
-more-itertools==8.2.0
-packaging==20.3
+more-itertools==8.4.0
+packaging==20.4
 pluggy==0.13.1
 ptyprocess==0.6.0
-py==1.8.1
+py==1.9.0
 pyparsing==2.4.7
-pytest-forked==1.1.3
-six==1.14.0
-toml==0.10.0
+pytest-forked==1.3.0
+six==1.15.0
+toml==0.10.1
 typed-ast==1.4.1
-wcwidth==0.1.9
 wrapt==1.12.1
 zipp==3.1.0
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 39759fc49..57063c0b1 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,15 +1,15 @@
-grpcio==1.28.1
+grpcio==1.30.0
 Jinja2==2.11.2
 pluginbase==1.0.0
-protobuf==3.11.3
-psutil==5.7.0
+protobuf==3.12.4
+psutil==5.7.2
 ruamel.yaml==0.16.10
 ruamel.yaml.clib==0.2.0
 setuptools==41.6.0
 pyroaring==0.2.9
-ujson==2.0.3
+ujson==3.1.0
 python-dateutil==2.8.1
 ## The following requirements were added by pip freeze:
 click==7.1.2
 MarkupSafe==1.1.1
-six==1.14.0
+six==1.15.0
diff --git a/src/buildstream/testing/runcli.py b/src/buildstream/testing/runcli.py
index 1e868609a..712e6811a 100644
--- a/src/buildstream/testing/runcli.py
+++ b/src/buildstream/testing/runcli.py
@@ -372,7 +372,7 @@ class Cli:
         with open(os.devnull) as devnull:
             sys.stdin = devnull
             capture_kind = FDCaptureBinary if binary_capture else FDCapture
-            capture = MultiCapture(out=True, err=True, in_=False, Capture=capture_kind)
+            capture = MultiCapture(out=capture_kind(1), err=capture_kind(2), in_=None)
             capture.start_capturing()
 
             try: