Skip to content

Commit 3dfa449

Browse files
committed
test(build): a better way to pin light-thread packages
Also, clearly indicate when we are skipping tests because the packages aren't available.
1 parent 2f7e384 commit 3dfa449

File tree

7 files changed

+31
-5
lines changed

7 files changed

+31
-5
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ upgrade: ## update the *.pip files with the latest packages satisfying *.in
7474
$(PIP_COMPILE) -o requirements/kit.pip requirements/kit.in
7575
$(PIP_COMPILE) -o requirements/tox.pip requirements/tox.in
7676
$(PIP_COMPILE) -o requirements/dev.pip requirements/dev.in
77+
$(PIP_COMPILE) -o requirements/light-threads.pip requirements/light-threads.in
7778
$(PIP_COMPILE) -o doc/requirements.pip doc/requirements.in
7879

7980
# Kitting

requirements/dev.pip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# make upgrade
66
#
7-
astroid==2.8.5
7+
astroid==2.8.6
88
# via pylint
99
attrs==21.2.0
1010
# via
@@ -62,7 +62,7 @@ future==0.18.2
6262
# pycontracts
6363
greenlet==1.1.2
6464
# via -r requirements/dev.in
65-
hypothesis==6.25.0
65+
hypothesis==6.27.1
6666
# via -r requirements/pytest.pip
6767
idna==3.3
6868
# via requests

requirements/light-threads.in

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
2+
# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
3+
4+
-c pins.pip
5+
6+
# The light-threads packages we test against
7+
8+
eventlet
9+
greenlet

requirements/light-threads.pip

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#
2+
# This file is autogenerated by pip-compile with python 3.8
3+
# To update, run:
4+
#
5+
# make upgrade
6+
#
7+
dnspython==2.1.0
8+
# via eventlet
9+
eventlet==0.33.0
10+
# via -r requirements/light-threads.in
11+
greenlet==1.1.2
12+
# via
13+
# -r requirements/light-threads.in
14+
# eventlet
15+
six==1.16.0
16+
# via eventlet

requirements/pytest.pip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ flaky==3.7.0
1818
# via -r requirements/pytest.in
1919
future==0.18.2
2020
# via pycontracts
21-
hypothesis==6.25.0
21+
hypothesis==6.27.1
2222
# via -r requirements/pytest.in
2323
iniconfig==1.1.1
2424
# via pytest

tests/test_concurrency.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ def try_some_code(self, code, concurrency, the_module, expected_out=None):
222222

223223
if expected_cant_trace is not None:
224224
assert out == expected_cant_trace
225+
pytest.skip(f"Can't test: {expected_cant_trace}")
225226
else:
226227
# We can fully measure the code if we are using the C tracer, which
227228
# can support all the concurrency, or if we are using threads.

tox.ini

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ deps =
1717
-r requirements/pytest.pip
1818
# gevent 1.3 causes a failure: https://github.com/nedbat/coveragepy/issues/663
1919
py{36}: gevent==1.2.2
20-
py{36,37,38}: eventlet==0.25.1
21-
py{36,37,38}: greenlet==0.4.15
20+
py{36,37,38,39,310}: -r requirements/light-threads.pip
2221

2322
# Windows can't update the pip version with pip running, so use Python
2423
# to install things.

0 commit comments

Comments
 (0)