Merge #3130

3130: Make sure to upgrade pip before trying to install nox. r=adamreichold a=adamreichold



Co-authored-by: Adam Reichold <adam.reichold@t-online.de>

.github/workflows/build.yml

@@ -36,7 +36,7 @@ jobs:
           architecture: ${{ inputs.python-architecture }}
 
       - name: Install nox
-        run: python -m pip install -U pip nox
+        run: python -m pip install --upgrade pip && pip install nox
 
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@master
@@ -172,7 +172,7 @@ jobs:
           set -ex
           sudo apt-get install -y mingw-w64 llvm
           rustup target add x86_64-pc-windows-gnu x86_64-pc-windows-msvc
-          python -m pip install cargo-xwin
+          pip install cargo-xwin
           # abi3
           cargo build --manifest-path examples/maturin-starter/Cargo.toml --features abi3 --target x86_64-pc-windows-gnu
           cargo xwin build --manifest-path examples/maturin-starter/Cargo.toml --features abi3 --target x86_64-pc-windows-msvc

.github/workflows/changelog.yml

@@ -11,5 +11,5 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
-      - run: pip install nox
+      - run: python -m pip install --upgrade pip && pip install nox
       - run: nox -s check-changelog

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
-      - run: pip install nox
+      - run: python -m pip install --upgrade pip && pip install nox
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: rustfmt
@@ -101,7 +101,7 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           architecture: ${{ matrix.platform.python-architecture }}
-      - run: python -m pip install nox
+      - run: python -m pip install --upgrade pip && pip install nox
       - if: matrix.msrv == 'MSRV'
         name: Prepare minimal package versions (MSRV only)
         run: nox -s set-minimal-package-versions
@@ -249,7 +249,7 @@ jobs:
         continue-on-error: true
       - uses: dtolnay/rust-toolchain@stable
       - uses: taiki-e/install-action@valgrind
-      - run: python -m pip install -U pip nox
+      - run: python -m pip install --upgrade pip && pip install nox
       - run: nox -s test-rust -- release skip-full
     env:
       CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER: valgrind --leak-check=no --error-exitcode=1
@@ -271,7 +271,7 @@ jobs:
         with:
           components: rust-src
       - run: cargo install cargo-careful
-      - run: python -m pip install -U pip nox
+      - run: python -m pip install --upgrade pip && pip install nox
       - run: nox -s test-rust -- careful skip-full
     env:
       RUST_BACKTRACE: 1
@@ -305,7 +305,7 @@ jobs:
       - name: Install cargo-llvm-cov
         if: steps.should-skip.outputs.skip != 'true'
         uses: taiki-e/install-action@cargo-llvm-cov
-      - run: python -m pip install -U pip nox
+      - run: python -m pip install --upgrade pip && pip install nox
         if: steps.should-skip.outputs.skip != 'true'
       - run: nox -s coverage
         if: steps.should-skip.outputs.skip != 'true'
@@ -330,7 +330,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 14
-      - run: pip install nox
+      - run: python -m pip install --upgrade pip && pip install nox
       - uses: actions/cache@v3
         id: cache
         with:

.github/workflows/gh-pages.yml

@@ -39,7 +39,7 @@ jobs:
       # This builds the book in target/guide.
       - name: Build the guide
         run: |
-          pip install nox
+          python -m pip install --upgrade pip && pip install nox
           nox -s build-guide
         env:
           PYO3_VERSION_TAG: ${{ steps.prepare_tag.outputs.tag_name }}
@@ -125,7 +125,7 @@ jobs:
 
       - name: Run benchmarks
         run: |
-          pip install nox
+          python -m pip install --upgrade pip && pip install nox
           nox -f pytests/noxfile.py -s bench -- --benchmark-json $(pwd)/output.json
       - name: Store benchmark result
         uses: benchmark-action/github-action-benchmark@v1

noxfile.py

@@ -405,8 +405,8 @@ def check_changelog(session: nox.Session):
         print(fragment.name)
 
 
-@nox.session(name="set-minimal-package-versions")
-def set_minimal_package_versions(session: nox.Session, venv_backend="none"):
+@nox.session(name="set-minimal-package-versions", venv_backend="none")
+def set_minimal_package_versions(session: nox.Session):
     from collections import defaultdict
 
     try: