From 79e49dbfb71efc70555417ba19cb612eb50924e8 Mon Sep 17 00:00:00 2001 From: Alenka Frim Date: Thu, 21 Sep 2023 11:32:06 +0200 Subject: [PATCH] GH-37803: [CI][Dev][Python] Release and merge script errors (#37819) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### What changes are included in this PR? Pin the version of `setuptools_scm` to `<8.0.0`. * Closes: #37803 Authored-by: AlenkaF Signed-off-by: Raúl Cumplido --- ci/conda_env_archery.txt | 2 +- ci/conda_env_crossbow.txt | 2 +- ci/conda_env_python.txt | 2 +- dev/archery/setup.py | 2 +- dev/tasks/conda-recipes/arrow-cpp/meta.yaml | 4 ++-- python/pyproject.toml | 2 +- python/requirements-build.txt | 2 +- python/requirements-wheel-build.txt | 2 +- python/setup.py | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ci/conda_env_archery.txt b/ci/conda_env_archery.txt index ace7a42acb026..40875e0a55039 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 347294650ca28..59b799720f12b 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/ci/conda_env_python.txt b/ci/conda_env_python.txt index 4ae5c3614a1dc..d914229ec58c0 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/archery/setup.py b/dev/archery/setup.py index 08e41225f673a..e2c89ae204bd6 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'], diff --git a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml index ac4b29eb5ee7e..fbe40af3dae01 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 7e61304585809..a1de6ac4f1c7e 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 6378d1b94e1bb..efd653ec470d5 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/requirements-wheel-build.txt b/python/requirements-wheel-build.txt index e4f5243fbc2fe..00504b0c731a1 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 diff --git a/python/setup.py b/python/setup.py index abd9d03cfb17e..062aac307b1e4 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',