From 9a6d5cb6281bfdd0448077cbc6c8504726a09d73 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone <exarkun@twistedmatrix.com> Date: Mon, 20 Jan 2020 11:35:14 -0500 Subject: [PATCH 1/3] Attempt to inherit the base dependencies in the pyinstaller env --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index ff5a2d680..7d869b6bd 100644 --- a/tox.ini +++ b/tox.ini @@ -171,6 +171,7 @@ commands = install_command = python -m pip install --no-use-pep517 {opts} {packages} extras = deps = + {[testenv]deps} packaging pyinstaller # Setting PYTHONHASHSEED to a known value assists with reproducible builds. From 6d3461d5635e8d3bb11db1eb275891ca315eb483 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone <exarkun@twistedmatrix.com> Date: Mon, 20 Jan 2020 11:35:53 -0500 Subject: [PATCH 2/3] news fragment --- newsfragments/3276.minor | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 newsfragments/3276.minor diff --git a/newsfragments/3276.minor b/newsfragments/3276.minor new file mode 100644 index 000000000..e69de29bb From 9da5194e6d2462935b40dda12e26d098c466797f Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone <exarkun@twistedmatrix.com> Date: Mon, 20 Jan 2020 13:27:41 -0500 Subject: [PATCH 3/3] coverage wants to play this is another instance of the 5.0 incompatibility --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 8f00eff98..f6efe785a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -69,7 +69,7 @@ after_test: %PYTHON%\python.exe setup.py bdist_wheel %PYTHON%\python.exe -m pip wheel -w dist . - | - %PYTHON%\python.exe -m pip install codecov coverage + %PYTHON%\python.exe -m pip install codecov "coverage ~= 4.5" %PYTHON%\python.exe -m coverage xml -o coverage.xml -i %PYTHON%\python.exe -m codecov -X search -X gcov -f coverage.xml