Finalized publishing

Author: gershnik

.github/workflows/publish.yml

@@ -1,8 +1,16 @@
 name: Publish package
-on: workflow_dispatch
+on: 
+  workflow_dispatch:
+    inputs:
+      destination:
+        type: choice
+        description: 'Publish to:'
+        options:
+          - pypi
+          - testpypi
 
 jobs:
-  publish:
+  prepare:
     runs-on: ubuntu-latest
     permissions: write-all
     steps:
@@ -24,12 +32,6 @@ jobs:
         run: |
           echo "NEW_VERSION=$(tools/update-version.py release)" >> $GITHUB_ENV
 
-      - name: Build
-        run: |
-          rm -rf code/wrappers/python/src/spreader.egg-info 
-          mkdir -p dist/tmp 
-          python3 setup.py egg_info --egg-base dist/tmp sdist 
-
       - name: Update changelog
         uses: superfaceai/release-changelog-action@v2
         with:
@@ -38,11 +40,19 @@ jobs:
           operation: release
 
       - name: Commit CHANGELOG.md and package.json changes and create tag
+        id: tagRelease
         run: |
           git add "setup.py"
           git add "CHANGELOG.md"
           git commit -m "chore: release ${{ env.NEW_VERSION }}"
-          git tag ${{ env.NEW_VERSION }}
+          git tag v${{ env.NEW_VERSION }}
+          echo "newVersion=${{ env.NEW_VERSION }}" >> "$GITHUB_OUTPUT"
+
+      - name: Build Source Distribution
+        run: |
+          rm -rf code/wrappers/python/src/spreader.egg-info 
+          mkdir -p dist/tmp 
+          python3 setup.py egg_info --egg-base dist/tmp sdist 
 
       - name: Set next dev version
         run: |
@@ -56,28 +66,96 @@ jobs:
         run: |
           git push origin && git push --tags
 
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          path: dist/*.tar.gz
+
+    outputs:
+      newVersion: ${{ steps.tagRelease.outputs.newVersion }}
+
+  wheels:
+    needs: prepare
+    runs-on: ${{matrix.os}}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-latest, macos-latest]
+        pyver: [cp37, cp38, cp39, cp310, cp311, pp38, pp39]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: v${{needs.prepare.outputs.newVersion}}
+          submodules: true
+
+      - name: Build wheels
+        uses: pypa/cibuildwheel@v2.12.1
+        env:
+          CIBW_BUILD: ${{matrix.pyver}}-*
+          CIBW_ARCHS_MACOS: x86_64 universal2
+          MACOSX_DEPLOYMENT_TARGET: 10.15
+          CIBW_ARCHS_WINDOWS: AMD64 x86 ARM64
+          CIBW_BEFORE_BUILD_WINDOWS: if exist "{package}\_skbuild" rmdir /s /q "{package}\_skbuild"
+          CIBW_TEST_REQUIRES: pytest
+          CIBW_TEST_COMMAND: pytest --color=yes {project}/code/wrappers/python
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          path: ./wheelhouse/*.whl
+
+  publish:
+    needs: 
+      - prepare 
+      - wheels
+    runs-on: ubuntu-latest
+    permissions: write-all
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: v${{needs.prepare.outputs.newVersion}}
+          submodules: true
+
+      - name: Setup python environment
+        run: |
+          pip3 install -r requirements.txt
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: artifact
+          path: dist
+
       - name: Publish
-        run: twine upload --non-interactive dist/eg.spreader-${{ env.NEW_VERSION }}.tar.gz 
+        run: |
+          if [[ "$TWINE_REPOSITORY" == "testpypi" ]]; then
+            export TWINE_PASSWORD=${{ secrets.TESTPYPI_ACCESS_TOKEN }}
+          else
+            export TWINE_PASSWORD=${{ secrets.PYPI_ACCESS_TOKEN }}
+          fi
+          twine upload --non-interactive dist/* 
         env:
-          TWINE_REPOSITORY: testpypi
+          TWINE_REPOSITORY: ${{ github.event.inputs.destination }}
           TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.TESTPYPI_ACCESS_TOKEN }}
 
       - id: get-changelog
         name: Get version changelog
         uses: superfaceai/release-changelog-action@v2
         with:
           path-to-changelog: CHANGELOG.md
-          version: ${{ env.NEW_VERSION }}
+          version: ${{needs.prepare.outputs.newVersion}}
           operation: read
 
       - name: Update GitHub release documentation
         uses: softprops/action-gh-release@v1
         with:
-          tag_name: ${{ env.NEW_VERSION }}
+          tag_name: v${{needs.prepare.outputs.newVersion}}
           body: ${{ steps.get-changelog.outputs.changelog }}
           files: |
-            dist/eg.spreader-${{ env.NEW_VERSION }}.tar.gz
+            dist/*
           draft: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -38,13 +38,6 @@ jobs:
       - name: Install Nox
         run: pip install Nox
 
-      - name: Fixup Build Params
-        if: matrix.os == 'windows-latest' && matrix.python-version == 'pypy-3.8'
-        run: |
-          $Python3_ROOT_DIR=$Env:Python3_ROOT_DIR -replace '\\', '/'
-          echo SKBUILD_CONFIGURE_OPTIONS=-DPYTHON_LIBRARY=$Python3_ROOT_DIR/libs/python38.lib >> $Env:GITHUB_ENV
-          #Get-ChildItem -Path $Env:Python3_ROOT_DIR -Recurse
-
       - name: Test
         run: nox --sessions test --force-python ${{ steps.setup-python.outputs.python-path }}
 

.gitignore

@@ -8,3 +8,4 @@ dist/
 .DS_Store
 __pycache__
 .extrapythons
+.pypirc

CHANGELOG.md

@@ -6,5 +6,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 ### Added
-Initial version
-
+- Initial version

MANIFEST.in

@@ -1,7 +1,8 @@
 include code/CMakeLists.txt
 recursive-include code/cmake *.cmake
 recursive-include code/lib/code *.h *.cpp *.l *.y *.txt
-recursive-include code/wrappers/python/src *.h *.cpp *.h *.txt *.py *.pyi
+recursive-include code/wrappers/python/src *.h *.cpp *.h *.py *.pyi
+include code/wrappers/python/CMakeLists.txt
 include pyproject.toml
 include setup.py
 

README.md

@@ -4,7 +4,8 @@ A fast spreadsheet logic library.
 
 [![License](https://img.shields.io/badge/license-BSD-brightgreen.svg)](https://opensource.org/licenses/BSD-3-Clause)
 [![pypi](https://img.shields.io/pypi/v/eg.spreader)](https://pypi.org/project/eg.spreader)
-[![Python](https://img.shields.io/badge/Python-3.7-blue.svg)](https://docs.python.org/3/whatsnew/3.7.html)
+[![python](https://img.shields.io/badge/python->=3.7-blue.svg)](https://www.python.org)
+<!--https://img.shields.io/pypi/pyversions/eg.spreader -->
 
 <!-- References -->
 
@@ -17,15 +18,18 @@ It is currently in alpha stage.
 
 ## Install
 
-Spreader is a C++ library. In order to install it from source you will need 
+Spreader is a C++ library. Binary wheels are provided for common configurations on macOS and Windows.
+If you are on another platform or have an uncommon configuration `pip` will build the module from 
+source. 
+In order for a build from source to succeed you will need 
 - Working C++ compiler supporting C++20 standard
+  - Linux: GCC 11.3 or above
   - macOS: Xcode 14 or above 
   - Windows: Visual Studio 2022 or above 
-  - Linux: GCC 11.3 or above
 - On Linux you will also need Python development support (the python-dev or python3-dev package in most Linux distributions). 
 No further external dependencies are required. 
 
-You can use pip to install the module
+To install the module
 
 ```bash
 pip install eg.spreader

code

@@ -1,2 +1,3 @@
 scikit-build >= 0.16
 pytest >= 7.2
+twine >= 4

requirements.txt

@@ -7,6 +7,8 @@
 
 from skbuild import setup  
 from pathlib import Path
+import platform
+import sys
 
 mydir = Path(__file__).parent
 
@@ -33,9 +35,19 @@
 Typing :: Typed 
 """.splitlines()
 
+CMAKE_EXTRA_ARGS = []
+
+pythonType = platform.python_implementation()
+system = platform.system()
+
+#work around bug in scikit-build
+if system == 'Windows' and pythonType == 'PyPy':
+    maj, min, _ = platform.python_version_tuple()
+    CMAKE_EXTRA_ARGS += [f'-DPYTHON_LIBRARY={sys.base_prefix}/libs/python{maj}{min}.lib']
+
 setup(
     name="eg.spreader",
-    version="0.1.dev1",
+    version="0.1.0.dev1",
     description="Fast spreadsheet logic library",
     long_description=README,
     long_description_content_type="text/markdown",
@@ -52,7 +64,7 @@
     python_requires=">=3.7",
 
     cmake_source_dir="code",
-    cmake_args=[
+    cmake_args= [
         '-DSPR_PYTHON_PACKAGE_DIR=code/wrappers/python/src/eg'
-    ]
+    ] + CMAKE_EXTRA_ARGS
 )

setup.py

@@ -0,0 +1,66 @@
+#!/usr/bin/env python3
+
+import sys
+import re
+import argparse
+
+parser = argparse.ArgumentParser()
+parser.add_argument('type', choices=['release', 'nextpatch', 'nextminor', 'nextmajor'])
+parser.add_argument('--dry-run', dest='dryRun', action='store_true')
+args = parser.parse_args()
+
+
+def updateVersion(major, minor, patch, dev):
+    if args.type == 'release':
+        if not dev:
+            patch = int(patch) + 1
+        dev = None
+    elif args.type == 'nextpatch':
+        patch = int(patch) + 1
+        dev = 1
+    elif args.type == 'nextminor':
+        minor = int(minor) + 1
+        patch = 0
+        dev = 1
+    else:
+        major = int(major) + 1
+        minor = 0
+        patch = 0
+        dev = 1
+    
+    return (major, minor, patch, dev)
+
+
+lines = []
+newVersion = None
+regex = r'''(?P<prefix>\s*version=["'])(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?:\.dev(?P<dev>\d+))?(?P<suffix>["']\s*,?\s*)'''
+with open('setup.py', 'r') as setupFile:
+    for line in setupFile:
+        if newVersion is None:
+            m = re.match(regex, line)
+            if m:
+                groups = m.groupdict()
+                major = groups['major']
+                minor = groups['minor']
+                patch = groups['patch']
+                dev = groups.get('dev', None)
+                major, minor, patch, dev = updateVersion(major, minor, patch, dev)
+                if dev:
+                    newVersion = f'{major}.{minor}.{patch}.dev{dev}'
+                else:
+                    newVersion = f'{major}.{minor}.{patch}'
+
+                line = groups['prefix'] + newVersion + groups['suffix']
+                
+        lines += line
+
+if newVersion is None:
+    print("version line not found", file = sys.stderr)
+    sys.exit(1)
+
+if not args.dryRun:
+    with open('setup.py', 'w') as setupFile:
+        setupFile.writelines(lines)
+
+print(newVersion)
+