Skip to content

Commit

Permalink
Limit importlib_resources as it breaks pytest_rewrites (#38095)
Browse files Browse the repository at this point in the history
New version of importlib_resources released today - 6.2.0 but also 6.3.0
released few hours later, break pytest_rewrite feature in rather
unexpected ways. Until the problem is diagnosed and solved we should
limit it. The issue is tracked in
python/importlib_resources#299

GitOrigin-RevId: 7ec2407e7f50251fff4359ffe7109dd8dc360f24
  • Loading branch information
potiuk authored and Cloud Composer Team committed Nov 9, 2024
1 parent efbae60 commit beee03a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-image-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
run: |
pip install rich>=12.4.4 pyyaml
python scripts/ci/pre_commit/pre_commit_update_providers_dependencies.py
if: inputs.skip-build != 'true' && inputs.upgrade-to-newer-dependencies != 'false'
if: inputs.do-build == 'true' && inputs.upgrade-to-newer-dependencies != 'false'
- name: "Start ARM instance"
run: ./scripts/ci/images/ci_start_arm_instance_and_connect_to_docker.sh
if: inputs.do-build == 'true' && inputs.platform == 'arm64'
Expand Down
2 changes: 1 addition & 1 deletion dev/breeze/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ PLEASE DO NOT MODIFY THE HASH BELOW! IT IS AUTOMATICALLY UPDATED BY PRE-COMMIT.

---------------------------------------------------------------------------------------------------------

Package config hash: 0c6255210f3c20a29aa24405412399cf3f6ff897658f13a0fb7628b4888d6bfe99f49bdb2aa68d9045e14179d4be33a02543c12e394395931024522431bf5dec
Package config hash: dc6668558ff6f7334e9f9a7ff9073caccd790d4ff4aab0e1228b3363677b53714310d4a2b9b43ff3e089c34fb3cdc9861350d1a495299feb3bb12c7506574c77

---------------------------------------------------------------------------------------------------------
3 changes: 3 additions & 0 deletions dev/breeze/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ dependencies = [
"flit>=3.5.0",
"gitpython>=3.1.40",
"hatch==1.9.1",
# Importib_resources 6.2.0 break pytest_rewrite
# see https://github.com/python/importlib_resources/issues/299
"importlib_resources>=5.2,<6.2.0;python_version<\"3.9\"",
"inputimeout>=1.0.4",
"jinja2>=3.1.0",
"jsonschema>=4.19.1",
Expand Down
4 changes: 3 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@ dependencies = [
"gunicorn>=20.1.0",
"httpx",
"importlib_metadata>=1.7;python_version<\"3.9\"",
"importlib_resources>=5.2;python_version<\"3.9\"",
# Importib_resources 6.2.0 break pytest_rewrite
# see https://github.com/python/importlib_resources/issues/299
"importlib_resources>=5.2,<6.2.0;python_version<\"3.9\"",
"itsdangerous>=2.0",
"jinja2>=3.0.0",
"jsonschema>=4.18.0",
Expand Down

0 comments on commit beee03a

Please sign in to comment.