From 6bfc929e4ab1ac857d4e405fd851acc8a30fa7d6 Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Mon, 18 Mar 2024 02:16:43 +0000
Subject: [PATCH] more packages in the pip installer

---
 .github/workflows/ci_with_benchmarks.yml  |  4 +---
 .github/workflows/ci_with_install.yml     |  2 +-
 .github/workflows/ci_with_pip_install.yml | 22 +++++++++++++++++-----
 README.md                                 |  5 +++++
 pyproject.toml                            |  2 ++
 5 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci_with_benchmarks.yml b/.github/workflows/ci_with_benchmarks.yml
index 0970370..6a42c02 100644
--- a/.github/workflows/ci_with_benchmarks.yml
+++ b/.github/workflows/ci_with_benchmarks.yml
@@ -37,11 +37,9 @@ jobs:
           sudo apt-get upgrade -y
           sudo apt-get install -y libgl1-mesa-glx libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev libosmesa6 libosmesa6-dev libgles2-mesa-dev libarchive-dev libpangocairo-1.0-0
           mamba activate
-          mamba install -y -c conda-forge "openmc=0.14.0=dagmc*nompi*" moab>=5.3.0 gmsh python-gmsh
+          mamba install -y -c conda-forge "openmc=0.14.0=dagmc*nompi*" moab>=5.3.0
           python -m pip install --upgrade pip
           python -m pip install .
-          python -m pip install cadquery-ocp==7.7.2
-          python -m pip install cadquery==2.4.0
           python -m pip install openmc_data_downloader
           openmc_data_downloader -l ENDFB-7.1-NNDC -i Fe56 Be9
           git clone --single-branch -b main --depth 1 https://github.com/fusion-energy/model_benchmark_zoo.git
diff --git a/.github/workflows/ci_with_install.yml b/.github/workflows/ci_with_install.yml
index 71579ab..119e44c 100644
--- a/.github/workflows/ci_with_install.yml
+++ b/.github/workflows/ci_with_install.yml
@@ -37,7 +37,7 @@ jobs:
           mamba activate
           mamba create -y --name cad_to_dagmc python=3.10
           mamba activate cad_to_dagmc
-          mamba install -y -c conda-forge moab>=5.3.0 gmsh python-gmsh ocp=7.7.2.0 cadquery=2.4.0
+          mamba install -y -c conda-forge moab>=5.3.0
           python -m pip install --upgrade pip 
           python -m pip install .
           python -c "import cad_to_dagmc"
diff --git a/.github/workflows/ci_with_pip_install.yml b/.github/workflows/ci_with_pip_install.yml
index 932617a..b47fefd 100644
--- a/.github/workflows/ci_with_pip_install.yml
+++ b/.github/workflows/ci_with_pip_install.yml
@@ -32,16 +32,28 @@ jobs:
           apt-get update -y
           apt-get upgrade -y
           apt-get install -y libgl1-mesa-glx libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev libosmesa6 libosmesa6-dev libgles2-mesa-dev libarchive-dev libpangocairo-1.0-0 libxcursor-dev libxft2 libxinerama-dev 
+          apt-get install -y make cmake
           apt install python3
           apt install python3-pip
-          python -m pip install --upgrade pip 
-          python -m pip install gmsh
-          python -m pip install cadquery-ocp==7.7.2
-          python -m pip install cadquery==2.4.0
+          python -m pip install --upgrade pip
+          mkdir -MOAB
+          cd /MOAB
+          git clone --single-branch -b 5.3.0 --depth 1 https://bitbucket.org/fathomteam/moab/
+          mkdir build
+          cd build
+          cmake .. -DENABLE_PYMOAB=ON -DENABLE_HDF5=ON
+          make
+          make install
+          cd pymoab
+          bash install.sh
+          cd ../..
           python -m pip install .
           python -c "import cad_to_dagmc"
           python -m pip install .[tests]
-          pytest tests -v
+          pytest -v tests/test_file_creation.py
+          pytest -v tests/test_loading_from_file_vs_shape_object.py
+          pytest -v tests/test_python_api.py
+          pytest -v tests/test_version.py
           cd examples
           python create_stp_files_for_examples.py
           python cadquery_assembly.py
diff --git a/README.md b/README.md
index 3d0ef5d..0f97516 100644
--- a/README.md
+++ b/README.md
@@ -127,6 +127,11 @@ Then you can install the cad_to_dagmc package with ```pip```
 pip install cad_to_dagmc
 ```
 
+# Known incompatibilities
+
+The package requires newer versions of Linux. For example the package does not work on Ubuntu 18.04 or older.
+
+The package requires newer versions of pip. It is recommended to ensure that your version of pip is up to date. This can be done with ```python -m pip install --upgrade pip```
 
 # Usage - with OpenMC
 
diff --git a/pyproject.toml b/pyproject.toml
index b91b060..9e6efbe 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,6 +20,8 @@ classifiers = [
 dependencies = [
     "trimesh",
     "networkx",
+    "cadquery-ocp>=7.7.2"
+    "cadquery>=2.4.0"
 ]
 dynamic = ["version"]