build updates (#71)

- allow building on aarch64
- add python-3.11 wheel builds
- upgrade action versions in build workflow

Author: escherba

.github/workflows/publish.yml

@@ -24,15 +24,17 @@ jobs:
           python-version: '3.9'
       - name: Set up QEMU
         if: runner.os == 'Linux'
-        uses: docker/setup-qemu-action@v1.0.1
+        # uses: docker/setup-qemu-action@v1.0.1
+        uses: docker/setup-qemu-action@v1.2.0
         with:
           platforms: arm64
       - name: Build wheels
-        uses: joerick/cibuildwheel@v1.9.0
+        # uses: joerick/cibuildwheel@v1.9.0
+        uses: pypa/cibuildwheel@v2.9.0
         with:
           output-dir: wheelhouse
         env:
-          CIBW_BUILD: '{cp36,cp37,cp38,cp39,cp310}-{manylinux_x86_64,manylinux_aarch64,win32,win_amd64,macosx_x86_64} {cp39,cp310}-macosx_arm64'
+          CIBW_BUILD: '{cp36,cp37,cp38,cp39,cp310,cp311}-{manylinux_x86_64,manylinux_aarch64,win32,win_amd64,macosx_x86_64} {cp39,cp310,cp311}-macosx_arm64'
           CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014
           CIBW_ARCHS_LINUX: 'auto aarch64'
           CIBW_ARCHS_MACOS: 'auto arm64'

pip-freeze.txt

@@ -1,6 +1,6 @@
-attrs==21.4.0
+attrs==22.1.0
 backcall==0.2.0
-Cython==0.29.28
+Cython==0.29.32
 decorator==5.1.1
 importlib-metadata==4.8.3
 iniconfig==1.1.1
@@ -13,14 +13,13 @@ packaging==21.3
 parso==0.7.1
 pexpect==4.8.0
 pickleshare==0.7.5
-pkg_resources==0.0.0
 pluggy==1.0.0
-prompt-toolkit==3.0.28
+prompt-toolkit==3.0.31
 ptyprocess==0.7.0
 py==1.11.0
 py-cpuinfo==8.0.0
-Pygments==2.11.2
-pyparsing==3.0.7
+Pygments==2.13.0
+pyparsing==3.0.9
 pytest==7.0.1
 six==1.16.0
 toml==0.10.2

python.mk

@@ -57,7 +57,6 @@ $(EXTENSION_OBJS): $(BUILD_STAMP)
 .PHONY: test
 test: build  ## run Python unit tests
 	$(PYENV) pytest
-	$(PYTHON) -m doctest README.md && echo "$(BOLD)doctests passed$(END)"
 
 .PHONY: nuke
 nuke: clean  ## clean and remove virtual environment
@@ -76,7 +75,7 @@ clean:  ## remove temporary files
 
 .PHONY: install
 install:  $(BUILD_STAMP)  ## install package
-	$(PIP) install -e --force-reinstall .
+	$(PIP) install -e .
 
 .PRECIOUS: $(ENV_STAMP)
 .PHONY: env

setup.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-import struct
 import os
-from os.path import join, dirname
+import platform
+import struct
 
 from setuptools import setup
 from setuptools.dist import Distribution
@@ -62,26 +62,27 @@ def get_system_bits():
         ]
     )
 
-# The "cibuildwheel" tool sets the variable below to
-# something like x86_64, aarch64, i686, and so on.
-TARGET_ARCH = os.environ.get("AUDITWHEEL_ARCH")
+# The "cibuildwheel" tool sets AUDITWHEEL_ARCH variable to architecture strings
+# such as 'x86_64', 'aarch64', 'i686', etc.  If this variable is not set, we
+# assume that the build is not a CI build and target current machine
+# architecture.
+TARGET_ARCH = os.environ.get("AUDITWHEEL_ARCH", platform.machine())
+print("building for target architecture:", TARGET_ARCH)
 
-if HAVE_SSE42 and (TARGET_ARCH in [None, "x86_64"]) and (BITS == 64):
+if HAVE_SSE42 and (TARGET_ARCH == "x86_64") and (BITS == 64):
     print("enabling SSE4.2 on compile")
     if SYSTEM == "nt":
         CXXFLAGS.append("/D__SSE4_2__")
     else:
         CXXFLAGS.append("-msse4.2")
 
-
-if HAVE_AES and (TARGET_ARCH in [None, "x86_64"]) and (BITS == 64):
+if HAVE_AES and (TARGET_ARCH == "x86_64") and (BITS == 64):
     print("enabling AES on compile")
     if SYSTEM == "nt":
         CXXFLAGS.append("/D__AES__")
     else:
         CXXFLAGS.append("-maes")
 
-
 if USE_CYTHON:
     print("building extension using Cython")
     CMDCLASS = {"build_ext": build_ext}
@@ -91,7 +92,6 @@ def get_system_bits():
     CMDCLASS = {}
     SRC_EXT = ".cpp"
 
-
 EXT_MODULES = [
     Extension(
         "cityhash",
@@ -111,7 +111,7 @@ def get_system_bits():
     ),
 ]
 
-if HAVE_SSE42 and (TARGET_ARCH in [None, "x86_64"]) and (BITS == 64):
+if HAVE_SSE42 and (TARGET_ARCH == "x86_64") and (BITS == 64):
     EXT_MODULES.append(
         Extension(
             "cityhashcrc",
@@ -127,15 +127,15 @@ def get_system_bits():
     )
 
 
-VERSION = "0.4.1"
+VERSION = "0.4.2"
 URL = "https://github.com/escherba/python-cityhash"
 
 
 def get_long_description(relpath, encoding="utf-8"):
     _long_desc = """
 
     """
-    fname = join(dirname(__file__), relpath)
+    fname = os.path.join(os.path.dirname(__file__), relpath)
     try:
         with open(fname, "rb") as fh:
             return fh.read().decode(encoding)