✨ initial Chimera support (and upgrade to Hyperscan v5.4.0)

Closes #32

.dockerignore

@@ -0,0 +1,7 @@
+.git
+.github
+.pytest_cache
+.venv
+.vscode
+build
+dist

.envrc

@@ -0,0 +1 @@
+export PCRE_PATH=../hyperscan/pcre-8.44/.libs

.github/workflows/main.yml

@@ -30,6 +30,7 @@ jobs:
           - cp37-cp37m
           - cp38-cp38
           - cp39-cp39
+          - cp310-cp310
     env:
       PYTHON_VERSION: ${{ matrix.python-version }}
     steps:

.gitignore

@@ -1,9 +1,9 @@
-setup.py
 .pytest_cache/
+.vscode/
 *.whl
 examples/hsbench-samples
-
-.vscode/
+poetry.lock
+setup.py
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

Dockerfile

@@ -0,0 +1,7 @@
+FROM darvid/manylinux-hyperscan:5.4.0
+ENV PCRE_PATH=/opt/pcre/.libs
+RUN python3.9 -m pip install poetry
+RUN mkdir /src
+WORKDIR /src
+COPY . .
+RUN python3.9 -m poetry install -vvv

build.py

@@ -1,38 +1,46 @@
+import glob
 import os
 import subprocess
-import sys
 from distutils.command.build_ext import build_ext
 from distutils.core import Extension
-from distutils.errors import (
-    CCompilerError,
-    DistutilsExecError,
-    DistutilsPlatformError,
-)
+
+pcre_path = os.getenv("PCRE_PATH", "/opt/pcre")
 
 
 # http://code.activestate.com/recipes/502261-python-distutils-pkg-config/
-def pkgconfig(libs, optional=''):
+def pkgconfig(libs, optional=""):
     flag_map = {
-        'include_dirs': (['--cflags-only-I'], 2),
-        'library_dirs': (['--libs-only-L'], 2),
-        'libraries': (['--libs-only-l'], 2),
-        'extra_compile_args': (['--cflags-only-other'], 0),
-        'extra_link_args': (['--libs-only-other'], 0),
+        "include_dirs": (["--cflags-only-I"], 2, []),
+        "library_dirs": (["--libs-only-L"], 2, []),
+        "libraries": (["--libs-only-l"], 2, []),
+        "extra_compile_args": (["--cflags-only-other"], 0, ["-O0"]),
+        "extra_link_args": (
+            ["--libs-only-other"],
+            0,
+            [
+                # f"-Wl,-rpath={pcre_path}",
+                # "-l:libpcre.so",
+            ],
+        ),
     }
-    ext_kwargs = {'extra_compile_args': ['-std=c99']}
+    ext_kwargs = {"extra_compile_args": ["-fPIC"]}
     for lib in libs:
-        for distutils_kwarg, (pkg_options, trim_offset) in flag_map.items():
+        for distutils_kwarg, (
+            pkg_options,
+            trim_offset,
+            default_value,
+        ) in flag_map.items():
             try:
                 options = (
                     subprocess.check_output(
-                        ['pkg-config', optional, *pkg_options, lib]
+                        ["pkg-config", optional, *pkg_options, lib]
                     )
                     .decode()
                     .split()
                 )
             except subprocess.CalledProcessError:
                 continue
-            ext_kwargs.setdefault(distutils_kwarg, []).extend(
+            ext_kwargs.setdefault(distutils_kwarg, default_value).extend(
                 [opt[trim_offset:] for opt in options]
             )
     return ext_kwargs
@@ -41,13 +49,17 @@ def pkgconfig(libs, optional=''):
 def build(setup_kwargs):
     setup_kwargs.update(
         {
-            'ext_modules': [
+            "ext_modules": [
                 Extension(
-                    'hyperscan._hyperscan',
-                    ['src/hyperscan/hyperscanmodule.c'],
-                    **pkgconfig(['libhs']),
+                    "hyperscan._hyperscan",
+                    ["src/hyperscan/hyperscanmodule.c"],
+                    extra_objects=[
+                        os.path.join(pcre_path, "libpcre.a"),
+                        *glob.glob(os.path.join(pcre_path, '*.o')),
+                    ],
+                    **pkgconfig(["libhs", "libch"]),
                 )
             ],
-            'cmdclass': {'build_ext': build_ext},
+            "cmdclass": {"build_ext": build_ext},
         }
     )