summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2021-11-23 08:34:41 -0500
committerNed Batchelder <ned@nedbatchelder.com>2021-11-24 06:45:10 -0500
commit3dfa4498abf5885307f921862f7d367166af76a6 (patch)
tree22c97d835fb27868baffea91b68ecee7d35389d8
parent2f7e38407321c1ce33a8a13cd3fbb7d73be99278 (diff)
downloadpython-coveragepy-git-3dfa4498abf5885307f921862f7d367166af76a6.tar.gz
test(build): a better way to pin light-thread packages
Also, clearly indicate when we are skipping tests because the packages aren't available.
-rw-r--r--Makefile1
-rw-r--r--requirements/dev.pip4
-rw-r--r--requirements/light-threads.in9
-rw-r--r--requirements/light-threads.pip16
-rw-r--r--requirements/pytest.pip2
-rw-r--r--tests/test_concurrency.py1
-rw-r--r--tox.ini3
7 files changed, 31 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 541aeeca..3c460df4 100644
--- a/Makefile
+++ b/Makefile
@@ -74,6 +74,7 @@ upgrade: ## update the *.pip files with the latest packages satisfying *.in
$(PIP_COMPILE) -o requirements/kit.pip requirements/kit.in
$(PIP_COMPILE) -o requirements/tox.pip requirements/tox.in
$(PIP_COMPILE) -o requirements/dev.pip requirements/dev.in
+ $(PIP_COMPILE) -o requirements/light-threads.pip requirements/light-threads.in
$(PIP_COMPILE) -o doc/requirements.pip doc/requirements.in
# Kitting
diff --git a/requirements/dev.pip b/requirements/dev.pip
index 416df6a6..f187ae49 100644
--- a/requirements/dev.pip
+++ b/requirements/dev.pip
@@ -4,7 +4,7 @@
#
# make upgrade
#
-astroid==2.8.5
+astroid==2.8.6
# via pylint
attrs==21.2.0
# via
@@ -62,7 +62,7 @@ future==0.18.2
# pycontracts
greenlet==1.1.2
# via -r requirements/dev.in
-hypothesis==6.25.0
+hypothesis==6.27.1
# via -r requirements/pytest.pip
idna==3.3
# via requests
diff --git a/requirements/light-threads.in b/requirements/light-threads.in
new file mode 100644
index 00000000..73f75df5
--- /dev/null
+++ b/requirements/light-threads.in
@@ -0,0 +1,9 @@
+# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
+# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
+
+-c pins.pip
+
+# The light-threads packages we test against
+
+eventlet
+greenlet
diff --git a/requirements/light-threads.pip b/requirements/light-threads.pip
new file mode 100644
index 00000000..cce5545d
--- /dev/null
+++ b/requirements/light-threads.pip
@@ -0,0 +1,16 @@
+#
+# This file is autogenerated by pip-compile with python 3.8
+# To update, run:
+#
+# make upgrade
+#
+dnspython==2.1.0
+ # via eventlet
+eventlet==0.33.0
+ # via -r requirements/light-threads.in
+greenlet==1.1.2
+ # via
+ # -r requirements/light-threads.in
+ # eventlet
+six==1.16.0
+ # via eventlet
diff --git a/requirements/pytest.pip b/requirements/pytest.pip
index 11dbcc19..922d44c7 100644
--- a/requirements/pytest.pip
+++ b/requirements/pytest.pip
@@ -18,7 +18,7 @@ flaky==3.7.0
# via -r requirements/pytest.in
future==0.18.2
# via pycontracts
-hypothesis==6.25.0
+hypothesis==6.27.1
# via -r requirements/pytest.in
iniconfig==1.1.1
# via pytest
diff --git a/tests/test_concurrency.py b/tests/test_concurrency.py
index 0f5b07eb..c37c88be 100644
--- a/tests/test_concurrency.py
+++ b/tests/test_concurrency.py
@@ -222,6 +222,7 @@ class ConcurrencyTest(CoverageTest):
if expected_cant_trace is not None:
assert out == expected_cant_trace
+ pytest.skip(f"Can't test: {expected_cant_trace}")
else:
# We can fully measure the code if we are using the C tracer, which
# can support all the concurrency, or if we are using threads.
diff --git a/tox.ini b/tox.ini
index 2bbaf911..6d756c0c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,8 +17,7 @@ deps =
-r requirements/pytest.pip
# gevent 1.3 causes a failure: https://github.com/nedbat/coveragepy/issues/663
py{36}: gevent==1.2.2
- py{36,37,38}: eventlet==0.25.1
- py{36,37,38}: greenlet==0.4.15
+ py{36,37,38,39,310}: -r requirements/light-threads.pip
# Windows can't update the pip version with pip running, so use Python
# to install things.