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

Jump to bottom

Temporarily fix pip check failure on xgboost and grpcio #32432

Merged
merged 7 commits into from
Sep 12, 2024
Merged

Temporarily fix pip check failure on xgboost and grpcio #32432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
95eb83e
Pin pip version to 24.1 so pip check wont't fail
shunping Sep 11, 2024
edf1c6d
Trigger precomit python ml tests to verify the fix.
shunping Sep 11, 2024
2ad4366
Pin pip version in pyproject.toml
shunping Sep 11, 2024
769ec79
Try to enforce pip version in tox.
shunping Sep 11, 2024
1fe0e25
Disable xgboost tests by removing xgboost dependency.
shunping Sep 11, 2024
769ecf8
Add tox env for macos
shunping Sep 11, 2024
b608b1b
Revert some unnecessary changes
shunping Sep 11, 2024
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
Empty file added .github/trigger_files/beam_PreCommit_Python_ML.json
View file
Open in desktop
Empty file.
8 changes: 6 additions & 2 deletions .github/workflows/python_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,14 @@ jobs:
python-version: ${{ matrix.params.py_ver }}
- name: Install tox
run: pip install tox
- name: Run tests basic unix
if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macos')
- name: Run tests basic linux
if: startsWith(matrix.os, 'ubuntu')
working-directory: ./sdks/python
run: tox -c tox.ini run -e ${{ matrix.params.tox_env }}
- name: Run tests basic macos
if: startsWith(matrix.os, 'macos')
working-directory: ./sdks/python
run: tox -c tox.ini run -e ${{ matrix.params.tox_env }}-macos
- name: Run tests basic windows
if: startsWith(matrix.os, 'windows')
working-directory: ./sdks/python
Expand Down
5 changes: 4 additions & 1 deletion sdks/python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,10 @@ def get_portability_package_data():
'tf2onnx',
'torch',
'transformers',
'xgboost<2.0', # https://github.com/apache/beam/issues/31252
# Comment out xgboost as it is breaking presubmit python ml
# tests due to tag check introduced since pip 24.2
# https://github.com/apache/beam/issues/31285
# 'xgboost<2.0', # https://github.com/apache/beam/issues/31252
],
'aws': ['boto3>=1.9,<2'],
'azure': [
Expand Down
15 changes: 15 additions & 0 deletions sdks/python/tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,21 @@ commands_post =
commands = false {envname} is misconfigured

[testenv:py{38,39,310,311,312}]
commands_pre =
python --version
pip --version
pip check
bash {toxinidir}/scripts/run_tox_cleanup.sh
commands =
python apache_beam/examples/complete/autocomplete_test.py
bash {toxinidir}/scripts/run_pytest.sh {envname} "{posargs}"

[testenv:py{38,39,310,311,312}-macos]
commands_pre =
python --version
pip --version
# pip check
bash {toxinidir}/scripts/run_tox_cleanup.sh
commands =
python apache_beam/examples/complete/autocomplete_test.py
bash {toxinidir}/scripts/run_pytest.sh {envname} "{posargs}"
Expand Down
Loading