Merge pull request #11 from DevOps-MBSE/10-task-update-workflows-for-…

…pypi-deployment

Correcting Workflows

.github/workflows/python-build-and-lint.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Upload Python Wheel
         uses: actions/upload-artifact@v3
         with:
-          name: aac_wheel
+          name: aac_spec_wheel
           path: python/dist/
 
       - name: Build Documentation

.github/workflows/python-cross-platform-support.yml

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-latest, windows-latest, macos-latest] # Annoyingly, Github actions don't support anchors
+        os: [ubuntu-20.04, ubuntu-latest, windows-latest, macos-13, macos-14] # Annoyingly, Github actions don't support anchors
 
     steps:
       - name: Checkout Repository
@@ -51,7 +51,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-latest, windows-latest, macos-latest] # Annoyingly, Github actions don't support anchors
+        os: [ubuntu-20.04, ubuntu-latest, windows-latest, macos-13, macos-14] # Annoyingly, Github actions don't support anchors
         py_version: ["3.9.13"]   # py_version: ["3.9.0", "3.10.0", "3.11.0"]
         # exclude:
         #   - os: ubuntu-latest

.github/workflows/python-deploy-artifacts.yml

@@ -2,11 +2,11 @@ name: Deploy Python Artifacts
 
 on:
   workflow_dispatch:
-  # push:
-  #   branches:
-  #     - main
-  #   paths:
-  #     - python/**
+  push:
+    branches:
+      - main
+    paths:
+      - python/**
 
 defaults:
   run:
@@ -21,15 +21,15 @@ jobs:
     name: Deploy Artifacts
     runs-on: ubuntu-22.04
     needs: build_deployment_artifacts
+    permissions:
+      # Important:  This permission is mandatory for trusted publishing
+      id-token: write
     steps:
       - name: Download Python Wheel
         uses: actions/download-artifact@v3
         with:
-          name: aac_wheel
-          path: python/dist/
+          name: aac_spec_wheel
+          path: dist/
 
       - name: Publish distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@master
-        with:
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: python/dist/
+        uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/sphinx.yml

@@ -40,7 +40,7 @@ jobs:
       - name: Build Documentation
         uses: ammaraskar/sphinx-action@0.4
         with:
-          pre-build-command: "pip install -e ."
+          pre-build-command: "pip install aac-spec"
           docs-folder: "docs/"
 
       - name: Upload Artifact

python/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "aac-spec"
-version = "0.1.0"
+version = "0.1.1"
 authors = [
-	{ name="Will Bunch", email="William.Bunch@ngc.com" },
+	{ name="bunchw", email="asdfasdaf@email.com" },
 ]
 description = "Specification plugin for AaC"
-requires-python = "== 3.9.13"
+requires-python = ">= 3.9.13"
 dependencies = [
-	"aac==0.4.3"
+	"aac>=0.4.3"
 ]
 readme = "README.md"
 license = {text = "MIT License"}