apacheGH-37931: [Python] Revert "apacheGH-37803: [CI][Dev][Python] Re…

…lease and merge script errors (apache#37819)" (apache#40150) This reverts commit 79e49db. apache#37931 should have been fixed as of pypa/setuptools-scm@056584b in setuptools_scm 8.0.4; I tested that this works in conda-forge/arrow-cpp-feedstock#1314. CC @ AlenkaF @ raulcd * Closes: apache#37931 Authored-by: H. Vetinari <h.vetinari@gmx.com> Signed-off-by: Raúl Cumplido <raulcumplido@gmail.com>
thisisnic · Mar 8, 2024 · d1fb021 · d1fb021
1 parent bd0bebb
commit d1fb021
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/ci/conda_env_archery.txt b/ci/conda_env_archery.txt
@@ -25,7 +25,7 @@ jira
 pygit2
 pygithub
 ruamel.yaml
-setuptools_scm<8.0.0
+setuptools_scm
 toolz
 
 # benchmark

diff --git a/ci/conda_env_crossbow.txt b/ci/conda_env_crossbow.txt
@@ -21,5 +21,5 @@ jinja2
 jira
 pygit2
 ruamel.yaml
-setuptools_scm<8.0.0
+setuptools_scm
 toolz
diff --git a/ci/conda_env_python.txt b/ci/conda_env_python.txt
@@ -27,4 +27,4 @@ pytest<8
 pytest-faulthandler
 s3fs>=2023.10.0
 setuptools
-setuptools_scm<8.0.0
+setuptools_scm
diff --git 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<8.0.0'],
+                 'ruamel.yaml', 'setuptools_scm'],
     '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
@@ -240,7 +240,7 @@ outputs:
         - numpy
         - python
         - setuptools
-        - setuptools_scm <8.0.0
+        - setuptools_scm
       run:
         - {{ pin_subpackage('libarrow', exact=True) }}
         - {{ pin_compatible('numpy') }}
@@ -322,7 +322,7 @@ outputs:
         - numpy
         - python
         - setuptools
-        - setuptools_scm <8.0.0
+        - setuptools_scm
       run:
         - {{ pin_subpackage('pyarrow', exact=True) }}
         - python

diff --git a/python/pyproject.toml b/python/pyproject.toml
@@ -24,7 +24,7 @@ requires = [
     # continue using oldest-support-numpy.
     "oldest-supported-numpy>=0.14; python_version<'3.9'",
     "numpy>=1.25; python_version>='3.9'",
-    "setuptools_scm < 8.0.0",
+    "setuptools_scm",
     "setuptools >= 40.1.0",
     "wheel"
 ]
diff --git a/python/requirements-build.txt b/python/requirements-build.txt
@@ -1,5 +1,5 @@
 cython>=0.29.31
 oldest-supported-numpy>=0.14; python_version<'3.9'
 numpy>=1.25; python_version>='3.9'
-setuptools_scm<8.0.0
+setuptools_scm
 setuptools>=38.6.0
diff --git a/python/requirements-wheel-build.txt b/python/requirements-wheel-build.txt
@@ -1,6 +1,6 @@
 cython>=0.29.31
 oldest-supported-numpy>=0.14; python_version<'3.9'
 numpy>=1.25; python_version>='3.9'
-setuptools_scm<8.0.0
+setuptools_scm
 setuptools>=58
 wheel
diff --git 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 < 8.0.0', 'cython >= 0.29.31'] + setup_requires,
+    setup_requires=['setuptools_scm', 'cython >= 0.29.31'] + setup_requires,
     install_requires=install_requires,
     tests_require=['pytest', 'pandas', 'hypothesis'],
     python_requires='>=3.8',