Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-37931: [Python] Revert "GH-37803: [CI][Dev][Python] Release and merge script errors (#37819)" #40150

Merged
merged 1 commit into from
Feb 20, 2024
Merged

GH-37931: [Python] Revert "GH-37803: [CI][Dev][Python] Release and merge script errors (#37819)" #40150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/conda_env_archery.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jira
pygit2
pygithub
ruamel.yaml
setuptools_scm<8.0.0
setuptools_scm
toolz

# benchmark
Expand Down
2 changes: 1 addition & 1 deletion ci/conda_env_crossbow.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ jinja2
jira
pygit2
ruamel.yaml
setuptools_scm<8.0.0
setuptools_scm
toolz
2 changes: 1 addition & 1 deletion ci/conda_env_python.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ pytest<8
pytest-faulthandler
s3fs>=2023.10.0
setuptools
setuptools_scm<8.0.0
setuptools_scm
2 changes: 1 addition & 1 deletion dev/archery/setup.py
View file
Open in desktop
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<8.0.0'],
'ruamel.yaml', 'setuptools_scm'],
'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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ outputs:
- numpy
- python
- setuptools
- setuptools_scm <8.0.0
- setuptools_scm
run:
- {{ pin_subpackage('libarrow', exact=True) }}
- {{ pin_compatible('numpy') }}
Expand Down Expand Up @@ -322,7 +322,7 @@ outputs:
- numpy
- python
- setuptools
- setuptools_scm <8.0.0
- setuptools_scm
run:
- {{ pin_subpackage('pyarrow', exact=True) }}
- python
Expand Down
2 changes: 1 addition & 1 deletion python/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
2 changes: 1 addition & 1 deletion python/requirements-build.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion python/requirements-wheel-build.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion python/setup.py
View file
Open in desktop
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 < 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',
Expand Down
Loading