Merge pull request #13126 from ichard26/microoptimize-ci

Faster test session reruns & microoptimize CI

Author: ichard26

.github/workflows/ci.yml

@@ -149,17 +149,17 @@ jobs:
       - name: Run unit tests
         run: >-
           nox -s test-${{ matrix.python.key || matrix.python }} --
-          -m unit
+          tests/unit
           --verbose --numprocesses auto --showlocals
       - name: Run integration tests
         run: >-
-          nox -s test-${{ matrix.python.key || matrix.python }} --
-          -m integration
+          nox -s test-${{ matrix.python.key || matrix.python }} --no-install --
+          tests/functional
           --verbose --numprocesses auto --showlocals
           --durations=5
 
   tests-windows:
-    name: tests / ${{ matrix.python }} / ${{ matrix.os }} / ${{ matrix.group }}
+    name: tests / ${{ matrix.python }} / ${{ matrix.os }} / ${{ matrix.group.number }}
     runs-on: ${{ matrix.os }}-latest
 
     needs: [packaging, determine-changes]
@@ -180,7 +180,9 @@ jobs:
           # - "3.11"
           # - "3.12"
           - "3.13"
-        group: [1, 2]
+        group:
+          - { number: 1, pytest-filter: "not test_install" }
+          - { number: 2, pytest-filter: "test_install" }
 
     steps:
       - uses: actions/checkout@v4
@@ -198,29 +200,19 @@ jobs:
           TEMP: "C:\\Temp"
 
       # Main check
-      - name: Run unit tests
-        if: matrix.group == 1
+      - name: Run unit tests (group 1)
+        if: matrix.group.number == 1
         run: >-
           nox -s test-${{ matrix.python }} --
-          -m unit
+          tests/unit
           --verbose --numprocesses auto --showlocals
         env:
           TEMP: "C:\\Temp"
 
-      - name: Run integration tests (group 1)
-        if: matrix.group == 1
+      - name: Run integration tests (group ${{ matrix.group.number }})
         run: >-
-          nox -s test-${{ matrix.python }} --
-          -m integration -k "not test_install"
-          --verbose --numprocesses auto --showlocals
-        env:
-          TEMP: "C:\\Temp"
-
-      - name: Run integration tests (group 2)
-        if: matrix.group == 2
-        run: >-
-          nox -s test-${{ matrix.python }} --
-          -m integration -k "test_install"
+          nox -s test-${{ matrix.python }} --no-install --
+          tests/functional -k "${{ matrix.group.pytest-filter }}"
           --verbose --numprocesses auto --showlocals
         env:
           TEMP: "C:\\Temp"
@@ -251,7 +243,7 @@ jobs:
       - name: Run integration tests
         run: >-
           nox -s test-3.10 --
-          -m integration
+          tests/functional
           --verbose --numprocesses auto --showlocals
           --durations=5
           --use-zipapp

.pre-commit-config.yaml

@@ -35,7 +35,7 @@ repos:
     args: ["--pretty", "--show-error-codes"]
     additional_dependencies: [
         'keyring==24.2.0',
-        'nox==2023.4.22',
+        'nox==2024.03.02',
         'pytest',
         'types-docutils==0.20.0.3',
         'types-setuptools==68.2.0.0',

noxfile.py

@@ -19,6 +19,7 @@
 
 nox.options.reuse_existing_virtualenvs = True
 nox.options.sessions = ["lint"]
+nox.needs_version = ">=2024.03.02"  # for session.run_install()
 
 LOCATIONS = {
     "common-wheels": "tests/data/common_wheels",
@@ -44,7 +45,9 @@ def run_with_protected_pip(session: nox.Session, *arguments: str) -> None:
     env = {"VIRTUAL_ENV": session.virtualenv.location}
 
     command = ("python", LOCATIONS["protected-pip"]) + arguments
-    session.run(*command, env=env, silent=True)
+    # By using run_install(), these installation steps can be skipped when -R
+    # or --no-install is passed.
+    session.run_install(*command, env=env, silent=True)
 
 
 def should_update_common_wheels() -> bool:
@@ -84,8 +87,13 @@ def test(session: nox.Session) -> None:
         session.log(msg)
 
     # Build source distribution
+    # HACK: we want to skip building and installing pip when nox's --no-install
+    # flag is given (to save time when running tests back to back with different
+    # arguments), but unfortunately nox does not expose this configuration state
+    # yet. https://github.com/wntrblm/nox/issues/710
+    no_install = "-R" in sys.argv or "--no-install" in sys.argv
     sdist_dir = os.path.join(session.virtualenv.location, "sdist")
-    if os.path.exists(sdist_dir):
+    if not no_install and os.path.exists(sdist_dir):
         shutil.rmtree(sdist_dir, ignore_errors=True)
 
     run_with_protected_pip(session, "install", "build")
@@ -94,7 +102,7 @@ def test(session: nox.Session) -> None:
     # pip, so uninstall pip to force build to provision a known good version of pip.
     run_with_protected_pip(session, "uninstall", "pip", "-y")
     # fmt: off
-    session.run(
+    session.run_install(
         "python", "-I", "-m", "build", "--sdist", "--outdir", sdist_dir,
         silent=True,
     )