47 | Update publish workflow to include .whl

Author: LeanderCS

.github/workflows/publish-to-pypi.yaml

@@ -1,16 +1,80 @@
 name: Publish to PyPI
 
-on:
-  release:
-    types: [published]
+on: [push]
+#  release:
+#    types: [published]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 
 jobs:
-  publish:
+
+  build-whl:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        python: [ "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14" ]
+        exclude:
+          - os: macos-latest
+            python: "3.9"
+          - os: macos-latest
+            python: "3.8"
+          - os: macos-latest
+            python: "3.7"
+          - os: ubuntu-latest
+            python: "3.7"
+
+    steps:
+      - uses: actions/checkout@v4
+
+      #- uses: actions/setup-python@v5
+      #  with:
+      #    python-version: ${{ matrix.python }}
+
+      - name: Install Python 3.14 with pyenv (if needed)
+        if: ${{ matrix.python == '3.14' }}
+        run: |
+          echo "Installing Python 3.14 using pyenv"
+          curl https://pyenv.run | bash
+          if [[ "$OSTYPE" == "linux-gnu"* || "$OSTYPE" == "darwin"* ]]; then
+            export PATH="$HOME/.pyenv/bin:$PATH"
+            eval "$(pyenv init --path)"
+            eval "$(pyenv init -)"
+          elif ($env:OSTYPE -eq "msys") {
+            $env:PYENV_ROOT="$HOME/.pyenv"
+            $env:PATH="$env:PYENV_ROOT/bin;$env:PATH"
+            pyenv init --path | Invoke-Expression
+            pyenv init - | Invoke-Expression
+          }
+          pyenv install 3.14-dev
+          pyenv global 3.14-dev
+
+      - name: Setup Python
+        if: ${{ matrix.python != '3.14' }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python }}
+
+      - name: Install build tools
+        run: pip install build twine wheel
+
+      - name: Build wheel
+        run: python -m build --wheel
+
+      - name: Upload built packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: pkg-${{ matrix.os }}-${{ matrix.python }}-${{ strategy.job-index }}
+          path: |
+            ./dist/*.whl
+
+  build-sdist:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-python@v5
         with:
@@ -19,11 +83,35 @@ jobs:
       - name: Install build tools
         run: pip install build twine wheel
 
-      - name: Build package
-        run: python -m build
+      - name: Build source distribution
+        run: python -m build --sdist
+
+      - name: Upload built packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: pkg-sdist
+          path: |
+            ./dist/*.tar.gz
+
+  publish:
+    needs: [build-whl, build-sdist]
+    runs-on: ubuntu-latest
+
+    environment:
+      name: release
+      url: https://pypi.org/project/flask-inputfilter
+
+    permissions:
+      id-token: write
+
+    steps:
+      - name: Download built packages
+        uses: actions/download-artifact@v4
+        with:
+          path: dist
+          merge-multiple: true
 
-      - name: Publish to PyPI
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
-        run: twine upload dist/*.tar.gz
+      - name: Publish package to PyPI
+        #uses: pypa/gh-action-pypi-publish@release/v1
+        run: |
+          ls -la dist

setup.py

@@ -4,13 +4,21 @@
 
 if shutil.which("g++") is not None:
     from Cython.Build import cythonize
+    from setuptools.extension import Extension
+
+    pyx_modules = [
+        "flask_inputfilter.Mixin._ExternalApiMixin",
+        "flask_inputfilter.Model._FieldModel",
+        "flask_inputfilter._InputFilter",
+    ]
 
     ext_modules = cythonize(
-        [
-            "flask_inputfilter/Mixin/_ExternalApiMixin.pyx",
-            "flask_inputfilter/Model/_FieldModel.pyx",
-            "flask_inputfilter/_InputFilter.pyx",
-        ],
+        module_list=[Extension(
+            name=module,
+            sources=[module.replace('.', '/') + ".pyx"],
+            extra_compile_args=["-std=c++11"],
+            language="c++"
+        ) for module in pyx_modules],
         language_level=3,
     )
     options = {