Merge branch 'fixing_pip_install_ci' of github.com:fusion-energy/cad_…

…to_dagmc into fixing_pip_install_ci
fusion-energy · Mar 18, 2024 · 482de0c · 482de0c
2 parents 0c01656 + 5de08f7
commit 482de0c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/ci_with_benchmarks.yml b/.github/workflows/ci_with_benchmarks.yml
@@ -37,7 +37,7 @@ 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
+          mamba install -y -c conda-forge "openmc=0.14.0=dagmc*nompi*" moab>=5.3.0 gmsh python-gmsh
           python -m pip install --upgrade pip
           python -m pip install .
           python -m pip install openmc_data_downloader

diff --git 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
+          mamba install -y -c conda-forge moab>=5.3.0 gmsh python-gmsh
           python -m pip install --upgrade pip 
           python -m pip install .
           python -c "import cad_to_dagmc"

diff --git a/pyproject.toml b/pyproject.toml
@@ -20,7 +20,6 @@ classifiers = [
 dependencies = [
     "trimesh",
     "networkx",
-    "gmsh",
     "cadquery-ocp>=7.7.2",
     "cadquery>=2.4.0",
 ]