CI wheels config

mideind · Aug 28, 2024 · 60ee25d · 60ee25d
1 parent 54774f5
commit 60ee25d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-12, ubuntu-latest, windows-latest]
+        os: [macos-12, ubuntu-latest, windows-2019]
 
     steps:
       # Check out repository using git-lfs
@@ -32,7 +32,8 @@ jobs:
         # Options (https://cibuildwheel.readthedocs.io/en/stable/options/)
         env:
           CIBW_SKIP: cp36-* cp37-* cp38-* *pp37-* pp38-* *musllinux*
-          CIBW_BEFORE_ALL: python3 -m pip install --upgrade pip wheel distutils setuptools cffi packaging
+          CIBW_BEFORE_BUILD_MACOS: python3 -m pip install --upgrade pip wheel setuptools cffi packaging
+          CIBW_BEFORE_BUILD_WINDOWS: python3 -m pip install --upgrade pip wheel setuptools cffi packaging
           CIBW_ARCHS_MACOS: "x86_64 arm64"
           CIBW_ARCHS_WINDOWS: "AMD64"
           CIBW_ARCHS_LINUX: "x86_64"

diff --git a/pyproject.toml b/pyproject.toml
@@ -31,7 +31,7 @@ classifiers = [
 ]
 keywords = ["nlp", "trigram", "ngram", "trigrams", "ngrams", "icelandic"]
 requires-python = ">=3.9"
-dependencies = ["cffi>=1.15.1"]
+dependencies = ["cffi>=1.15.1", "setuptools", "wheel"]
 
 [project.urls]
 Repository = "https://github.com/mideind/Icegrams"

diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@
     package_data={"icegrams": ["py.typed"]},
     include_package_data=True,
     zip_safe=False,
-    setup_requires=["cffi>=1.15.1"],
-    install_requires=["cffi>=1.15.1"],
+    setup_requires=["cffi>=1.15.1", "setuptools"],
+    install_requires=["cffi>=1.15.1", "setuptools"],
     cffi_modules=["src/icegrams/trie_build.py:ffibuilder"],
 )
diff --git a/src/icegrams/trie_build.py b/src/icegrams/trie_build.py
@@ -101,7 +101,7 @@
 elif MACOS:
     os.environ["CFLAGS"] = "-stdlib=libc++"  # Fixes PyPy build on macOS 10.15.6+
     os.environ["MACOSX_DEPLOYMENT_TARGET"] = "10.9"
-    extra_compile_args = ["-mmacosx-version-min=10.7", "-stdlib=libc++"]
+    extra_compile_args = ["-mmacosx-version-min=10.9", "-stdlib=libc++"]
 else:
     # Adding -O3 to the compiler arguments doesn't seem to make
     # any discernible difference in lookup speed