Skip to content

Commit

Permalink
apacheGH-37803: [CI][Dev][Python] Release and merge script errors (ap…
Browse files Browse the repository at this point in the history
…ache#37819)

### What changes are included in this PR?

Pin the version of `setuptools_scm` to `<8.0.0`.
* Closes: apache#37803

Authored-by: AlenkaF <[email protected]>
Signed-off-by: Raúl Cumplido <[email protected]>
  • Loading branch information
AlenkaF authored Sep 21, 2023
1 parent 6cd34f3 commit 79e49db
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion ci/conda_env_archery.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jira
pygit2
pygithub
ruamel.yaml
setuptools_scm
setuptools_scm<8.0.0
toolz

# benchmark
Expand Down
2 changes: 1 addition & 1 deletion ci/conda_env_crossbow.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ jinja2
jira
pygit2
ruamel.yaml
setuptools_scm
setuptools_scm<8.0.0
toolz
2 changes: 1 addition & 1 deletion ci/conda_env_python.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ pytest-faulthandler
pytest-lazy-fixture
s3fs>=2021.8.0
setuptools
setuptools_scm
setuptools_scm<8.0.0
2 changes: 1 addition & 1 deletion dev/archery/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down
4 changes: 2 additions & 2 deletions dev/tasks/conda-recipes/arrow-cpp/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -327,7 +327,7 @@ outputs:
- numpy
- python
- setuptools
- setuptools_scm
- setuptools_scm <8.0.0
run:
- {{ pin_subpackage('pyarrow', exact=True) }}
- python
Expand Down
2 changes: 1 addition & 1 deletion python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
2 changes: 1 addition & 1 deletion python/requirements-build.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion python/requirements-wheel-build.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cython>=0.29.31,<3
oldest-supported-numpy>=0.14
setuptools_scm
setuptools_scm<8.0.0
setuptools>=58
wheel
2 changes: 1 addition & 1 deletion python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit 79e49db

Please sign in to comment.