From 617f34a51590aaa0c237c29b167e216786860eeb Mon Sep 17 00:00:00 2001
From: Jamie Hardt <jamiehardt@me.com>
Date: Fri, 2 Jun 2023 19:37:12 -0700
Subject: [PATCH] Fixing publish script to use pypi

---
 .github/workflows/pythonpublish.yml | 46 ++++++++++++++---------------
 conftest.py                         |  0
 2 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 conftest.py

diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml
index 4b083ea..68852b4 100644
--- a/.github/workflows/pythonpublish.yml
+++ b/.github/workflows/pythonpublish.yml
@@ -4,36 +4,36 @@ on:
   release:
     types: [published]
 
+permissions:
+  contents: read
+  id-token: write
+  
 jobs:
   deploy:
     runs-on: ubuntu-latest
+    environment:
+      name: release
     steps:
-    - uses: actions/checkout@v2.5.0
+    - uses: actions/checkout@v3.5.2
     - name: Set up Python
-      uses: actions/setup-python@v4.3.0
+      uses: actions/setup-python@v4.6.0
       with:
         python-version: '3.x'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install build twine
-    - name: Install parsimonious
-      run: |
-        pip install parsimonious
-    - name: Build and publish
-      env:
-        TWINE_USERNAME: __token__
-        TWINE_PASSWORD: ${{ secrets.PYPI_UPLOAD_API_KEY }}
-      run: |
-        python -m build
-        twine upload dist/*
-    - name: Report to Mastodon
-      uses: cbrgm/mastodon-github-action@v1.0.1
-      with:
-        message: |
-          I just released a new version of ptulsconv, my ADR cue sheet generator!
-          #python #protools #pdf #filmmaking 
-          ${{ github.server_url }}/${{ github.repository }}
-      env:
-        MASTODON_URL: ${{ secrets.MASTODON_URL }}
-        MASTODON_ACCESS_TOKEN: ${{ secrets.MASTODON_ACCESS_TOKEN }}
+        pip install build
+    - name: Build package
+      run: python -m build
+    - name: pypi-publish
+      uses: pypa/gh-action-pypi-publish@v1.8.6
+    # - name: Report to Mastodon
+    #   uses: cbrgm/mastodon-github-action@v1.0.1
+    #   with:
+    #     message: |
+    #       I just released a new version of ptulsconv, my ADR cue sheet generator!
+    #       #python #protools #pdf #filmmaking 
+    #       ${{ github.server_url }}/${{ github.repository }}
+    #   env:
+    #     MASTODON_URL: ${{ secrets.MASTODON_URL }}
+    #     MASTODON_ACCESS_TOKEN: ${{ secrets.MASTODON_ACCESS_TOKEN }}
diff --git a/conftest.py b/conftest.py
deleted file mode 100644
index e69de29..0000000