This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch v2-8-test
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit 4dee09153d1e6c5bba62bc1b4f239ca76474bc6a
Author: Jarek Potiuk <[email protected]>
AuthorDate: Sun Jan 7 13:53:02 2024 +0100

    Upgrade to latest versions of `pip` and `pipx` in CI runners (#36646)
    
    The CI runners did not have latest version of `pip` and `pipx`. This
    change updates the installation scripts to fix `pip` to the same
    version as in the CI image and down-binds pipx to 1.4.1 which is
    recently released bugfix version with better logging and installation
    instructions.
    
    (cherry picked from commit 75bc05ce1f53de112f7eee7be524a26f2a3f6845)
---
 BREEZE.rst                   | 5 ++---
 dev/breeze/README.md         | 2 +-
 dev/breeze/pyproject.toml    | 1 +
 scripts/ci/install_breeze.sh | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/BREEZE.rst b/BREEZE.rst
index 7bcda45029..85164fb456 100644
--- a/BREEZE.rst
+++ b/BREEZE.rst
@@ -176,14 +176,13 @@ The pipx tool
 We are using ``pipx`` tool to install and manage Breeze. The ``pipx`` tool is 
created by the creators
 of ``pip`` from `Python Packaging Authority <https://www.pypa.io/en/latest/>`_
 
-Note that ``pipx`` >= 1.2.1 is needed in order to deal with breaking 
``packaging`` release in September
-2023 that broke earlier versions of ``pipx``.
+Note that ``pipx`` >= 1.4.1 is used.
 
 Install pipx
 
 .. code-block:: bash
 
-    pip install --user "pipx>=1.2.1"
+    pip install --user "pipx>=1.4.1"
 
 Breeze, is not globally accessible until your PATH is updated. Add <USER 
FOLDER>\.local\bin as a variable
 environments. This can be done automatically by the following command (follow 
instructions printed).
diff --git a/dev/breeze/README.md b/dev/breeze/README.md
index 9db81c1fd4..7452be51ae 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: 
c7d80ab49c6dc4bf2b54957663b0126ab9c8f48df28a34c0eb56340540cb1f52d063ef99ee5f9cacbd375b1a711278884f9ef9aab41e620fa70fffd81f7ece3c
+Package config hash: 
ac1e65234e1a780d1f21ac28e27451c763e308cc901ab8f72acc6414db8da14c8f841e4757b134a4cc6f3c76186af340db0610cd3fa155ed5fcf1abca45381e8
 
 
---------------------------------------------------------------------------------------------------------
diff --git a/dev/breeze/pyproject.toml b/dev/breeze/pyproject.toml
index aca59140ac..9cae9052e2 100644
--- a/dev/breeze/pyproject.toml
+++ b/dev/breeze/pyproject.toml
@@ -54,6 +54,7 @@ dependencies = [
     "jinja2>=3.1.0",
     "jsonschema>=4.19.1",
     "packaging>=23.2",
+    "pipx>=1.4.1",
     "pre-commit>=3.5.0",
     "psutil>=5.9.6",
     "pygithub>=2.1.1",
diff --git a/scripts/ci/install_breeze.sh b/scripts/ci/install_breeze.sh
index d07ef765c6..e8e3a63f80 100755
--- a/scripts/ci/install_breeze.sh
+++ b/scripts/ci/install_breeze.sh
@@ -19,6 +19,7 @@ set -euxo pipefail
 
 cd "$( dirname "${BASH_SOURCE[0]}" )/../../"
 
-python -m pip install "pipx>=1.2.1"
+python -m pip install --upgrade pip==23.3.2
+python -m pip install "pipx>=1.4.1"
 python -m pipx install --editable ./dev/breeze/ --force
 echo '/home/runner/.local/bin' >> "${GITHUB_PATH}"

Reply via email to