From a935f85ff72b825c2ac5f8ee2343e83e53a9ee99 Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Thu, 18 Jul 2024 09:08:12 -0400 Subject: [PATCH 1/4] move build deps into their own req file so they can be isolated and called by workflows --- .github/workflows/main.yml | 3 +-- build-requirements.txt | 5 +++++ dev-requirements.txt | 4 +--- 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 build-requirements.txt diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 340af75c0..fc65d97c6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -132,8 +132,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 --version + python -m pip install -r build-requirements.txt - name: Build distributions run: ./scripts/build-dist.sh diff --git a/build-requirements.txt b/build-requirements.txt new file mode 100644 index 000000000..51554e657 --- /dev/null +++ b/build-requirements.txt @@ -0,0 +1,5 @@ +bumpversion~=0.6.0 +check-wheel-contents~=0.6.0 +setuptools~=70.0 +twine~=4.0 +wheel~=0.42 diff --git a/dev-requirements.txt b/dev-requirements.txt index 49bbdb6b4..2ac846b5f 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -20,6 +20,4 @@ pytest-xdist~=3.5 tox~=4.11 # build -bumpversion~=0.6.0 -twine~=4.0 -wheel~=0.42 +-r build-requirements.txt From a80f25310e19ff6f61f0aea935f0b177795c0086 Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Thu, 18 Jul 2024 09:13:34 -0400 Subject: [PATCH 2/4] changelog --- .changes/unreleased/Fixes-20240718-091327.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changes/unreleased/Fixes-20240718-091327.yaml diff --git a/.changes/unreleased/Fixes-20240718-091327.yaml b/.changes/unreleased/Fixes-20240718-091327.yaml new file mode 100644 index 000000000..774852a82 --- /dev/null +++ b/.changes/unreleased/Fixes-20240718-091327.yaml @@ -0,0 +1,6 @@ +kind: Fixes +body: Pin `setuptools` to address `71.0` release that contains a breaking change +time: 2024-07-18T09:13:27.011309-04:00 +custom: + Author: mikealfare + Issue: "1124" From 5db8dff58e700111ae1db6cd3d818e5e9a733b85 Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Thu, 18 Jul 2024 09:28:30 -0400 Subject: [PATCH 3/4] bump twine to resolve twine#977 --- build-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-requirements.txt b/build-requirements.txt index 51554e657..7b52b4dac 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~=4.0 +twine~=5.0 wheel~=0.42 From e0aa6dabca5a8b7d70158df922f786df7bb258b1 Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Thu, 18 Jul 2024 09:38:56 -0400 Subject: [PATCH 4/4] update changelog --- .changes/unreleased/Fixes-20240718-091327.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changes/unreleased/Fixes-20240718-091327.yaml b/.changes/unreleased/Fixes-20240718-091327.yaml index 774852a82..f744adc1f 100644 --- a/.changes/unreleased/Fixes-20240718-091327.yaml +++ b/.changes/unreleased/Fixes-20240718-091327.yaml @@ -1,5 +1,5 @@ kind: Fixes -body: Pin `setuptools` to address `71.0` release that contains a breaking change +body: Pin `setuptools` to address pypa/setuptools#4483 time: 2024-07-18T09:13:27.011309-04:00 custom: Author: mikealfare