Merge branch 'main' into single-cython

zeromq · Aug 10, 2023 · ec3c1f5 · ec3c1f5
2 parents 8e00502 + 9bee18a
commit ec3c1f5
Show file tree

Hide file tree

Showing 12 changed files with 519 additions and 19 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -102,10 +102,11 @@ jobs:
           grep -v plugins .coveragerc > .coveragerc-save
           mv .coveragerc-save .coveragerc
 
-      - name: enable Cython coverage
-        if: "! (startsWith(matrix.python, 'pypy') || startsWith(matrix.python, '3.12'))"
-        run: |
-          echo "PYZMQ_CYTHON_COVERAGE=1" >> "$GITHUB_ENV"
+      # - name: enable Cython coverage
+      #   if: "! (startsWith(matrix.python, 'pypy') || startsWith(matrix.python, '3.12'))"
+      #   run: |
+      #     echo "PYZMQ_CYTHON_COVERAGE=1" >> "$GITHUB_ENV"
+
       # preserve pip cache to speed up installation
       - name: Cache pip
         uses: actions/cache@v3

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -22,7 +22,7 @@ concurrency:
 
 env:
   TWINE_NONINTERACTIVE: "1"
-  CIBW_PRERELEASE_PYTHONS: "1"
+#  CIBW_PRERELEASE_PYTHONS: "1"
 
 jobs:
   check-bundle:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -33,7 +33,7 @@ repos:
         exclude: zmq/tests/test_imports.py
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+    rev: 6.1.0
     hooks:
       - id: flake8
         exclude: ^buildutils/templates/
@@ -50,7 +50,7 @@ repos:
         additional_dependencies:
           - types-paramiko
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.8.0
+    rev: v3.10.1
     hooks:
       - id: pyupgrade
         args:
@@ -67,7 +67,7 @@ repos:
         name: isort (pyi)
         types: [pyi]
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 23.7.0
     hooks:
       - id: black
         # don't run black twice on constants.py

diff --git a/buildutils/bundle.py b/buildutils/bundle.py
@@ -199,6 +199,8 @@ def stage_platform_hpp(zmqroot):
                 platform_dir = pjoin(HERE, 'include_freebsd')
             elif sys.platform.startswith('linux-armv'):
                 platform_dir = pjoin(HERE, 'include_linux-armv')
+            elif sys.platform.startswith('sunos'):
+                platform_dir = pjoin(HERE, 'include_sunos')
             else:
                 # check for musl (alpine)
                 from packaging import tags