Build and upload binary wheels in CI

.github/workflows/pythonpackage.yml

@@ -6,45 +6,20 @@ jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
-      max-parallel: 4
+      fail-fast: false
       matrix:
-        python-version: ['3.7', '3.9', '3.10', '3.11']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r requirements.txt
+        python -m pip install pytest
+        python -m pip install .
     - name: Test
       run: |
-        python setup.py build_ext -b .
-        python -m unittest
-
-  release:
-    needs: [test]
-    runs-on: ubuntu-20.04
-    if: startsWith(github.ref, 'refs/tags')
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v1
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.9
-    - name: Install pypa/build
-      run: |
-        python -m pip install build --user
-    - name: Build a binary wheel and a source tarball
-      run: |
-        git clean -dfx
-        python -m build --sdist --outdir dist/ .
-    - name: Publish distribution 📦 to PyPI
-      uses: pypa/gh-action-pypi-publish@master
-      with:
-        skip_existing: true
-        password: ${{ secrets.pypi_password }}
+        python -m pytest -v --assert=plain ./tests

.github/workflows/release.yml

@@ -0,0 +1,64 @@
+name: Build & Release
+
+on:
+  release:
+    types: [ published ]
+
+jobs:
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v4
+
+      # Used to host cibuildwheel
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - name: Install cibuildwheel
+        run: python -m pip install cibuildwheel
+
+      - name: Build wheels
+        run: python -m cibuildwheel --output-dir wheelhouse
+
+      - uses: actions/upload-artifact@v3
+        with:
+          path: ./wheelhouse/*.whl
+
+  build_sdist:
+    name: Build source distribution
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - name: Build sdist
+        run: pipx run build --sdist
+
+      - uses: actions/upload-artifact@v3
+        with:
+          path: dist/*.tar.gz
+
+  release:
+    name: Publish distribution 📦 to PyPI
+    needs: [build_wheels, build_sdist]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: artifact
+          path: dist
+
+      - uses: pypa/gh-action-pypi-publish@master
+        with:
+          skip_existing: true
+          password: ${{ secrets.pypi_password }}

MANIFEST.in

@@ -1,7 +1,7 @@
 include LICENSE
 include Makefile
-include bitstruct/c.c
-include bitstruct/bitstream.[hc]
+include src/bitstruct/c.c
+include src/bitstruct/bitstream.[hc]
 recursive-include docs *.bat
 recursive-include docs *.py
 recursive-include docs *.rst

Makefile

@@ -1,3 +1,3 @@
 test:
-	python3 setup.py build_ext -b .
+	python3 -m pip install -e .
 	python3 -m unittest

pyproject.toml

@@ -0,0 +1,55 @@
+[build-system]
+build-backend = 'setuptools.build_meta'
+requires = ["setuptools >= 68.0"]
+
+[project]
+name = "bitstruct"
+description = """This module performs conversions between Python values \
+and C bit field structs represented as Python \
+byte strings."""
+readme = "README.rst"
+requires-python = ">=3.7"
+license = { text = "MIT" }
+keywords = [
+  "bit field",
+  "bit parsing",
+  "bit unpack",
+  "bit pack",
+]
+authors = [
+    { name = "Erik Moqvist", email = "[email protected]" },
+    { name = "Ilya Petukhov" },
+]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: Implementation :: CPython",
+]
+dependencies = []
+dynamic = ["version"]
+
+[project.urls]
+Documentation = "https://bitstruct.readthedocs.io/en/latest/"
+Issues = "https://github.com/eerimoq/bitstruct/issues"
+Source = "https://github.com/eerimoq/bitstruct"
+Homepage = "https://github.com/eerimoq/bitstruct"
+
+[tool.setuptools.packages.find]
+where = ["src"]
+
+[tool.setuptools.dynamic]
+version = {attr = "bitstruct.__version__"}
+
+[tool.setuptools.package-data]
+"*" = [
+  "**/py.typed",
+  "**.pyi",
+]
+
+[tool.cibuildwheel]
+test-requires = "pytest"
+test-command = "pytest  -v --assert=plain {project}/tests"
+build-frontend = "build"
+skip = "pp*"

setup.py

@@ -1,61 +1,19 @@
 #!/usr/bin/env python
-
-import sys
-import re
-import setuptools
 import platform
-from setuptools import find_packages
-
-
-def find_version():
-    return re.search(r"^__version__ = '(.*)'$",
-                     open('bitstruct/version.py', 'r').read(),
-                     re.MULTILINE).group(1)
-
 
-def is_cpython_3():
-    if platform.python_implementation() != 'CPython':
-        return False
-
-    if sys.version_info[0] < 3:
-        return False
-
-    return True
+import setuptools
 
+if platform.python_implementation() == "CPython":
+    ext_modules = [
+        setuptools.Extension(
+            "bitstruct.c",
+            sources=[
+                "src/bitstruct/c.c",
+                "src/bitstruct/bitstream.c",
+            ],
+        )
+    ]
 
-def setup(ext_modules):
     setuptools.setup(
-        name='bitstruct',
-        version=find_version(),
-        description=('This module performs conversions between Python values '
-                     'and C bit field structs represented as Python '
-                     'byte strings.'),
-        long_description=open('README.rst', 'r').read(),
-        author='Erik Moqvist, Ilya Petukhov',
-        author_email='[email protected]',
-        license='MIT',
-        classifiers=[
-            'License :: OSI Approved :: MIT License',
-            'Programming Language :: Python :: 2',
-            'Programming Language :: Python :: 3',
-        ],
-        keywords=['bit field', 'bit parsing', 'bit unpack', 'bit pack'],
-        url='https://github.com/eerimoq/bitstruct',
-        packages=find_packages(exclude=['tests']),
         ext_modules=ext_modules,
-        test_suite="tests")
-
-
-if is_cpython_3():
-    try:
-        setup([setuptools.Extension('bitstruct.c',
-                                    sources=[
-                                        'bitstruct/c.c',
-                                        'bitstruct/bitstream.c'
-                                    ])])
-    except:
-        print('WARNING: Failed to build the C extension.')
-        setup([])
-else:
-    print('INFO: C extension only implemented in CPython 3.')
-    setup([])
+    )