Skip to content

Commit 3d2d3a8

Browse files
aryan26roylgraypre-commit-ci[bot]chrispap95
authored
enabled cgal (#70)
* enabled cgal * update cgal * --enable-cgal is incorrect? * fastjet documentation does not match actual function * gmp appears to be a harder requirement than thought * remove mpfr for now... * swig/autoconf/libtool * specify swig3 * try older cgal, with more relaxed c++ requirement * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * newer bugfix for CGAL-4 * drop header only * that's a big nope * use only the source code - no compiled libs * zipball * ah well back to square one * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * order matters? * add automake * autoconf/make already included, mpfr related? * match package basis from CI awaiting patch from @chrispap95 for manual boost install in wheel (just add it to this branch). Indeed looking in the CGAL docs it's header only and requires boost 1.66 or later. * mpfr-devel in wheels * libmpfr in ci * try with boost 1.80 * typo Co-authored-by: Lindsey Gray <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Chris Papageorgakis <[email protected]>
1 parent 446a707 commit 3d2d3a8

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555

5656
- name: Install extra deps on Linux
5757
if: runner.os == 'Linux'
58-
run: sudo apt-get update && sudo apt-get install -y libboost-dev swig autoconf libtool
58+
run: sudo apt-get update && sudo apt-get install -y libboost-dev libmpfr-dev swig autoconf libtool
5959

6060
- name: Install package
6161
run: python -m pip install .[test] -v

pyproject.toml

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,8 @@ manylinux-i686-image = "manylinux2014"
1616
[tool.cibuildwheel.linux]
1717
before-all = [
1818
"yum update -y",
19-
"yum install -y mpfr-devel boost-devel",
19+
"yum install -y mpfr-devel",
20+
"curl -L https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.bz2 -o boost_1_80_0.tar.bz2",
21+
"tar --bzip2 -xf boost_1_80_0.tar.bz2",
22+
"mv boost_1_80_0/boost /usr/include/boost",
2023
]

setup.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import setuptools.command.install
2323

2424
CGAL_ZIP = (
25-
"https://github.com/CGAL/cgal/releases/download/v5.2.1/CGAL-5.2.1-library.zip"
25+
"https://github.com/CGAL/cgal/releases/download/v5.5.1/CGAL-5.5.1-library.zip"
2626
)
2727

2828
DIR = pathlib.Path(__file__).parent.resolve()
@@ -70,6 +70,7 @@ def build_extensions(self):
7070
f"--prefix={OUTPUT}",
7171
"--enable-allcxxplugins",
7272
"--enable-cgal-header-only",
73+
"--enable-cgal",
7374
f"--with-cgaldir={cgal_dir}",
7475
"--enable-swig",
7576
"--enable-pyext",

0 commit comments

Comments
 (0)