From 9f4ead9be32b7e77c8648815b97aff74b6b81ac5 Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Fri, 26 Jan 2024 17:37:14 +0000 Subject: [PATCH 1/2] cadquery 2.40 from conda --- .github/actions/dependencies/action.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/dependencies/action.yml b/.github/actions/dependencies/action.yml index f1229cb..2cf3bf8 100644 --- a/.github/actions/dependencies/action.yml +++ b/.github/actions/dependencies/action.yml @@ -19,8 +19,7 @@ runs: 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 moab gmsh python-gmsh "openmc=0.14.0=dagmc*nompi*" - pip install git+https://github.com/CadQuery/cadquery.git + mamba install -y -c conda-forge moab gmsh python-gmsh "cadquery=2.4.0" "openmc=0.14.0=dagmc*nompi*" pip install cad_to_dagmc openmc_data_downloader pip install CAD_to_OpenMC openmc_data_downloader -l ENDFB-7.1-NNDC -i Fe56 Be9 From 9f200d456590f44c64e064048e0df9387300993a Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Fri, 26 Jan 2024 17:44:52 +0000 Subject: [PATCH 2/2] removed nompi and sep moab --- .github/actions/dependencies/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/dependencies/action.yml b/.github/actions/dependencies/action.yml index 2cf3bf8..20676e9 100644 --- a/.github/actions/dependencies/action.yml +++ b/.github/actions/dependencies/action.yml @@ -19,7 +19,7 @@ runs: 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 moab gmsh python-gmsh "cadquery=2.4.0" "openmc=0.14.0=dagmc*nompi*" + mamba install -y -c conda-forge gmsh python-gmsh "cadquery=2.4.0" "openmc=0.14.0=dagmc*" pip install cad_to_dagmc openmc_data_downloader pip install CAD_to_OpenMC openmc_data_downloader -l ENDFB-7.1-NNDC -i Fe56 Be9