From ff080ff8cb35d37718d59446f398a28118049165 Mon Sep 17 00:00:00 2001 From: AlenkaF Date: Thu, 21 Sep 2023 10:23:15 +0200 Subject: [PATCH 1/3] Pin setuptools_scm to <8.0.0 --- ci/conda_env_python.txt | 2 +- dev/tasks/conda-recipes/arrow-cpp/meta.yaml | 4 ++-- python/pyproject.toml | 2 +- python/requirements-build.txt | 2 +- python/setup.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/conda_env_python.txt b/ci/conda_env_python.txt index 4ae5c3614a1..d914229ec58 100644 --- a/ci/conda_env_python.txt +++ b/ci/conda_env_python.txt @@ -28,4 +28,4 @@ pytest-faulthandler pytest-lazy-fixture s3fs>=2021.8.0 setuptools -setuptools_scm +setuptools_scm<8.0.0 diff --git a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml index ac4b29eb5ee..fbe40af3dae 100644 --- a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml +++ b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml @@ -244,7 +244,7 @@ outputs: - numpy - python - setuptools - - setuptools_scm + - setuptools_scm <8.0.0 run: # - {{ pin_subpackage('libarrow', exact=True) }} - libarrow ={{ version }}=*_{{ PKG_BUILDNUM }}_{{ build_ext }} @@ -327,7 +327,7 @@ outputs: - numpy - python - setuptools - - setuptools_scm + - setuptools_scm <8.0.0 run: - {{ pin_subpackage('pyarrow', exact=True) }} - python diff --git a/python/pyproject.toml b/python/pyproject.toml index 7e613045858..a1de6ac4f1c 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -19,7 +19,7 @@ requires = [ "cython >= 0.29.31,<3", "oldest-supported-numpy>=0.14", - "setuptools_scm", + "setuptools_scm < 8.0.0", "setuptools >= 40.1.0", "wheel" ] diff --git a/python/requirements-build.txt b/python/requirements-build.txt index 6378d1b94e1..efd653ec470 100644 --- a/python/requirements-build.txt +++ b/python/requirements-build.txt @@ -1,4 +1,4 @@ cython>=0.29.31,<3 oldest-supported-numpy>=0.14 -setuptools_scm +setuptools_scm<8.0.0 setuptools>=38.6.0 diff --git a/python/setup.py b/python/setup.py index abd9d03cfb1..062aac307b1 100755 --- a/python/setup.py +++ b/python/setup.py @@ -492,7 +492,7 @@ def has_ext_modules(foo): 'pyarrow/_generated_version.py'), 'version_scheme': guess_next_dev_version }, - setup_requires=['setuptools_scm', 'cython >= 0.29.31,<3'] + setup_requires, + setup_requires=['setuptools_scm < 8.0.0', 'cython >= 0.29.31,<3'] + setup_requires, install_requires=install_requires, tests_require=['pytest', 'pandas', 'hypothesis'], python_requires='>=3.8', From 8ebbc0cb3d6a7c9767b876e313c43711184721db Mon Sep 17 00:00:00 2001 From: AlenkaF Date: Thu, 21 Sep 2023 11:16:38 +0200 Subject: [PATCH 2/3] Pin all --- ci/conda_env_archery.txt | 2 +- ci/conda_env_crossbow.txt | 2 +- python/requirements-wheel-build.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/conda_env_archery.txt b/ci/conda_env_archery.txt index ace7a42acb0..40875e0a550 100644 --- a/ci/conda_env_archery.txt +++ b/ci/conda_env_archery.txt @@ -25,7 +25,7 @@ jira pygit2 pygithub ruamel.yaml -setuptools_scm +setuptools_scm<8.0.0 toolz # benchmark diff --git a/ci/conda_env_crossbow.txt b/ci/conda_env_crossbow.txt index 347294650ca..59b799720f1 100644 --- a/ci/conda_env_crossbow.txt +++ b/ci/conda_env_crossbow.txt @@ -21,5 +21,5 @@ jinja2 jira pygit2 ruamel.yaml -setuptools_scm +setuptools_scm<8.0.0 toolz diff --git a/python/requirements-wheel-build.txt b/python/requirements-wheel-build.txt index e4f5243fbc2..00504b0c731 100644 --- a/python/requirements-wheel-build.txt +++ b/python/requirements-wheel-build.txt @@ -1,5 +1,5 @@ cython>=0.29.31,<3 oldest-supported-numpy>=0.14 -setuptools_scm +setuptools_scm<8.0.0 setuptools>=58 wheel From f1b19690a8ca08fbb72c4e16f7b650104af7bfd8 Mon Sep 17 00:00:00 2001 From: AlenkaF Date: Thu, 21 Sep 2023 11:22:52 +0200 Subject: [PATCH 3/3] Add a pin for archery --- dev/archery/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/archery/setup.py b/dev/archery/setup.py index 08e41225f67..e2c89ae204b 100755 --- a/dev/archery/setup.py +++ b/dev/archery/setup.py @@ -30,7 +30,7 @@ extras = { 'benchmark': ['pandas'], 'crossbow': ['github3.py', jinja_req, 'pygit2>=1.6.0', 'requests', - 'ruamel.yaml', 'setuptools_scm'], + 'ruamel.yaml', 'setuptools_scm<8.0.0'], 'crossbow-upload': ['github3.py', jinja_req, 'ruamel.yaml', 'setuptools_scm'], 'docker': ['ruamel.yaml', 'python-dotenv'],