This is an automated email from the ASF dual-hosted git repository.
raulcd pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new a8b9537764 GH-37931: [Python] Revert "GH-37803: [CI][Dev][Python]
Release and merge script errors (#37819)" (#40150)
a8b9537764 is described below
commit a8b9537764144baf5da8e22dfcd4e9ff0c70ab2f
Author: h-vetinari <[email protected]>
AuthorDate: Tue Feb 20 15:49:16 2024 +0100
GH-37931: [Python] Revert "GH-37803: [CI][Dev][Python] Release and merge
script errors (#37819)" (#40150)
This reverts commit 79e49dbfb71efc70555417ba19cb612eb50924e8.
#37931 should have been fixed as of
https://github.com/pypa/setuptools_scm/commit/056584b49f039f0913bd6ee5bb5a5befdb396dec
in setuptools_scm 8.0.4; I tested that this works in
https://github.com/conda-forge/arrow-cpp-feedstock/pull/1314.
CC @ AlenkaF @ raulcd
* Closes: #37931
Authored-by: H. Vetinari <[email protected]>
Signed-off-by: Raúl Cumplido <[email protected]>
---
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 40875e0a55..ace7a42acb 100644
--- 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
index 59b799720f..347294650c 100644
--- 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
index 59e2def1bf..19e94d7d3e 100644
--- 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
index 2ecc72e04e..02a8b34299 100755
--- a/dev/archery/setup.py
+++ b/dev/archery/setup.py
@@ -30,7 +30,7 @@ jinja_req = 'jinja2>=2.11'
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
index 367445c595..10ee9c28f8 100644
--- 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
index 9079618ad1..1588e690a7 100644
--- 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
index e1372e807f..87dcc148ad 100644
--- 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
index 044f9de5f8..9920a38a4e 100644
--- 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
index 098d75a318..423de708e8 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -492,7 +492,7 @@ setup(
'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',
