summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2022-03-27 21:43:59 -0400
committerJason R. Coombs <jaraco@jaraco.com>2022-03-27 21:43:59 -0400
commit2a233e54eba61e6dd6fc0c78f7f844430a758498 (patch)
tree6e4acb958e054349e43a66a1f875586bb4f44ac7
parentf2e73a418ec070340c711ae05315ad73c3982799 (diff)
downloadpython-setuptools-git-2a233e54eba61e6dd6fc0c78f7f844430a758498.tar.gz
Disable installation of Setuptools in tox instead of GHA. Ref pypa/distutils#99.
-rw-r--r--.github/workflows/main.yml4
-rw-r--r--tox.ini2
2 files changed, 2 insertions, 4 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6fca2f69..12b049c6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,10 +6,6 @@ concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
cancel-in-progress: true
-env:
- # pypa/distutils#99
- VIRTUALENV_NO_SETUPTOOLS: 1
-
jobs:
test:
strategy:
diff --git a/tox.ini b/tox.ini
index 83d54b2f..2f285175 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,6 +5,8 @@ commands =
pytest {posargs}
setenv =
PYTHONPATH = {toxinidir}
+ # pypa/distutils#99
+ VIRTUALENV_NO_SETUPTOOLS = 1
passenv =
# workaround for tox-dev/tox#2382
PROGRAMDATA