WIP meson

.github/workflows/test.yml

@@ -33,45 +33,45 @@ jobs:
       fail-fast: true
       matrix:
         include:
-          - os: macos-13
-            python: 3.7
-
-          - os: macos-13
-            python: 3.11
-            zmq: bundled
-
-          - os: macos-13
-            python: pypy-3.9
-            zmq: bundled
-
-          - os: ubuntu-20.04
-            python: 3.7
-            zmq: bundled
-            tornado: none
-
-          - os: ubuntu-22.04
-            python: pypy-3.9
-            zmq: bundled
-
-          - os: ubuntu-22.04
-            python: pypy-3.7
-
-          - os: ubuntu-22.04
-            python: 3.9
-            tornado: head
-
-          - os: ubuntu-22.04
-            python: "3.10"
-
-          - os: ubuntu-22.04
-            python: "3.11"
-
-          - os: ubuntu-22.04
-            python: "3.8"
-            zmq: head
-
-          - os: ubuntu-22.04
-            python: "3.12"
+#           - os: macos-13
+#             python: 3.7
+#
+#           - os: macos-13
+#             python: 3.11
+#             zmq: bundled
+#
+#           - os: macos-13
+#             python: pypy-3.9
+#             zmq: bundled
+#
+#           - os: ubuntu-20.04
+#             python: 3.7
+#             zmq: bundled
+#             tornado: none
+#
+#           - os: ubuntu-22.04
+#             python: pypy-3.9
+#             zmq: bundled
+#
+#           - os: ubuntu-22.04
+#             python: pypy-3.7
+#
+#           - os: ubuntu-22.04
+#             python: 3.9
+#             tornado: head
+#
+#           - os: ubuntu-22.04
+#             python: "3.10"
+#
+#           - os: ubuntu-22.04
+#             python: "3.11"
+#
+#           - os: ubuntu-22.04
+#             python: "3.8"
+#             zmq: head
+#
+#           - os: ubuntu-22.04
+#             python: "3.12"
 
           - os: windows-2022
             python: "3.7"

.github/workflows/wheels.yml

@@ -56,8 +56,6 @@ jobs:
 
       - name: build sdist
         run: |
-          python setup.py fetch_libzmq
-          python setup.py cython
           python -m build --sdist .
 
       - uses: actions/upload-artifact@v4
@@ -95,43 +93,43 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: macos-11
-            name: mac-cpython
-            cibw:
-              build: "cp*"
-
-          - os: macos-11
-            name: mac-pypy
-            cibw:
-              build: "pp*"
-
-          - os: macos-11
-            name: mac-arm
-            cibw:
-              arch: universal2
-              build: "cp*"
-
-          - name: manylinux-x86_64
-            cibw:
-              arch: x86_64
-              build: "*manylinux*"
-
-          - name: manylinux-i686
-            cibw:
-              arch: i686
-              build: "*manylinux*"
-
-          # additional manylinux variants, not specified in pyproject.toml:
-          # build with newer 2_28 for cpython >= 3.10, pypy 3.9
-          - name: manylinux-x86_64-2_28
-            cibw:
-              arch: x86_64
-              build: "cp31*-manylinux* pp39-manylinux*"
-              manylinux_x86_64_image: manylinux_2_28
-
-          - name: musllinux
-            cibw:
-              build: "*musllinux*"
+#           - os: macos-11
+#             name: mac-cpython
+#             cibw:
+#               build: "cp*"
+#
+#           - os: macos-11
+#             name: mac-pypy
+#             cibw:
+#               build: "pp*"
+#
+#           - os: macos-11
+#             name: mac-arm
+#             cibw:
+#               arch: universal2
+#               build: "cp*"
+#
+#           - name: manylinux-x86_64
+#             cibw:
+#               arch: x86_64
+#               build: "*manylinux*"
+#
+#           - name: manylinux-i686
+#             cibw:
+#               arch: i686
+#               build: "*manylinux*"
+#
+#           # additional manylinux variants, not specified in pyproject.toml:
+#           # build with newer 2_28 for cpython >= 3.10, pypy 3.9
+#           - name: manylinux-x86_64-2_28
+#             cibw:
+#               arch: x86_64
+#               build: "cp31*-manylinux* pp39-manylinux*"
+#               manylinux_x86_64_image: manylinux_2_28
+#
+#           - name: musllinux
+#             cibw:
+#               build: "*musllinux*"
 
           - name: win32
             os: windows-2019

.gitignore

@@ -2,6 +2,7 @@
 .vagrant
 *.pyc
 zmq/backend/cython/*.c
+zmq/backend/cffi/*.[co]
 zmq/devices/*.c
 zmq/utils/*.json
 zmq/include/*.h

buildutils/build_cffi.py

@@ -1,9 +1,11 @@
 import json
 import os
+import sys
 
 import cffi
 
 here = os.path.dirname(os.path.abspath(__file__))
+repo_root = os.path.dirname(here)
 zmq_dir = os.path.join(os.path.dirname(here), 'zmq')
 backend_dir = os.path.join(zmq_dir, 'backend', 'cffi')
 
@@ -19,7 +21,7 @@ def load_compiler_config():
     else:
         cfg = {}
 
-    cfg.setdefault("include_dirs", [])
+    cfg.setdefault("include_dirs", [os.path.join(zmq_dir, 'utils')])
     cfg.setdefault("library_dirs", [])
     cfg.setdefault("runtime_library_dirs", [])
     cfg.setdefault("libraries", ["zmq"])
@@ -33,7 +35,7 @@ def load_compiler_config():
         abs_paths = []
         for p in cfg[key]:
             if p.startswith('zmq'):
-                p = os.path.join(zmq_dir, p)
+                p = os.path.join(repo_root, p)
             abs_paths.append(str(p))
         cfg[key] = abs_paths
     return cfg
@@ -57,4 +59,4 @@ def load_compiler_config():
 )
 
 if __name__ == "__main__":
-    ffi.compile()
+    ffi.emit_c_code(sys.argv[1])