From 0996c18f55be418650e153508fecdb1f84a8768a Mon Sep 17 00:00:00 2001 From: David Glick Date: Wed, 24 Apr 2019 14:49:25 -0400 Subject: [PATCH 1/4] Workaround pip's change in behavior --- .circleci/config.yml | 6 +++--- CONTRIBUTING.rst | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c0d3f61e90..f53e5bdfd3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,7 +21,7 @@ jobs: name: Install dependencies command: | virtualenv venv - venv/bin/pip install $(grep black requirements_dev.txt | cut -d';' -f 1) + venv/bin/pip install --no-use-pep517 $(grep black requirements_dev.txt | cut -d';' -f 1) - run: name: Run black command: | @@ -81,7 +81,7 @@ jobs: name: Install Python dependencies command: | virtualenv venv - venv/bin/pip install -r requirements_dev.txt + venv/bin/pip install --no-use-pep517 -r requirements_dev.txt - run: name: Install sfdx command: | @@ -136,7 +136,7 @@ jobs: name: Install Python dependencies command: | virtualenv venv - venv/bin/pip install -r requirements_dev.txt + venv/bin/pip install --no-use-pep517 -r requirements_dev.txt - run: name: Check out CumulusCI-Test command: | diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index d3d3f218e6..7b08ea82bf 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -57,7 +57,7 @@ Ready to contribute? Here's how to set up CumulusCI for local development. 2. Clone your fork to your local workspace. 3. Create a fresh virtual environment using virtualenv and install development requirements:: - $ pip install -r requirements_dev.txt + $ pip install --no-use-pep517 -r requirements_dev.txt 4. Install ``pre-commit`` hooks for ``black`` and ``flake8``:: From 330d8502db4b7becfb7d61d69b39980d1b6da62d Mon Sep 17 00:00:00 2001 From: David Glick Date: Wed, 24 Apr 2019 14:53:34 -0400 Subject: [PATCH 2/4] Update tox configuration --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index b542b2bb6f..e389f912eb 100644 --- a/tox.ini +++ b/tox.ini @@ -10,4 +10,4 @@ commands = coverage run {envbindir}/pytest [] ; If you want to make tox run the tests with the same versions, create a ; requirements.txt with the pinned versions and uncomment the following lines: deps = - -r{toxinidir}/requirements_dev.txt + --no-use-pep517 -r {toxinidir}/requirements_dev.txt From 00e06a224e16fbb8b84a328b575ad7cdfc0e8af2 Mon Sep 17 00:00:00 2001 From: David Glick Date: Wed, 24 Apr 2019 14:58:03 -0400 Subject: [PATCH 3/4] Try a different way --- tox.ini | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index e389f912eb..ba652c07b2 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,5 @@ setenv = commands = coverage run {envbindir}/pytest [] -; If you want to make tox run the tests with the same versions, create a -; requirements.txt with the pinned versions and uncomment the following lines: -deps = - --no-use-pep517 -r {toxinidir}/requirements_dev.txt +install_command = + python -m pip install --no-use-pep517 -r {toxinidir}/requirements_dev.txt From 7117ac472317388bea7bb4bf3e70ac064665f55c Mon Sep 17 00:00:00 2001 From: David Glick Date: Wed, 24 Apr 2019 15:02:24 -0400 Subject: [PATCH 4/4] And again --- tox.ini | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index ba652c07b2..2d75f1b309 100644 --- a/tox.ini +++ b/tox.ini @@ -7,5 +7,7 @@ setenv = commands = coverage run {envbindir}/pytest [] +deps = + -r{toxinidir}/requirements_dev.txt install_command = - python -m pip install --no-use-pep517 -r {toxinidir}/requirements_dev.txt + python -m pip install --no-use-pep517 {opts} {packages}