diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 53be23a029efb..7930ba148906f 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -189,7 +189,7 @@ jobs: run: | python -m pip install --upgrade pipx pipx ensurepath - pipx install hatch==1.9.7 + pipx install hatch - name: Run tests run: hatch run run-coverage env: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9fbfdc9033dcf..c25d99fedea4d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -477,21 +477,21 @@ repos: files: ^docs/apache-airflow/extra-packages-ref\.rst$|^hatch_build.py pass_filenames: false entry: ./scripts/ci/pre_commit/check_extra_packages_ref.py - additional_dependencies: ['rich>=12.4.4', 'hatchling==1.25.0', 'tabulate'] + additional_dependencies: ['rich>=12.4.4', 'hatchling==1.26.1', 'tabulate'] - id: check-hatch-build-order name: Check order of dependencies in hatch_build.py language: python files: ^hatch_build.py$ pass_filenames: false entry: ./scripts/ci/pre_commit/check_order_hatch_build.py - additional_dependencies: ['rich>=12.4.4', 'hatchling==1.25.0'] + additional_dependencies: ['rich>=12.4.4', 'hatchling==1.26.1'] - id: update-extras name: Update extras in documentation entry: ./scripts/ci/pre_commit/insert_extras.py language: python files: ^contributing-docs/12_airflow_dependencies_and_extras.rst$|^INSTALL$|^providers/src/airflow/providers/.*/provider\.yaml$|^Dockerfile.* pass_filenames: false - additional_dependencies: ['rich>=12.4.4', 'hatchling==1.25.0'] + additional_dependencies: ['rich>=12.4.4', 'hatchling==1.26.1'] - id: check-extras-order name: Check order of extras in Dockerfile entry: ./scripts/ci/pre_commit/check_order_dockerfile_extras.py diff --git a/clients/python/pyproject.toml b/clients/python/pyproject.toml index 1584744249646..289fc2aa525d6 100644 --- a/clients/python/pyproject.toml +++ b/clients/python/pyproject.toml @@ -16,7 +16,7 @@ # under the License. [build-system] -requires = ["hatchling==1.25.0"] +requires = ["hatchling==1.26.1"] build-backend = "hatchling.build" [project] diff --git a/dev/breeze/src/airflow_breeze/commands/release_management_commands.py b/dev/breeze/src/airflow_breeze/commands/release_management_commands.py index 1d13ad39a23f6..1fa57a3d74442 100644 --- a/dev/breeze/src/airflow_breeze/commands/release_management_commands.py +++ b/dev/breeze/src/airflow_breeze/commands/release_management_commands.py @@ -240,14 +240,12 @@ class VersionedFile(NamedTuple): PRE_COMMIT_VERSION = "4.0.1" HATCH_VERSION = "1.13.0" PYYAML_VERSION = "6.0.2" -# hatchling recent version broke: https://github.com/pypa/hatch/issues/1793 -HATCHLING_VERSION = "1.25.0" AIRFLOW_BUILD_DOCKERFILE = f""" FROM python:{DEFAULT_PYTHON_MAJOR_MINOR_VERSION}-slim-{ALLOWED_DEBIAN_VERSIONS[0]} RUN apt-get update && apt-get install -y --no-install-recommends git RUN pip install --root-user-action ignore pip=={AIRFLOW_PIP_VERSION} hatch=={HATCH_VERSION} pyyaml=={PYYAML_VERSION}\ - gitpython=={GITPYTHON_VERSION} rich=={RICH_VERSION} pre-commit=={PRE_COMMIT_VERSION} hatchling=={HATCHLING_VERSION} + gitpython=={GITPYTHON_VERSION} rich=={RICH_VERSION} pre-commit=={PRE_COMMIT_VERSION} COPY . /opt/airflow """ diff --git a/docker_tests/requirements.txt b/docker_tests/requirements.txt index 4f62686ab445e..212145c863b08 100644 --- a/docker_tests/requirements.txt +++ b/docker_tests/requirements.txt @@ -3,4 +3,4 @@ pytest-xdist # Requests 3 if it will be released, will be heavily breaking. requests>=2.27.0,<3 python-on-whales>=0.70.0 -hatchling==1.25.0 +hatchling==1.26.1 diff --git a/pyproject.toml b/pyproject.toml index e066174ee3972..f008bfd8109cf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,7 @@ requires = [ "GitPython==3.1.43", "gitdb==4.0.11", - "hatchling==1.25.0", + "hatchling==1.26.1", "packaging==24.2", "pathspec==0.12.1", "pluggy==1.5.0",