pyproject.toml

jobs

Author: davidhozic

.github/workflows/create_release.yml

@@ -1,9 +1,14 @@
 on:
   workflow_dispatch:
     inputs:
-      version:
+      version-minor:
         type: string
-        description: Version to create tag on
+        description: Minor version to create tag on (eg. x.x)
+
+      version-bugfix:
+        type: string
+        description: Minor version to create tag on (eg. 2.x)
+        default: ""    
 
 name: Create Release
 
@@ -19,7 +24,7 @@ jobs:
         uses: mathieudutour/[email protected]
         with:
           github_token: ${{ secrets.TOKEN_GH }}
-          custom_tag : ${{github.event.inputs.version}}
+          custom_tag : ${{github.event.inputs.version-minor}}.${{github.event.inputs.version-bugfix}}
       - name: Create Release
         id: create_release
         uses: actions/create-release@latest
@@ -28,6 +33,6 @@ jobs:
         with:
           tag_name: ${{ steps.tag_version.outputs.new_tag }}
           release_name: ${{ steps.tag_version.outputs.new_tag }}
-          body: "Changelog: https://daf.davidhozic.com/en/v${{github.event.inputs.version}}/changelog.html"
+          body: "Changelog: https://daf.davidhozic.com/en/v${{github.event.inputs.version-minor}}.x/changelog.html"
           draft: false
           prerelease: false

.github/workflows/python-publish.yml

@@ -9,21 +9,8 @@ on:
 jobs:
   # Build job
   build:
-    runs-on: ${{matrix.os[0]}}
-    strategy:
-      matrix:
-        os: 
-        - [ubuntu-latest, manylinux_x86_64]
-        - [macos-12, macosx_x86_64]
-        - [windows-2019, win_amd64]
-        python: ["cp38", "cp39", "cp310"]
-
+    runs-on: ubuntu-latest
     steps:
-    - name: Change file endings.
-      run: |
-        git config --global core.autocrlf false
-        git config --global core.eol lf
-
     - name: Checkout code
       uses: actions/checkout@v2
 
@@ -35,56 +22,13 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install build cibuildwheel==2.13.1
-
-    - name: Build wheels
-      run: |
-        python -m cibuildwheel --output-dir dist
-      env:
-        CIBW_BUILD: ${{ matrix.python }}-${{ matrix.os[1] }}
 
-    - name: Build sdist and universal wheel
-      if: ${{matrix.python == 'cp38' && matrix.os[0] == 'ubuntu-latest'}}
+    - name: Build
       run: |
-        python setup-universal.py
         python -m build
 
-    - name: Cache dist
-      uses: actions/cache@v3
+    - name: Publish package
+      uses: pypa/gh-action-pypi-publish@f5622bde02b04381239da3573277701ceca8f6a0
       with:
-        path: dist/
-        key: ${{matrix.python}}-${{matrix.os[0]}}-${{hashFiles('**/daf/__init__.py')}}
-        enableCrossOsArchive: true
-
-  # Publish job
-  publish:
-    runs-on: ubuntu-latest
-    needs: build
-    strategy:
-      matrix:  # Same as in build job
-        os: 
-        - [ubuntu-latest, manylinux_x86_64]
-        - [macos-12, macosx_x86_64]
-        - [windows-2019, win_amd64]
-        python: ["cp38", "cp39", "cp310"]
-    steps:
-      - name: Change file endings.
-        run: |
-          git config --global core.autocrlf false
-          git config --global core.eol lf
-
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Restore dist
-        uses: actions/cache/restore@v3
-        with:
-          path: dist/
-          key: ${{matrix.python}}-${{matrix.os[0]}}-${{hashFiles('**/daf/__init__.py')}}
-          enableCrossOsArchive: true
-
-      - name: Publish package
-        uses: pypa/gh-action-pypi-publish@f5622bde02b04381239da3573277701ceca8f6a0
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
+        user: __token__
+        password: ${{ secrets.PYPI_API_TOKEN }}

pyproject.toml

@@ -3,11 +3,9 @@ requires = [
     "setuptools>=62.6,<66",
     "setuptools-scm>=6.2,<8",
     "wheel",
-    "nuitka",
-    "toml"
 ]
 
-build-backend = "nuitka.distutils.Build"
+build-backend = "setuptools.build_meta"
 
 
 [project]