diff --git a/.github/workflows/ci-image-build.yml b/.github/workflows/ci-image-build.yml index cfb3154dab61c..797802c02534e 100644 --- a/.github/workflows/ci-image-build.yml +++ b/.github/workflows/ci-image-build.yml @@ -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' diff --git a/dev/breeze/README.md b/dev/breeze/README.md index 9459f40f378f9..e95e62cd4c04f 100644 --- a/dev/breeze/README.md +++ b/dev/breeze/README.md @@ -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 --------------------------------------------------------------------------------------------------------- diff --git a/dev/breeze/pyproject.toml b/dev/breeze/pyproject.toml index 4f97d3c6cae28..9d915ae9e1ebd 100644 --- a/dev/breeze/pyproject.toml +++ b/dev/breeze/pyproject.toml @@ -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", diff --git a/pyproject.toml b/pyproject.toml index da21bcc08501b..63df5c74fb45a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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",