From 42ea853a1597f410b7db937f61042167802fc7d0 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Mon, 22 Aug 2022 17:20:09 -0400 Subject: [PATCH] Revert "Pin setuptools in CI (#8526)" (#8530) * Revert "Pin setuptools in CI (#8526)" With the release of setuptools 64.0.1 the issues previously blocking CI and editable installs more generally should have fixed now. This commit reverts the pins previously introduced to unblock CI and work around the broken release. This reverts commit 82e38d1de0ea950457d647955471404b044910b8. * Add back SETUPTOOLS_ENABLE_FEATURES env var for legacy editable install Co-authored-by: Jake Lishman Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> (cherry picked from commit dfca1fb90d2ba18ca6f9d27f311a468fc1f3e1bf) --- .azure/docs-linux.yml | 4 ++-- .azure/lint-linux.yml | 2 +- .azure/test-linux.yml | 3 +-- .azure/test-macos.yml | 2 +- .azure/test-windows.yml | 2 +- constraints.txt | 4 ---- pyproject.toml | 2 +- 7 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.azure/docs-linux.yml b/.azure/docs-linux.yml index 0f8e3015c0eb..83026963219d 100644 --- a/.azure/docs-linux.yml +++ b/.azure/docs-linux.yml @@ -30,8 +30,8 @@ jobs: - bash: | set -e - python -m pip install --upgrade pip 'setuptools<64.0.0' wheel -c constraints.txt - pip install -U tox -c constraints.txt + python -m pip install --upgrade pip setuptools wheel + pip install -U tox sudo apt-get update sudo apt-get install -y graphviz displayName: 'Install dependencies' diff --git a/.azure/lint-linux.yml b/.azure/lint-linux.yml index 5fddd6afef3f..a5cebd8815db 100644 --- a/.azure/lint-linux.yml +++ b/.azure/lint-linux.yml @@ -28,7 +28,7 @@ jobs: - bash: | set -e - python -m pip install --upgrade pip 'setuptools<64.0.0' wheel virtualenv -c constraints.txt + python -m pip install --upgrade pip setuptools wheel virtualenv virtualenv test-job source test-job/bin/activate pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt diff --git a/.azure/test-linux.yml b/.azure/test-linux.yml index 14d1c090f822..a8bef0ea6784 100644 --- a/.azure/test-linux.yml +++ b/.azure/test-linux.yml @@ -62,7 +62,7 @@ jobs: - bash: | set -e - python -m pip install --upgrade pip 'setuptools<64.0.0' wheel virtualenv -c constraints.txt + python -m pip install --upgrade pip setuptools wheel virtualenv virtualenv test-job displayName: "Prepare venv" @@ -85,7 +85,6 @@ jobs: env: SETUPTOOLS_ENABLE_FEATURES: "legacy-editable" - - bash: | set -e source test-job/bin/activate diff --git a/.azure/test-macos.yml b/.azure/test-macos.yml index d7d98c3ef3be..ab0a6517bd4a 100644 --- a/.azure/test-macos.yml +++ b/.azure/test-macos.yml @@ -41,7 +41,7 @@ jobs: - bash: | set -e - python -m pip install --upgrade pip 'setuptools<64.0.0' wheel virtualenv -c constraints.txt + python -m pip install --upgrade pip setuptools wheel virtualenv virtualenv test-job source test-job/bin/activate pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt diff --git a/.azure/test-windows.yml b/.azure/test-windows.yml index 8140a6ce4fbb..2437ea55e026 100644 --- a/.azure/test-windows.yml +++ b/.azure/test-windows.yml @@ -30,7 +30,7 @@ jobs: - bash: | set -e - python -m pip install --upgrade pip 'setuptools<64.0.0' wheel virtualenv -c constraints.txt + python -m pip install --upgrade pip setuptools wheel virtualenv virtualenv test-job source test-job/Scripts/activate pip install -r requirements.txt -r requirements-dev.txt -c constraints.txt diff --git a/constraints.txt b/constraints.txt index bf4e304596c5..3cb8598cb345 100644 --- a/constraints.txt +++ b/constraints.txt @@ -13,7 +13,3 @@ pyparsing<3.0.0 # to work with the new jinja version (the jinja maintainers aren't going to # fix things) pin to the previous working version. jinja2==3.0.3 - -# setuptools 64.0.0 breaks editable installs. Pin to an old version until -# see https://github.com/pypa/setuptools/issues/3498 -setuptools==63.3.0 diff --git a/pyproject.toml b/pyproject.toml index 728e2a2be55a..9282c3b8c8d0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools", "wheel", "setuptools-rust<1.5.0"] +requires = ["setuptools", "wheel", "setuptools-rust"] build-backend = "setuptools.build_meta" [tool.black]