Merge pull request #44 from adrientetar/modernize-build-and-add-win-arm64

Modernize build system and add Windows ARM64 wheel support

Author: anthrotype

.github/workflows/wheels.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   build_wheels:
-    name: Build wheel ${{ matrix.os }}
+    name: Build wheel ${{ matrix.os }} (${{ matrix.arch }})
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -24,6 +24,8 @@ jobs:
             arch: universal2
           - os: ubuntu-24.04-arm
             arch: aarch64
+          - os: windows-latest
+            arch: ARM64
     env:
       CIBW_ARCHS: ${{ matrix.arch }}
       # Skip

pyproject.toml

@@ -4,6 +4,8 @@ requires = [
     "setuptools<72.2.0; platform_python_implementation == 'PyPy'",
     "setuptools; platform_python_implementation != 'PyPy'",
     "wheel",
+    "packaging",
+    "setuptools_scm",
     "cython >= 0.28.5",
 ]
 build-backend = "setuptools.build_meta"

setup.py

@@ -4,15 +4,10 @@
 from distutils import log
 import os
 import sys
-import pkg_resources
-from io import open
+from importlib.metadata import version as get_version, PackageNotFoundError
+from packaging.version import Version
 import re
 
-
-argv = sys.argv[1:]
-needs_wheel = {"bdist_wheel"}.intersection(argv)
-wheel = ["wheel"] if needs_wheel else []
-
 # check if minimum required Cython is available
 cython_version_re = re.compile(r'\s*"cython\s*>=\s*([0-9][0-9\w\.]*)\s*"')
 with open("pyproject.toml", "r", encoding="utf-8") as fp:
@@ -23,13 +18,11 @@
             break
     else:
         sys.exit("error: could not parse cython version from pyproject.toml")
+required_cython = "cython >= %s" % cython_min_version
 try:
-    required_cython = "cython >= %s" % cython_min_version
-    pkg_resources.require(required_cython)
-except pkg_resources.ResolutionError:
+    with_cython = Version(get_version("cython")) >= Version(cython_min_version)
+except PackageNotFoundError:
     with_cython = False
-else:
-    with_cython = True
 
 
 class cython_build_ext(_build_ext):
@@ -91,19 +84,11 @@ def run(self):
         _sdist.run(self)
 
 
-# need to include this for Visual Studio 2008 doesn't have stdint.h
-include_dirs = (
-    [os.path.join(os.path.dirname(__file__), "vendor", "msinttypes")]
-    if os.name == "nt" and sys.version_info < (3,)
-    else []
-)
-
 cython_modules = ["parser", "util", "writer", "_test"]
 extensions = [
     Extension(
         "openstep_plist." + mod,
         sources=["src/openstep_plist/%s.pyx" % mod],
-        include_dirs=include_dirs,
         language="c++",
         extra_compile_args=["-std=c++11"] if sys.platform != "win32" else [],
     )
@@ -130,7 +115,6 @@ def run(self):
     include_package_data=True,
     exclude_package_data={"": ["*.cpp"]},
     ext_modules=extensions,
-    setup_requires=["setuptools_scm"] + wheel,
     python_requires=">=3.8",
     cmdclass={"build_ext": cython_build_ext, "sdist": cython_sdist},
     zip_safe=False,

src/openstep_plist/util.pyx

@@ -1,16 +1,12 @@
 #cython: language_level=3
 #distutils: define_macros=CYTHON_TRACE_NOGIL=1
 
-from cpython.version cimport PY_MAJOR_VERSION
 from libc.stdint cimport uint16_t, uint32_t
-import sys
 
 
 cdef inline unicode tounicode(s, encoding="ascii", errors="strict"):
     if type(s) is unicode:
         return <unicode>s
-    elif PY_MAJOR_VERSION < 3 and isinstance(s, bytes):
-        return (<bytes>s).decode(encoding, errors=errors)
     elif isinstance(s, unicode):
         return unicode(s)
     else:
@@ -19,9 +15,9 @@ cdef inline unicode tounicode(s, encoding="ascii", errors="strict"):
 
 cdef inline object tostr(s, encoding="ascii", errors="strict"):
     if isinstance(s, bytes):
-        return s if PY_MAJOR_VERSION < 3 else s.decode(encoding, errors=errors)
+        return s.decode(encoding, errors=errors)
     elif isinstance(s, unicode):
-        return s.encode(encoding, errors=errors) if PY_MAJOR_VERSION < 3 else s
+        return s
     else:
         raise TypeError(f"Could not convert to str: {s!r}")