Use vendoring as the distribution method

.github/workflows/build.yml

@@ -1,102 +1,59 @@
-name: Build Wheels
+name: Build
 
 on:
-    push:
-        tags:
-            - v*
-        branches:
-            - master
-        paths:
-            - 'src/**'
-    pull_request:
-        branches:
-            - master
-        paths:
-            - '.github/workflows/build.yml'
+  push:
+    tags:
+      - v*
+    branches:
+      - master
+    paths:
+      - 'src/**'
+  pull_request:
+    branches:
+      - master
 
 concurrency:
-    group: build-${{ github.head_ref }}
-    cancel-in-progress: true
-
-env:
-    CIBW_BUILD: cp3{9,10,11,12,13}-*
-    PYAWAITABLE_OPTIMIZED: 1
+  group: build-${{ github.head_ref }}
+  cancel-in-progress: true
 
 jobs:
-    binary-wheels-standard:
-        name: Binary wheels for ${{ startsWith(matrix.os, 'macos-') && 'macOS' || startsWith(matrix.os, 'windows-') && 'Windows' || 'Linux' }}
-        runs-on: ${{ matrix.os }}
-        strategy:
-            fail-fast: false
-            matrix:
-                os: [ubuntu-latest, windows-latest, macos-latest]
-
-        steps:
-            - uses: actions/checkout@v2
-              with:
-                  # Fetch all tags
-                  fetch-depth: 0
-
-            - name: Build wheels
-              uses: pypa/[email protected]
-              env:
-                  CIBW_ARCHS_MACOS: x86_64
-                  HATCH_BUILD_HOOKS_ENABLE: "true"
-
-            - uses: actions/upload-artifact@v4
-              with:
-                  name: artifacts
-                  path: wheelhouse/*.whl
-                  if-no-files-found: error
-
-    binary-wheels-arm:
-        name: Build Linux wheels for ARM
-        runs-on: ubuntu-latest
-        if: >
-            github.event_name == 'push'
-            &&
-            (github.ref == 'refs/heads/master' || startsWith(github.event.ref, 'refs/tags'))
-
-        steps:
-            - uses: actions/checkout@v2
-              with:
-                  # Fetch all tags
-                  fetch-depth: 0
-
-            - name: Set up QEMU
-              uses: docker/setup-qemu-action@v1
-              with:
-                  platforms: arm64
-
-            - name: Build wheels
-              uses: pypa/[email protected]
-              env:
-                  CIBW_ARCHS_LINUX: aarch64
-                  HATCH_BUILD_HOOKS_ENABLE: "true"
-
-            - uses: actions/upload-artifact@v4
-              with:
-                  name: artifacts
-                  path: wheelhouse/*.whl
-                  if-no-files-found: error
-
-    publish:
-        name: Publish release
-        needs:
-            - binary-wheels-standard
-            - binary-wheels-arm
-        runs-on: ubuntu-latest
-        if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
-
-        steps:
-            - uses: actions/download-artifact@v3
-              with:
-                  name: artifacts
-                  path: dist
-
-            - name: Push build artifacts to PyPI
-              uses: pypa/[email protected]
-              with:
-                  skip_existing: true
-                  user: __token__
-                  password: ${{ secrets.PYPI_API_TOKEN }}
+  pure-python-wheel-and-sdist:
+    name: Build a pure Python wheel and source distribution
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Install build dependencies
+        run: python -m pip install --upgrade build
+
+      - name: Build
+        run: python -m build
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: artifacts
+          path: dist/*
+          if-no-files-found: error
+
+  publish:
+    name: Publish release
+    needs:
+      - pure-python-wheel-and-sdist
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
+
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: artifacts
+          path: dist
+
+      - name: Push build artifacts to PyPI
+        uses: pypa/[email protected]
+        with:
+          skip_existing: true
+          user: __token__
+          password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/tests.yml

@@ -5,10 +5,8 @@ on:
     branches:
       - master
   pull_request:
-    types:
-      - "opened"
-      - "reopened"
-      - "synchronize"
+    branches:
+      - master
 
 concurrency:
   group: test-${{ github.head_ref }}
@@ -35,8 +33,6 @@ jobs:
           filters: |
             source:
               - 'src/**'
-            csource:
-              - 'src/_pyawaitable/**'
 
   run-tests:
     needs: changes
@@ -56,82 +52,14 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install Pytest
-        run: pip install pytest pytest-asyncio typing_extensions
-
       - name: Build PyAwaitable
-        run: pip install .
+        run: pip install . --verbose
 
       - name: Build PyAwaitable Test Package
-        run: pip install setuptools wheel && pip install ./tests/extension/ --no-build-isolation
+        run: pip install ./tests --verbose
 
       - name: Run tests
-        run: pytest -W error
-
-  memory-errors:
-    needs:
-      - changes
-      - run-tests
-    if: ${{ needs.changes.outputs.csource == 'true' }}
-    name: Check for memory errors
-    runs-on: ubuntu-latest
-    env:
-      PYTHONMALLOC: malloc
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Python 3.12
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.12
-
-      - name: Install Pytest
-        run: |
-            pip install pytest pytest-asyncio pytest-memray typing_extensions
-        shell: bash
-
-      - name: Build PyAwaitable
-        run: pip install .
-
-      - name: Build PyAwaitable Test Package
-        run: pip install setuptools wheel && pip install tests/extension/ --no-build-isolation
-
-      - name: Install Valgrind
-        run: sudo apt-get update && sudo apt-get -y install valgrind
-
-      - name: Run tests with Valgrind
-        run: valgrind --suppressions=valgrind-python.supp --error-exitcode=1 pytest -x
-
-  memory-leaks:
-    needs:
-      - changes
-      - memory-errors
-    if: ${{ needs.changes.outputs.csource == 'true' }}
-    name: Check for memory leaks
-    runs-on: ubuntu-latest
-    env:
-      PYTHONMALLOC: malloc
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Python 3.12
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.12
-
-      - name: Install Pytest
-        run: |
-            pip install pytest pytest-asyncio pytest-memray typing_extensions
-        shell: bash
-
-      - name: Build PyAwaitable
-        run: pip install .
-
-      - name: Build PyAwaitable Test Package
-        run: pip install setuptools wheel && pip install tests/extension/ --no-build-isolation
-
-      - name: Run tests with Memray tracking
-        run: pytest --enable-leak-tracking -W error --stacks=50 --native
+        run: python -W error -m unittest tests/main.py --verbose
 
   tests-pass:
     runs-on: ubuntu-latest
@@ -140,12 +68,10 @@ jobs:
 
     needs:
       - run-tests
-      - memory-errors
-      - memory-leaks
 
     steps:
       - name: Check whether all tests passed
         uses: re-actors/alls-green@release/v1
         with:
           jobs: ${{ toJSON(needs) }}
-          allowed-skips: ${{ toJSON(needs) }}
+          allowed-skips: ${{ toJSON(needs) }}

.gitignore

@@ -6,8 +6,10 @@ __pycache__/
 *.egg-info
 test/
 dist/
-pyawaitable-vendor/
 *.so
+src/pyawaitable/pyawaitable.h
+pcbuild/
+*.o
 
 # LSP
 compile_flags.txt
@@ -17,6 +19,7 @@ build/
 *.sln
 *.user
 *.vcxproj*
+.clang-format
 
 # Misc
 test.py

CHANGELOG.md

@@ -1,9 +1,16 @@
 # Changelog
 
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## Unreleased
+
+- Moved away from function pointer tables for loading PyAwaitable--everything is now vendored upon installation.
+- Improved performance with compiler optimizations.
+- `PyAwaitable_` prefixes are now required, and the old `pyawaitable_*` functions have been removed.
+- The warning emitted when a PyAwaitable object is not awaited is now a `ResourceWarning` (was a `RuntimeWarning`).
+- `PyAwaitable_AddAwait` now raises a `ValueError` if the passed object is `NULL` or self, and also now raises a `TypeError` if the passed object is not a coroutine.
+- **Breaking Change:** `PyAwaitable_Init` no longer takes a module object.
+- **Breaking Change:** Renamed `awaitcallback` to `PyAwaitable_Callback`
+- **Breaking Change:** Renamed `awaitcallback_err` to `PyAwaitable_Error`
+- **Breaking Change:** Renamed `defercallback` to `PyAwaitable_Defer`
 
 ## [1.4.0] - 2025-02-09
 

CONTRIBUTING.md

@@ -48,20 +48,8 @@ It's highly recommended to do this inside of a [virtual environment](https://doc
 
 ## Running Tests
 
-PyAwaitable uses three libraries for unit testing:
-
--   [pytest](https://docs.pytest.org/en/8.2.x/), as the general testing framework.
--   [pytest-asyncio](https://pytest-asyncio.readthedocs.io/en/latest/), for asynchronous tests.
--   [pytest-memray](https://pytest-memray.readthedocs.io/en/latest/), for detection of memory leaks. Note this isn't available for Windows, so simply omit this in your installation.
-
-Installation is trivial:
-
-```
-$ pip install pytest pytest-asyncio pytest-memray
-```
-
-Tests generally access the PyAwaitable API functions using [ctypes](https://docs.python.org/3/library/ctypes.html), but there's also an extension module solely built for tests called `_pyawaitable_test`. You can install this with the following command:
+PyAwaitable uses [Hatch](https://hatch.pypa.io), so that will handle everything for you:
 
 ```
-$ pip install setuptools wheel && pip install ./test/extension/ --no-build-isolation
+$ hatch test
 ```