Update pypi.yml

Author: dciborow

.github/workflows/pypi.yml

@@ -1,48 +1,39 @@
-name: Upload Python Package
-
+name: Python CI
 on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
   release:
-    types: [created]
+    types: [created]    
   workflow_dispatch:
 
 jobs:
-  deploy:
+  publish:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup Python
-      uses: actions/setup-python@v2.2.2
-      with:
-        python-version: 3.7    
-    - name: Install dependencies
-      run: |
-        python3.7 -m pip install --upgrade pip
-        python3.7 -m pip install setuptools wheel twine
-        python3.7 -m pip install virtualenv pip-tools
-        sudo add-apt-repository -y ppa:ubuntugis/ppa \
-        && sudo apt install -y \
-          gdal-bin libgdal-dev
-        mv ./.depends/requirements.txt requirements.in
-        touch requirements.txt
-        echo "" >> requirements.in
-        cat requirements.linked.in >> requirements.in
-        pip-compile -v requirements.in
-        cd .depends
-        requirements=$(find . -type f -name "*.requirements*" | paste -sd " ")
-        for req in $requirements
-        do
-          echo "Solving for Requirements : $req"
-          mv $req temp.in
-          echo "-c ../requirements.txt" >> temp.in	
-          touch $req
-          pip-compile temp.in -o $req
-        done
-        cd ..
-        mv requirements.txt ./.depends/requirements.txt
-        python setup.py sdist bdist_wheel
+      - uses: actions/checkout@v2
+
+      - if: ${{ github.event_name == 'release' }}
+        name: Publish Release to PyPi
+        uses: dciborow/pyaction@0.0.28
+        with:
+          pypi_publish: true
+          pypi_password: ${{ secrets.PYPI_PASSWORD }}
+
+      - if: ${{ github.event_name == 'push' }}
+        name: Publish RC to PyPi
+        uses: dciborow/pyaction@0.0.28
+        with:
+          pypi_publish: true
+          pypi_password: ${{ secrets.PYPI_PASSWORD }}
+          version_suffix: -rc${{ github.run_number }}-post${{ github.run_attempt }}
 
-    - name: Publish package
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        user: __token__
-        password: ${{ secrets.PYPI_PASSWORD }}
+      - if: ${{ github.event_name == 'pull_request' }}
+        name: Publish Snapshot to TestPyPi
+        uses: dciborow/pyaction@0.0.28
+        with:
+          pypi_publish: true
+          pypi_password: ${{ secrets.TEST_PYPI_PASSWORD  }}
+          pypi_repo: testpypi
+          version_suffix: -post${{ github.run_number }}-dev${{ github.run_attempt }}