Update xcookie

Update github artifacts Drop 3.6 and 3.7 support Rotate secrets Remove explicit osx13 Fixup setup.py
pyutils · Sep 15, 2024 · afa9e27 · afa9e27
1 parent 6b1db7c
commit afa9e27
Show file tree

Hide file tree

Showing 11 changed files with 131 additions and 134 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Checkout source
       uses: actions/[email protected]
     - name: Set up Python 3.12 for linting
-      uses: actions/setup-python@v5.0.0
+      uses: actions/setup-python@v5.1.1
       with:
         python-version: '3.12'
     - name: Install dependencies
@@ -51,7 +51,7 @@ jobs:
     - name: Checkout source
       uses: actions/[email protected]
     - name: Set up Python 3.12
-      uses: actions/setup-python@v5.0.0
+      uses: actions/setup-python@v5.1.1
       with:
         python-version: '3.12'
     - name: Upgrade pip
@@ -62,9 +62,9 @@ jobs:
     - name: Build sdist
       shell: bash
       run: |-
-        python -m pip install pip -U
-        python -m pip install setuptools>=0.8 wheel build
+        python -m pip install setuptools>=0.8 wheel build twine
         python -m build --sdist --outdir wheelhouse
+        python -m twine check ./wheelhouse/line_profiler*.tar.gz
     - name: Install sdist
       run: |-
         ls -al wheelhouse
@@ -98,11 +98,11 @@ jobs:
         echo "MOD_DPATH = $MOD_DPATH"
         python -m pytest --verbose --cov=line_profiler $MOD_DPATH ../tests
         cd ..
-    - uses: actions/upload-artifact@v3.1.3
+    - uses: actions/upload-artifact@v4.3.1
       name: Upload sdist artifact
       with:
         name: sdist_wheels
-        path: wheelhouse/*.tar.gz
+        path: ./wheelhouse/line_profiler*.tar.gz
   build_binpy_wheels:
     ##
     # Build the binary wheels. Note: even though cibuildwheel will test
@@ -123,7 +123,6 @@ jobs:
         - ubuntu-latest
         - macOS-latest
         - windows-latest
-        - macos-13
         cibw_skip:
         - '*-win32'
         arch:
@@ -135,12 +134,12 @@ jobs:
       uses: ilammy/msvc-dev-cmd@v1
       if: matrix.os == 'windows-latest' && ${{ contains(matrix.cibw_skip, '*-win32') }}
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3
+      uses: docker/setup-qemu-action@v3.0.0
       if: runner.os == 'Linux' && matrix.arch != 'auto'
       with:
         platforms: all
     - name: Build binary wheels
-      uses: pypa/cibuildwheel@v2.17.0
+      uses: pypa/cibuildwheel@v2.21.0
       with:
         output-dir: wheelhouse
         config-file: pyproject.toml
@@ -151,7 +150,7 @@ jobs:
       shell: bash
       run: ls -la wheelhouse
     - name: Set up Python 3.12 to combine coverage
-      uses: actions/setup-python@v5.0.0
+      uses: actions/setup-python@v5.1.1
       if: runner.os == 'Linux'
       with:
         python-version: '3.12'
@@ -172,13 +171,21 @@ jobs:
         pwd
     - uses: codecov/[email protected]
       name: Codecov Upload
+      env:
+        HAVE_CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN != '' }}
+      if: ${{ env.HAVE_PERSONAL_TOKEN == 'true' }}
       with:
         file: ./coverage.xml
         token: ${{ secrets.CODECOV_TOKEN }}
-    - uses: actions/[email protected]
+    - uses: codecov/[email protected]
+      name: Codecov Upload
+      with:
+        file: ./coverage.xml
+        token: ${{ secrets.CODECOV_TOKEN }}
+    - uses: actions/[email protected]
       name: Upload wheels artifact
       with:
-        name: wheels
+        name: wheels-${{ matrix.os }}-${{ matrix.arch }}
         path: ./wheelhouse/line_profiler*.whl
   test_binpy_wheels:
     ##
@@ -197,15 +204,15 @@ jobs:
         # Xcookie generates an explicit list of environments that will be used
         # for testing instead of using the more concise matrix notation.
         include:
-        - python-version: '3.6'
+        - python-version: '3.8'
           install-extras: tests-strict,runtime-strict
-          os: ubuntu-20.04
+          os: ubuntu-latest
           arch: auto
-        - python-version: '3.6'
+        - python-version: '3.8'
           install-extras: tests-strict,runtime-strict
-          os: macos-13
+          os: macOS-latest
           arch: auto
-        - python-version: '3.6'
+        - python-version: '3.8'
           install-extras: tests-strict,runtime-strict
           os: windows-latest
           arch: auto
@@ -229,14 +236,6 @@ jobs:
           install-extras: tests
           os: windows-latest
           arch: auto
-        - python-version: '3.6'
-          install-extras: tests,optional
-          os: ubuntu-20.04
-          arch: auto
-        - python-version: '3.7'
-          install-extras: tests,optional
-          os: ubuntu-latest
-          arch: auto
         - python-version: '3.8'
           install-extras: tests,optional
           os: ubuntu-latest
@@ -257,14 +256,6 @@ jobs:
           install-extras: tests,optional
           os: ubuntu-latest
           arch: auto
-        - python-version: '3.6'
-          install-extras: tests,optional
-          os: macos-13
-          arch: auto
-        - python-version: '3.7'
-          install-extras: tests,optional
-          os: macos-13
-          arch: auto
         - python-version: '3.8'
           install-extras: tests,optional
           os: macOS-latest
@@ -285,14 +276,6 @@ jobs:
           install-extras: tests,optional
           os: macOS-latest
           arch: auto
-        - python-version: '3.6'
-          install-extras: tests,optional
-          os: windows-latest
-          arch: auto
-        - python-version: '3.7'
-          install-extras: tests,optional
-          os: windows-latest
-          arch: auto
         - python-version: '3.8'
           install-extras: tests,optional
           os: windows-latest
@@ -320,18 +303,19 @@ jobs:
       uses: ilammy/msvc-dev-cmd@v1
       if: matrix.os == 'windows-latest'
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3
+      uses: docker/setup-qemu-action@v3.0.0
       if: runner.os == 'Linux' && matrix.arch != 'auto'
       with:
         platforms: all
     - name: Setup Python
-      uses: actions/setup-python@v5.0.0
+      uses: actions/setup-python@v5.1.1
       with:
         python-version: ${{ matrix.python-version }}
-    - uses: actions/download-artifact@v2.1.1
+    - uses: actions/download-artifact@v4.1.2
       name: Download wheels
       with:
-        name: wheels
+        pattern: wheels-*
+        merge-multiple: true
         path: wheelhouse
     - name: Install wheel ${{ matrix.install-extras }}
       shell: bash
@@ -343,11 +327,23 @@ jobs:
         echo "Installing helpers"
         pip install setuptools>=0.8 setuptools_scm wheel build -U
         pip install tomli pkginfo
-        export WHEEL_FPATH=$(python -c "import pathlib; print(str(sorted(pathlib.Path('wheelhouse').glob('line_profiler*.whl'))[-1]).replace(chr(92), chr(47)))")
-        export MOD_VERSION=$(python -c "from pkginfo import Wheel; print(Wheel('$WHEEL_FPATH').version)")
-        echo "$WHEEL_FPATH=WHEEL_FPATH"
-        echo "$INSTALL_EXTRAS=INSTALL_EXTRAS"
-        echo "$MOD_VERSION=MOD_VERSION"
+        export WHEEL_FPATH=$(python -c "if 1:
+            import pathlib
+            dist_dpath = pathlib.Path('wheelhouse')
+            candidates = list(dist_dpath.glob('line_profiler*.whl'))
+            candidates += list(dist_dpath.glob('line_profiler*.tar.gz'))
+            fpath = sorted(candidates)[-1]
+            print(str(fpath).replace(chr(92), chr(47)))
+        ")
+        export MOD_VERSION=$(python -c "if 1:
+            from pkginfo import Wheel, SDist
+            fpath = '$WHEEL_FPATH'
+            cls = Wheel if fpath.endswith('.whl') else SDist
+            print(cls(fpath).version)
+        ")
+        echo "WHEEL_FPATH=$WHEEL_FPATH"
+        echo "INSTALL_EXTRAS=$INSTALL_EXTRAS"
+        echo "MOD_VERSION=$MOD_VERSION"
         pip install --prefer-binary "line_profiler[$INSTALL_EXTRAS]==$MOD_VERSION" -f wheelhouse
         echo "Install finished."
     - name: Test wheel ${{ matrix.install-extras }}
@@ -402,7 +398,7 @@ jobs:
         file: ./coverage.xml
         token: ${{ secrets.CODECOV_TOKEN }}
   test_deploy:
-    name: Uploading Test to PyPi
+    name: Deploy Test
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && ! startsWith(github.event.ref, 'refs/tags') && ! startsWith(github.event.ref, 'refs/heads/release')
     needs:
@@ -411,12 +407,13 @@ jobs:
     steps:
     - name: Checkout source
       uses: actions/[email protected]
-    - uses: actions/download-artifact@v2.1.1
+    - uses: actions/download-artifact@v4.1.2
       name: Download wheels
       with:
-        name: wheels
+        pattern: wheels-*
+        merge-multiple: true
         path: wheelhouse
-    - uses: actions/download-artifact@v2.1.1
+    - uses: actions/download-artifact@v4.1.2
       name: Download sdist
       with:
         name: sdist_wheels
@@ -465,7 +462,7 @@ jobs:
         ots stamp wheelhouse/*.whl wheelhouse/*.tar.gz wheelhouse/*.asc
         ls -la wheelhouse
         twine upload --username __token__ --password "$TWINE_PASSWORD" --repository-url "$TWINE_REPOSITORY_URL" wheelhouse/*.whl wheelhouse/*.tar.gz --skip-existing --verbose || { echo "failed to twine upload" ; exit 1; }
-    - uses: actions/upload-artifact@v3.1.3
+    - uses: actions/upload-artifact@v4.3.1
       name: Upload deploy artifacts
       with:
         name: deploy_artifacts
@@ -476,7 +473,7 @@ jobs:
           wheelhouse/*.asc
           wheelhouse/*.ots
   live_deploy:
-    name: Uploading Live to PyPi
+    name: Deploy Live
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && (startsWith(github.event.ref, 'refs/tags') || startsWith(github.event.ref, 'refs/heads/release'))
     needs:
@@ -485,12 +482,13 @@ jobs:
     steps:
     - name: Checkout source
       uses: actions/[email protected]
-    - uses: actions/download-artifact@v2.1.1
+    - uses: actions/download-artifact@v4.1.2
       name: Download wheels
       with:
-        name: wheels
+        pattern: wheels-*
+        merge-multiple: true
         path: wheelhouse
-    - uses: actions/download-artifact@v2.1.1
+    - uses: actions/download-artifact@v4.1.2
       name: Download sdist
       with:
         name: sdist_wheels
@@ -539,7 +537,7 @@ jobs:
         ots stamp wheelhouse/*.whl wheelhouse/*.tar.gz wheelhouse/*.asc
         ls -la wheelhouse
         twine upload --username __token__ --password "$TWINE_PASSWORD" --repository-url "$TWINE_REPOSITORY_URL" wheelhouse/*.whl wheelhouse/*.tar.gz --skip-existing --verbose || { echo "failed to twine upload" ; exit 1; }
-    - uses: actions/upload-artifact@v3.1.3
+    - uses: actions/upload-artifact@v4.3.1
       name: Upload deploy artifacts
       with:
         name: deploy_artifacts
@@ -560,7 +558,7 @@ jobs:
     steps:
     - name: Checkout source
       uses: actions/[email protected]
-    - uses: actions/download-artifact@v2.1.1
+    - uses: actions/download-artifact@v4.1.2
       name: Download artifacts
       with:
         name: deploy_artifacts

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,9 +1,10 @@
 Changes
 =======
 
-4.1.4
+4.2.0
 ~~~~~
 * FIX: Fix issue with auto-profile of editable installs #279
+* CHANGE: Drop support for Python 3.6 and Python 3.7
 
 4.1.3
 ~~~~~

diff --git a/dev/ci_public_gpg_key.pgp.enc b/dev/ci_public_gpg_key.pgp.enc
@@ -1,31 +1,31 @@
-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
+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