Version 0.0.6

- Python packaging improvements to avoid deprecation warnings

Author: jerstlouis

.github/workflows/wheels.yml

@@ -12,7 +12,7 @@ jobs:
         # os: [ubuntu-latest]
         # os: [windows-2019] #latest]
         # os: [macos-13] # macos-latest]
-        os: [ubuntu-latest, windows-2022, ubuntu-24.04-arm, macos-13, macos-latest]
+        os: [ubuntu-latest, windows-2022, ubuntu-24.04-arm, macos-15-intel, macos-latest]
 
     steps:
       - uses: actions/checkout@v4
@@ -21,7 +21,7 @@ jobs:
         if: runner.os == 'macOS'
         uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
+          python-version: '3.11'
 
       # Apply patch only on Windows
       - name: Apply header patch on Windows
@@ -30,27 +30,30 @@ jobs:
           # Patch MinGW-w64 header files currently causing troubles for eC compiler (C99 .namedmembers assignments in AVX files, and re-defnitions of function type typedef in winbase.h)
           #git apply --directory=mingw64 '${{ github.workspace }}\patches\mingw64-gcc-12.2.0-patches.patch'
           cd C:\
-          copy ${{ github.workspace }}\patches\lib\gcc\x86_64-w64-mingw32\12.2.0\include\avx512fp16intrin.h C:\mingw64\lib\gcc\x86_64-w64-mingw32\12.2.0\include\avx512fp16intrin.h
-          copy ${{ github.workspace }}\patches\lib\gcc\x86_64-w64-mingw32\12.2.0\include\avx512fp16vlintrin.h C:\mingw64\lib\gcc\x86_64-w64-mingw32\12.2.0\include\avx512fp16vlintrin.h
+          copy ${{ github.workspace }}\patches\lib\gcc\x86_64-w64-mingw32\12.2.0\include\avx512fp16intrin.h C:\mingw64\lib\gcc\x86_64-w64-mingw32\14.2.0\include\avx512fp16intrin.h
+          copy ${{ github.workspace }}\patches\lib\gcc\x86_64-w64-mingw32\12.2.0\include\avx512fp16vlintrin.h C:\mingw64\lib\gcc\x86_64-w64-mingw32\14.2.0\include\avx512fp16vlintrin.h
           copy ${{ github.workspace }}\patches\x86_64-w64-mingw32\include\winbase.h C:\mingw64\x86_64-w64-mingw32\include\winbase.h
 
       # Used to host cibuildwheel
       - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
 
       - name: Initialize submodules
         run: git submodule update --init --recursive
 
       - name: Install cibuildwheel
-        run: python3 -m pip install cibuildwheel==2.23.3
+        run: |
+           set CFLAGS=-D__AVX512BF16__=0
+           python3 -m pip install cibuildwheel==2.23.3
 
       - name: Build wheels
         run: python3 -m cibuildwheel --output-dir wheelhouse
         env:
+            CIBW_ENABLE: "pypy"
             # Windows PyPy 3.8 build is currently failing due to https://github.com/python-cffi/cffi/issues/170
             # 32-bit builds on Windows are not supported because the MinGW-w64 does not have multilib enabled
-            # musllinux builds do not currently work
-            # There seems to be setuptools-related issues with 3.6 and 3.7 CPython builds
-            CIBW_SKIP: "cp36-* cp37-* *-win32 pp*-win*"
+            CIBW_SKIP: "*-win32 pp*-win*"
             # This ensures WIN_SHELL_COMMANDS does not get defined on Windows in crossplatform.mk, which breaks deep directory creations
             # since commands are executed in a UNIX-like shell expecting 'mkdir -p'
             CIBW_ENVIRONMENT: "MSYSCON=y"

MANIFEST.in

@@ -7,4 +7,5 @@ recursive-exclude eC .git**
 recursive-exclude eC */__pycache__
 recursive-exclude eC bindings/py/_pyecrt.c
 include setup.py
+include pyproject.toml
 include README.md

eC

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools", "wheel", "cffi>=1.0.0", "importlib_metadata; python_version<'3.8'"]
+build-backend = "setuptools.build_meta"

pyproject.toml

@@ -1,6 +1,9 @@
 from setuptools import setup, Extension
 import multiprocessing
-from setuptools.command.build import build
+try:
+    from setuptools.command.build import build # Python 3.7+
+except ImportError:
+    from distutils.command.build import build  # Fallback for older Python (<3.7)
 from setuptools.command.egg_info import egg_info
 import subprocess
 import os
@@ -12,7 +15,12 @@
 import distutils.ccompiler
 from distutils.command.build_ext import build_ext
 
-pkg_version = '0.0.5'
+# Work around for CPython 3.6 on Windows
+if sys.platform.startswith("win") and sys.version_info[:2] == (3, 6):
+   import distutils.cygwinccompiler
+   distutils.cygwinccompiler.get_msvcr = lambda: [] # ["msvcr140"] -- we're building with MinGW-w64
+
+pkg_version = '0.0.6'
 
 env = os.environ.copy()
 
@@ -98,9 +106,9 @@ def check_i686_w64_available():
    long_description = f.read()
 
 cpu_count = multiprocessing.cpu_count()
-eC_dir = os.path.join(os.path.dirname(__file__), 'eC')
-eC_c_dir = os.path.join(os.path.dirname(__file__), 'eC', 'bindings', 'c')
-eC_py_dir = os.path.join(os.path.dirname(__file__), 'eC', 'bindings', 'py')
+eC_dir = os.path.join(rwd, 'eC')
+eC_c_dir = os.path.join(rwd, 'eC', 'bindings', 'c')
+eC_py_dir = os.path.join(rwd, 'eC', 'bindings', 'py')
 platform = 'win32' if sys.platform.startswith('win') else ('apple' if sys.platform.startswith('darwin') else 'linux')
 dll_prefix = '' if platform == 'win32' else 'lib'
 dll_dir = 'bin' if platform == 'win32' else 'lib'
@@ -185,7 +193,8 @@ def run(self):
     name='ecrt',
     version=pkg_version,
     cffi_modules=cffi_modules,
-    setup_requires=['cffi >= 1.0.0'],
+    # setup_requires is deprecated -- build dependencies must now be specified in pyproject.toml
+    # setup_requires=['cffi >= 1.0.0'],
     install_requires=['cffi >= 1.0.0'],
     packages=packages,
     package_dir=package_dir,