Skip to content

Commit

Permalink
build: 📦 fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
darvid committed Aug 7, 2023
1 parent 7a856f6 commit d73d9c1
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 88 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
_version.py
.envrc
**/_version.py

*.whl
*.png
Expand Down
1 change: 1 addition & 0 deletions build_tools/wheels/test_wheels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ set -euxo pipefail
PROJECT_DIR=${1:-/project}
XDIST_WORKERS=$(python -c "import joblib; print(joblib.cpu_count(only_physical_cores=True))")
echo "👷 Number of workers: $XDIST_WORKERS"
pip show hyperscan
pytest --pyargs "${PROJECT_DIR}/tests/" -n $XDIST_WORKERS -vvv
81 changes: 1 addition & 80 deletions pdm.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pdm_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@
include_dirs=[hs_cflags[2:], get_python_inc(plat_specific=1)],
libraries=["hs", ":libchimera.a", "m", "stdc++"],
library_dirs=["/opt/hyperscan/lib64", "/usr/lib/x86_64-linux-gnu"],
extra_compile_args=["-O0", "-DPCRE_STATIC"],
extra_link_args=["-l:libhs.a", "-l:libchimera.a"],
extra_objects=[
os.path.join(pcre_path, "libpcre.a"),
*glob.glob(os.path.join(pcre_path, '*.o')),
],
runtime_library_dirs=["src/lib"],
)


Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ lint = [
"black>=23.7.0",
"isort>=5.12.0",
"ruff>=0.0.280",
"commitizen>=2.42.1",
"pre-commit>=2.21.0",
"clang-format>=9.0.0",
]
Expand Down
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@
include_dirs=[hs_cflags[2:], get_python_inc(plat_specific=1)],
libraries=["hs", ":libchimera.a", "m", "stdc++"],
library_dirs=["/opt/hyperscan/lib64", "/usr/lib/x86_64-linux-gnu"],
extra_compile_args=["-O0", "-DPCRE_STATIC"],
extra_link_args=["-l:libhs.a", "-l:libchimera.a"],
extra_objects=[
os.path.join(pcre_path, "libpcre.a"),
*glob.glob(os.path.join(pcre_path, '*.o')),
],
runtime_library_dirs=["src/lib"],
)


setup(ext_modules=[hyperscan_ext])
4 changes: 0 additions & 4 deletions src/hyperscan/_version.py

This file was deleted.

0 comments on commit d73d9c1

Please sign in to comment.