From d6bf0d0b25524225dca26777c250efa63c0ad74a Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 23 Jan 2019 14:34:32 -0500 Subject: [PATCH 1/3] Try to get pip 19 and pyinstaller 3.4 working together --- tox.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tox.ini b/tox.ini index c0fc2b56a..873ed6892 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 pep517 rules are followed. +install_command = python -m pip --no-use-pep517 install {opts} {packages}(ARGV) extras = deps = packaging From 674f982b3fb0aec84f54ff613d40d3761fb88c5b Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 23 Jan 2019 16:10:49 -0500 Subject: [PATCH 2/3] 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..365e7b9e2 --- /dev/null +++ b/newsfragments/2958.other @@ -0,0 +1 @@ +The PyInstaller CI job now works around a pip/pyinstaller incompatibility. From 007d13d357cb03a9678d05de850986288bbc761c Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 23 Jan 2019 16:48:34 -0500 Subject: [PATCH 3/3] watch out when copy/pasting from tox docs --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 873ed6892..22d99325c 100644 --- a/tox.ini +++ b/tox.ini @@ -120,7 +120,7 @@ commands = [testenv:pyinstaller] # We override this to pass --no-use-pep517 because pyinstaller (3.4, at least) # is broken when pep517 rules are followed. -install_command = python -m pip --no-use-pep517 install {opts} {packages}(ARGV) +install_command = python -m pip --no-use-pep517 install {opts} {packages} extras = deps = packaging