Merge branch 'master' of https://github.com/sadiqkassamali/VoiceAuth

Author: sadiq kassamali

.github/workflows/python-app.yml

@@ -1,6 +1,3 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
-
 name: VoiceAuth application
 
 on:
@@ -10,90 +7,35 @@ on:
     branches: [ "master" ]
 
 permissions:
-  id-token: write # This is required for requesting the JWT
-  contents: read  # This is required for actions/checkout
+  id-token: write # Required for requesting the JWT
+  contents: write  # Required for actions/checkout
 
 jobs:
   build:
     name: Build distribution 📦
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: "3.10.X"
-    - name: Install pypa/build
+        python-version: "3.10"
+
+    - name: Install dependencies
       run: |
-        python -m pip install --upgrade -r requirements.txt
-        pip install build
-    - name: Build a binary wheel and a source tarball
+        python -m pip install --upgrade pip wheel cx_Freeze build twine
+        pip install -r requirements.txt build
+
+    - name: Build distribution packages
       run: |
-        python -m pip install --upgrade -r requirements.txt
-        python -m build --no-isolation
+        pip install -r requirements.txt build
+        python -m setup.py build --no-isolation 
+
     - name: Store the distribution packages
       uses: actions/upload-artifact@v4
       with:
         name: python-package-distributions
         path: dist/
-  publish-to-pypi:
-    name: >-
-      Publish Python 🐍 distribution 📦 to PyPI
-    if: startsWith(github.ref, 'refs/tags/')  # only publish to PyPI on tag pushes
-    needs:
-    - build
-    runs-on: ubuntu-latest
-    environment:
-      name: pypi
-      url: https://pypi.org/p/<package-name>  # Replace <package-name> with your PyPI project name
-    steps:
-    - name: Download all the dists
-      uses: actions/download-artifact@v4
-      with:
-        name: python-package-distributions
-        path: dist/
-    - name: Publish distribution 📦 to PyPI
-      uses: pypa/gh-action-pypi-publish@release/v1
-  github-release:
-    name: >-
-      Sign the Python 🐍 distribution 📦 with Sigstore
-      and upload them to GitHub Release
-    needs:
-    - publish-to-pypi
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: write  # IMPORTANT: mandatory for making GitHub Releases
-      id-token: write  # IMPORTANT: mandatory for sigstore
-
-    steps:
-    - name: Download all the dists
-      uses: actions/download-artifact@v4
-      with:
-        name: python-package-distributions
-        path: dist/
-    - name: Sign the dists with Sigstore
-      uses: sigstore/[email protected]
-      with:
-        inputs: >-
-          ./dist/*.tar.gz
-          ./dist/*.whl
-    - name: Create GitHub Release
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-      run: >-
-        gh release create
-        '${{ github.ref_name }}'
-        --repo '${{ github.repository }}'
-        --notes ""
-    - name: Upload artifact signatures to GitHub Release
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-      # Upload to GitHub Release using the `gh` CLI.
-      # `dist/` contains the built packages, and the
-      # sigstore-produced signatures and certificates.
-      run: >-
-        gh release upload
-        '${{ github.ref_name }}' dist/**
-        --repo '${{ github.repository }}'    

.github/workflows/python-publish.yml

@@ -1,37 +1,48 @@
-name: Upload Python Package
+name: Voice Auth Upload Python Package
 
 on:
   release:
     types: [published]
 
 permissions:
-  id-token: write # This is required for requesting the JWT
-  contents: write  # This is required for actions/checkout
+  id-token: write  # Required for OpenID authentication
+  contents: write  # Required for actions/checkout
 
 jobs:
   deploy:
-
     runs-on: ubuntu-latest
     environment:
       name: pypi
       url: https://pypi.org/p/VoiceAuth
+
     steps:
-    - uses: actions/checkout@v4
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
     - name: Set up Python
       uses: actions/setup-python@v3
       with:
-        python-version: '3.10.X'
+        python-version: "3.10"
+
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade -r requirements.txt
-        pip install build
-    - name: Build package
+        python -m pip install --upgrade pip wheel cx_Freeze build twine
+        pip install -r requirements.txt build
+
+    - name: Build distribution packages
       run: |
-        python -m pip install --upgrade -r requirements.txt
-        python -m build --no-isolation
-    - name: Publish package distributions to TestPyPI
+        pip install -r requirements.txt build
+        python -m setup.py build --no-isolation 
+
+
+    - name: Publish package to TestPyPI
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
-        repository-url: https://test.pypi.org/legacy/    
-    - name: Publish package distributions to PyPI
+        repository-url: https://test.pypi.org/legacy/
+        password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+
+    - name: Publish package to PyPI
+      if: success()
       uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        password: ${{ secrets.PYPI_API_TOKEN }}