From 0e1ef877346f8f6cc3b6d04c6f33efee68a1948f Mon Sep 17 00:00:00 2001 From: gmweaver Date: Wed, 5 Jun 2024 14:21:29 -0700 Subject: [PATCH] try use actions only to install --- .github/workflows/wheels.yml | 15 +++++++++++++-- setup.py | 4 ++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 8cba0e2..859defa 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -14,7 +14,6 @@ jobs: steps: - uses: actions/checkout@v4 - # Used to host cibuildwheel - uses: actions/setup-python@v5 - name: Install cibuildwheel @@ -24,8 +23,20 @@ jobs: run: python -m cibuildwheel --output-dir dist env: CIBW_SKIP: cp36-* cp37-* *musllinux* - CIBW_BEFORE_ALL_LINUX: yum install -y autoconf automake curl libtool sudo + CIBW_BEFORE_ALL_LINUX: yum install -y autoconf automake curl libtool pkgconfig sudo CIBW_BEFORE_ALL_MACOS: brew install autoconf automake curl libtool pkg-config + CIBW_BEFORE_ALL: > + git clone https://github.com/openvenues/libpostal && + cd libpostal && + git checkout tags/v1.1 && + ./bootstrap.sh && + ./configure && + make -j4 && + sudo make install && + pkg-config --cflags libpostal && + pkg-config --libs libpostal && + pkg-config --cflags --libs libpostal + CIBW_AFTER_ALL_LINUX: sudo ldconfig - uses: actions/upload-artifact@v4 with: diff --git a/setup.py b/setup.py index 14aa857..0752745 100644 --- a/setup.py +++ b/setup.py @@ -16,8 +16,8 @@ def _install_libpostal() -> None: subprocess.run(["./install_libpostal.sh", tempdir], check=True) -if not _libpostal_installed(): - _install_libpostal() +# if not _libpostal_installed(): +# _install_libpostal() ext_modules = [ Extension(