Merge pull request #474 from rmartin16/attest-package

Use new create package action with attestation

Author: freakboy3742

.github/workflows/ci.yml

@@ -5,16 +5,28 @@ on:
     branches:
       - main
   workflow_call:
+    inputs:
+      attest-package:
+        description: "Create GitHub provenance attestation for the package."
+        default: "false"
+        type: string
     outputs:
       artifact-name:
         description: "Name of the uploaded artifact; use for artifact retrieval."
         value: ${{ jobs.package.outputs.artifact-name }}
 
 # Cancel active CI runs for a PR before starting another run
 concurrency:
-  group: ${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+defaults:
+  run:
+    shell: bash
+
+env:
+  FORCE_COLOR: "1"
+
 jobs:
   pre-commit:
     name: Pre-commit checks
@@ -29,14 +41,18 @@ jobs:
       runner-os: "macos-latest"
 
   package:
-    name: Python Package
+    name: Package Rubicon-ObjC
+    permissions:
+      id-token: write
+      contents: read
+      attestations: write
     uses: beeware/.github/.github/workflows/python-package-create.yml@main
     with:
-      runner-os: "macos-latest"
+      attest: ${{ inputs.attest-package }}
 
   unit-tests:
     name: Unit tests
-    needs: [pre-commit, towncrier, package]
+    needs: [ pre-commit, towncrier, package ]
     runs-on: ${{ matrix.platform }}
     continue-on-error: ${{ matrix.experimental }}
     strategy:
@@ -79,12 +95,11 @@ jobs:
         name: ${{ needs.package.outputs.artifact-name }}
         path: dist
 
-    - name: Install dev dependencies
-      run: |
-        # We don't actually want to install rubicon;
-        # we just want the dev extras so we have a known version of tox.
-        python -m pip install $(ls dist/rubicon_objc-*.whl)[dev]
+    - name: Install Tox
+      uses: beeware/.github/.github/actions/install-requirement@main
+      with:
+        requirements: tox
+        extra: dev
 
     - name: Test
-      run: |
-        tox -e py --installpkg dist/rubicon_objc-*.whl
+      run: tox -e py --installpkg dist/rubicon_objc-*.whl

.github/workflows/release.yml

@@ -7,7 +7,10 @@ on:
 
 jobs:
   ci:
+    name: CI
     uses: ./.github/workflows/ci.yml
+    with:
+      attest-package: "true"
 
   docs:
     name: Verify Docs Build
@@ -19,15 +22,15 @@ jobs:
 
   release:
     name: Create Release
-    needs: ci
+    needs: [ ci, docs ]
     # This has to be run on macOS, because rubicon tries to load the Foundation library
     runs-on: macOS-latest
     permissions:
       contents: write
     steps:
       - name: Set build variables
         run: |
-          echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV
+          echo "VERSION=${GITHUB_REF_NAME#v}" | tee -a $GITHUB_ENV
 
       - name: Set up Python
         uses: actions/[email protected]
@@ -41,7 +44,7 @@ jobs:
           path: dist
 
       - name: Install packages
-        run: pip install dist/rubicon_objc-*.whl
+        run: python -m pip install dist/rubicon_objc-*.whl
 
       - name: Check version number
         # Check that the setuptools_scm-generated version number is still the same when
@@ -60,7 +63,7 @@ jobs:
 
   test-publish:
     name: Publish test package
-    needs: [ci, docs, release]
+    needs: [ ci, docs, release ]
     runs-on: ubuntu-latest
     permissions:
       contents: write

changes/474.misc.rst

@@ -0,0 +1 @@
+``hynek/build-and-inspect-python-package`` is now used to create the Python package.

tox.ini

@@ -30,7 +30,7 @@ allowlist_externals =
     make
 commands =
     make -C tests{/}objc
-    pytest -vv -- {posargs}
+    python -m pytest {posargs:-vv --color yes}
 
 [testenv:towncrier{,-check}]
 deps =
@@ -68,12 +68,3 @@ commands =
     all  : python -m sphinx {[docs]sphinx_args} {posargs} -v -a -E -b html {[docs]docs_dir} {[docs]build_dir}{/}html
     live-!src : sphinx-autobuild {[docs]sphinx_args} {posargs} -b html {[docs]docs_dir} {[docs]build_dir}{/}live
     live-src  : sphinx-autobuild {[docs]sphinx_args} {posargs} -a -E --watch {tox_root}{/}src{/}rubicon{/}objc -b html {[docs]docs_dir} {[docs]build_dir}{/}live
-
-[testenv:package]
-skip_install = True
-deps =
-    build==1.2.1
-    twine==5.1.0
-commands =
-    python -m build --outdir dist/ .
-    python -m twine check dist/*