From bad1411bd6ab40d5b3dc2c1308eeb758e2865ba6 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Fri, 25 Jan 2019 09:16:44 -0500 Subject: [PATCH 1/2] news fragment --- newsfragments/2958.other | 1 + 1 file changed, 1 insertion(+) create mode 100644 newsfragments/2958.other diff --git a/newsfragments/2958.other b/newsfragments/2958.other new file mode 100644 index 000000000..d4a7ca4cc --- /dev/null +++ b/newsfragments/2958.other @@ -0,0 +1 @@ +The PyInstaller CI job now works around a pip/pyinstaller incompatibility. \ No newline at end of file From fec5064a2f0778bca3f76887278b1a8c0728aa7c Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Fri, 25 Jan 2019 10:46:23 -0500 Subject: [PATCH 2/2] Get pip and pyinstaller working together. --- tox.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tox.ini b/tox.ini index c0fc2b56a..2271bd2ac 100644 --- a/tox.ini +++ b/tox.ini @@ -118,6 +118,9 @@ commands = sphinx-build -b html -d {toxinidir}/docs/_build/doctrees {toxinidir}/docs {toxinidir}/docs/_build/html [testenv:pyinstaller] +# We override this to pass --no-use-pep517 because pyinstaller (3.4, at least) +# is broken when this feature is enabled. +install_command = python -m pip install --no-use-pep517 {opts} {packages} extras = deps = packaging