Fixing publish script to use pypi

.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 }}

.readthedocs.yaml

@@ -25,5 +25,8 @@ formats:
 
 #Optionally declare the Python requirements required to build your docs
 python:
-   install:
-   - requirements: docs/requirements.txt
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - doc

docs/requirements.txt

@@ -1,29 +0,0 @@
-alabaster==0.7.12
-Babel==2.11.0
-certifi==2022.12.7
-charset-normalizer==2.1.1
-docutils==0.17.1
-idna==3.4
-imagesize==1.4.1
-Jinja2==3.1.2
-MarkupSafe==2.1.1
-packaging==21.3
-parsimonious==0.10.0
-Pillow==9.3.0
-Pygments==2.13.0
-pyparsing==3.0.9
-pytz==2022.6
-regex==2022.10.31
-reportlab==3.6.12
-requests==2.28.1
-snowballstemmer==2.2.0
-Sphinx==5.3.0
-sphinx-rtd-theme==1.1.1
-sphinxcontrib-applehelp==1.0.2
-sphinxcontrib-devhelp==1.0.2
-sphinxcontrib-htmlhelp==2.0.0
-sphinxcontrib-jsmath==1.0.1
-sphinxcontrib-qthelp==1.0.3
-sphinxcontrib-serializinghtml==1.1.5
-tqdm==4.64.1
-urllib3==1.26.12

docs/source/conf.py

@@ -15,8 +15,8 @@ import ptulsconv
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
 
 project = 'ptulsconv'
-copyright = ptulsconv.__copyright__
-author = ptulsconv.__author__
+# copyright = ptulsconv.__copyright__
+# author = ptulsconv.__author__
 release = ptulsconv.__version__
 
 # -- General configuration ---------------------------------------------------

ptulsconv/__init__.py

@@ -2,7 +2,7 @@
 Parse and convert Pro Tools text exports
 """
 
-__version__ = '1.0.6'
-# __author__  = 'Jamie Hardt'
-# __license__ = 'MIT'
-# __copyright__ = "%s %s (c) 2022 %s. All rights reserved." % (__name__, __version__, __author__)
+__version__ = '1.0.7'
+__author__  = 'Jamie Hardt'
+__license__ = 'MIT'
+__copyright__ = "%s %s (c) 2023 %s. All rights reserved." % (__name__, __version__, __author__)

ptulsconv/__main__.py

@@ -2,7 +2,7 @@ from optparse import OptionParser, OptionGroup
 import datetime
 import sys
 
-from ptulsconv import __name__, __version__, __author__,__copyright__
+from ptulsconv import __name__, __version__, __author__, __copyright__
 from ptulsconv.commands import convert
 from ptulsconv.reporting import print_status_style, print_banner_style, print_section_header_style, print_fatal_error
 

pyproject.toml

@@ -33,11 +33,16 @@ doc = [
     "sphinx-rtd-theme >= 1.1.1"
 ]
 
-[project.scripts]
-flit = "ptulsconv.__main__:main"
+[tool.flit.module]
+name = "ptulsconv"
 
+[project.scripts]
+ptulsconv = "ptulsconv.__main__:main"
+
+[project.entry_points.console_scripts]
+ptulsconv = 'ptulsconv.__main__:main'
 
 [project.urls]
 Source = 'https://github.com/iluvcapra/ptulsconv'
 Issues = 'https://github.com/iluvcapra/ptulsconv/issues'
-Documentation = 'https://ptulsconv.readthedocs.io/'
+Documentation = 'https://ptulsconv.readthedocs.io/'