From 89a2feaf6bf12fa71ae60bb1557b2167f9cae56b Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Thu, 18 Jul 2024 09:35:34 -0400 Subject: [PATCH 1/3] pin setuptools to address setuptools#4483 --- .github/workflows/main.yml | 4 ++-- build-requirements.txt | 5 +++++ dev-requirements.txt | 5 ++--- 3 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 build-requirements.txt diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fdbd36dba..c06298bed 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -184,8 +184,8 @@ jobs: - name: Install python dependencies run: | python -m pip install --user --upgrade pip - python -m pip install --upgrade wheel setuptools twine check-wheel-contents - python -m pip --version + python -m pip install -r build-requirements.txt + - uses: actions/download-artifact@v3 with: name: dist diff --git a/build-requirements.txt b/build-requirements.txt new file mode 100644 index 000000000..7b52b4dac --- /dev/null +++ b/build-requirements.txt @@ -0,0 +1,5 @@ +bumpversion~=0.6.0 +check-wheel-contents~=0.6.0 +setuptools~=70.0 +twine~=5.0 +wheel~=0.42 diff --git a/dev-requirements.txt b/dev-requirements.txt index 95ed0c8ec..2d63d4dc1 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -7,7 +7,6 @@ git+https://github.com/dbt-labs/dbt-adapters.git#subdirectory=dbt-tests-adapter # if version 1.x or greater -> pin to major version # if version 0.x -> pin to minor black>=24.3 -bumpversion~=0.6.0 click~=8.1 ddtrace==2.3.0 flake8~=7.0 @@ -29,5 +28,5 @@ tox~=4.11 types-pytz~=2023.3 types-protobuf~=4.24 types-requests~=2.31 -twine~=4.0 -wheel~=0.42 + +-r build-requirements.txt From 60fb9dc7bd38f0631d6a3f1345ab56a1824a3a1a Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Thu, 18 Jul 2024 09:38:02 -0400 Subject: [PATCH 2/3] changelog --- .changes/unreleased/Fixes-20240718-093755.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changes/unreleased/Fixes-20240718-093755.yaml diff --git a/.changes/unreleased/Fixes-20240718-093755.yaml b/.changes/unreleased/Fixes-20240718-093755.yaml new file mode 100644 index 000000000..91647314d --- /dev/null +++ b/.changes/unreleased/Fixes-20240718-093755.yaml @@ -0,0 +1,6 @@ +kind: Fixes +body: Pin `setuptools` to address pypa/setuptools#4483ls +time: 2024-07-18T09:37:55.774924-04:00 +custom: + Author: mikealfare + Issue: "1284" From 75bfabfe25f1934e413bab8044a5e5249937cf92 Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Thu, 18 Jul 2024 09:45:48 -0400 Subject: [PATCH 3/3] fix changelog --- .changes/unreleased/Fixes-20240718-093755.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changes/unreleased/Fixes-20240718-093755.yaml b/.changes/unreleased/Fixes-20240718-093755.yaml index 91647314d..d0a765c35 100644 --- a/.changes/unreleased/Fixes-20240718-093755.yaml +++ b/.changes/unreleased/Fixes-20240718-093755.yaml @@ -1,5 +1,5 @@ kind: Fixes -body: Pin `setuptools` to address pypa/setuptools#4483ls +body: Pin `setuptools` to address pypa/setuptools#4483 time: 2024-07-18T09:37:55.774924-04:00 custom: Author: mikealfare