Skip to content

GH-37803: [CI][Dev][Python] Release and merge script errors #37819

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

Merged
raulcd merged 3 commits into from
Sep 21, 2023
Merged

GH-37803: [CI][Dev][Python] Release and merge script errors #37819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff080ff
Pin setuptools_scm to <8.0.0
AlenkaF Sep 21, 2023
8ebbc0c
Pin all
AlenkaF Sep 21, 2023
f1b1969
Add a pin for archery
AlenkaF Sep 21, 2023
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
setuptools_scm<8.0.0
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
setuptools_scm<8.0.0
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 @@ -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
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'],
'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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
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', '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