From dd1ff76f93cdf1e7f13f0aa3fe684576e1cbb4fe Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Thu, 18 Jul 2024 10:13:01 -0400 Subject: [PATCH 1/3] pin setuptools to address setuptools#4483 --- .github/workflows/main.yml | 2 +- build-requirements.txt | 5 +++++ dev-requirements.txt | 4 +--- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 build-requirements.txt diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a89082969..0caf9cbe8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -131,7 +131,7 @@ jobs: - name: Install python dependencies run: | python -m pip install --user --upgrade pip - python -m pip install --upgrade setuptools wheel twine check-wheel-contents + python -m pip install -r build-requirements.txt python -m pip --version - name: Build distributions diff --git a/build-requirements.txt b/build-requirements.txt new file mode 100644 index 000000000..211833db1 --- /dev/null +++ b/build-requirements.txt @@ -0,0 +1,5 @@ +bumpversion~=0.6.0 +setuptools~=70.0 +twine~=5.0 +twine~=4.0 +wheel~=0.43 diff --git a/dev-requirements.txt b/dev-requirements.txt index 3f00401ee..8d09f6f20 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -21,6 +21,4 @@ pytest-xdist~=3.5 thrift_sasl~=0.4.3 # build -bumpversion~=0.6.0 -twine~=4.0 -wheel~=0.43 +-r build-requirements.txt From 5174ffdcd2b3fc60677078378ca354bc721ddcd7 Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Thu, 18 Jul 2024 10:14:13 -0400 Subject: [PATCH 2/3] changelog --- .changes/unreleased/Fixes-20240718-101407.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changes/unreleased/Fixes-20240718-101407.yaml diff --git a/.changes/unreleased/Fixes-20240718-101407.yaml b/.changes/unreleased/Fixes-20240718-101407.yaml new file mode 100644 index 000000000..b4f4e52cc --- /dev/null +++ b/.changes/unreleased/Fixes-20240718-101407.yaml @@ -0,0 +1,6 @@ +kind: Fixes +body: Pin `setuptools` to address pypa/setuptools#4483 +time: 2024-07-18T10:14:07.574636-04:00 +custom: + Author: mikealfare + Issue: "1064" From 4e558db53538234c9735f5732753bd36ba62168c Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Thu, 18 Jul 2024 10:17:13 -0400 Subject: [PATCH 3/3] typo --- build-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-requirements.txt b/build-requirements.txt index 211833db1..b4a448525 100644 --- a/build-requirements.txt +++ b/build-requirements.txt @@ -1,5 +1,5 @@ bumpversion~=0.6.0 +check-wheel-contents~=0.6.0 setuptools~=70.0 twine~=5.0 -twine~=4.0 wheel~=0.43