Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing CI for two touching cubes #34

Closed
wants to merge 7 commits into from
Closed

Fixing CI for two touching cubes #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e007b62
py3.10 and moab >=5.3.0 in ci
shimwell Mar 17, 2024
74f6611
installing with python -m
shimwell Mar 17, 2024
ecba179
activating env
shimwell Mar 17, 2024
ef76275
pip install order matching cad-to-dagmc ci
shimwell Mar 17, 2024
0e2ac0b
added conda list
shimwell Mar 17, 2024
45cb709
writting env out
shimwell Mar 17, 2024
799ab20
removed package for testing
shimwell Mar 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions .github/actions/dependencies/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,15 @@ runs:
sudo apt-get update -y
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 cadquery-ocp==7.7.2
pip install cadquery==2.4.0
pip install cad_to_dagmc openmc_data_downloader
pip install CAD_to_OpenMC
mamba create -y --name new_env python=3.10
mamba activate new_env
mamba install -y -c conda-forge moab>=5.3.0 gmsh python-gmsh "openmc=0.14.0=dagmc*nompi*"
python -m pip install --upgrade pip
python -m pip install cad_to_dagmc
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
pip install .[tests]
python -m pip install .[tests]
conda env export > environment.yml
cat environment.yml
2 changes: 1 addition & 1 deletion .github/workflows/circular_torus_cad_to_dagmc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ jobs:
run: |
source "${HOME}/conda/etc/profile.d/conda.sh"
source "${HOME}/conda/etc/profile.d/mamba.sh"
mamba activate
mamba activate new_env
pytest tests/test_cad_to_dagmc/test_csg_cad_circulartorus.py
2 changes: 1 addition & 1 deletion .github/workflows/circular_torus_cad_to_openmc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ jobs:
run: |
source "${HOME}/conda/etc/profile.d/conda.sh"
source "${HOME}/conda/etc/profile.d/mamba.sh"
mamba activate
mamba activate new_env
pytest tests/test_cad_to_openmc/test_csg_cad_circulartorus.py
2 changes: 1 addition & 1 deletion .github/workflows/cuboid_cad_to_dagmc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ jobs:
run: |
source "${HOME}/conda/etc/profile.d/conda.sh"
source "${HOME}/conda/etc/profile.d/mamba.sh"
mamba activate
mamba activate new_env
pytest tests/test_cad_to_dagmc/test_csg_cad_cuboid.py
2 changes: 1 addition & 1 deletion .github/workflows/cuboid_cad_to_openmc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ jobs:
run: |
source "${HOME}/conda/etc/profile.d/conda.sh"
source "${HOME}/conda/etc/profile.d/mamba.sh"
mamba activate
mamba activate new_env
pytest tests/test_cad_to_openmc/test_csg_cad_cuboid.py
2 changes: 1 addition & 1 deletion .github/workflows/cylinder_cad_to_dagmc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ jobs:
run: |
source "${HOME}/conda/etc/profile.d/conda.sh"
source "${HOME}/conda/etc/profile.d/mamba.sh"
mamba activate
mamba activate new_env
pytest tests/test_cad_to_dagmc/test_csg_cad_cylinder.py
2 changes: 1 addition & 1 deletion .github/workflows/cylinder_cad_to_openmc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ jobs:
run: |
source "${HOME}/conda/etc/profile.d/conda.sh"
source "${HOME}/conda/etc/profile.d/mamba.sh"
mamba activate
mamba activate new_env
pytest tests/test_cad_to_dagmc/test_csg_cad_cylinder.py
2 changes: 1 addition & 1 deletion .github/workflows/elliptical_torus_cad_to_dagmc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ jobs:
run: |
source "${HOME}/conda/etc/profile.d/conda.sh"
source "${HOME}/conda/etc/profile.d/mamba.sh"
mamba activate
mamba activate new_env
pytest tests/test_cad_to_dagmc/test_csg_cad_ellipticaltorus.py
2 changes: 1 addition & 1 deletion .github/workflows/elliptical_torus_cad_to_openmc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ jobs:
run: |
source "${HOME}/conda/etc/profile.d/conda.sh"
source "${HOME}/conda/etc/profile.d/mamba.sh"
mamba activate
mamba activate new_env
pytest tests/test_cad_to_openmc/test_csg_cad_ellipticaltorus.py
2 changes: 1 addition & 1 deletion .github/workflows/nested_cylinder_cad_to_dagmc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ jobs:
run: |
source "${HOME}/conda/etc/profile.d/conda.sh"
source "${HOME}/conda/etc/profile.d/mamba.sh"
mamba activate
mamba activate new_env
pytest tests/test_cad_to_dagmc/test_csg_cad_nestedcylinder.py
2 changes: 1 addition & 1 deletion .github/workflows/nested_cylinder_cad_to_openmc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ jobs:
run: |
source "${HOME}/conda/etc/profile.d/conda.sh"
source "${HOME}/conda/etc/profile.d/mamba.sh"
mamba activate
mamba activate new_env
pytest tests/test_cad_to_openmc/test_csg_cad_nestedcylinder.py
2 changes: 1 addition & 1 deletion .github/workflows/nested_sphere_cad_to_dagmc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ jobs:
run: |
source "${HOME}/conda/etc/profile.d/conda.sh"
source "${HOME}/conda/etc/profile.d/mamba.sh"
mamba activate
mamba activate new_env
pytest tests/test_cad_to_dagmc/test_csg_cad_nestedsphere.py
2 changes: 1 addition & 1 deletion .github/workflows/nested_sphere_cad_to_openmc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ jobs:
run: |
source "${HOME}/conda/etc/profile.d/conda.sh"
source "${HOME}/conda/etc/profile.d/mamba.sh"
mamba activate
mamba activate new_env
pytest tests/test_cad_to_openmc/test_csg_cad_nestedsphere.py
2 changes: 1 addition & 1 deletion .github/workflows/sphere_cad_to_dagmc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ jobs:
run: |
source "${HOME}/conda/etc/profile.d/conda.sh"
source "${HOME}/conda/etc/profile.d/mamba.sh"
mamba activate
mamba activate new_env
pytest tests/test_cad_to_dagmc/test_csg_cad_sphere.py
2 changes: 1 addition & 1 deletion .github/workflows/sphere_cad_to_openmc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ jobs:
run: |
source "${HOME}/conda/etc/profile.d/conda.sh"
source "${HOME}/conda/etc/profile.d/mamba.sh"
mamba activate
mamba activate new_env
pytest tests/test_cad_to_openmc/test_csg_cad_sphere.py
2 changes: 1 addition & 1 deletion .github/workflows/two_touching_cuboids_cad_to_dagmc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ jobs:
run: |
source "${HOME}/conda/etc/profile.d/conda.sh"
source "${HOME}/conda/etc/profile.d/mamba.sh"
mamba activate
mamba activate new_env
pytest tests/test_cad_to_dagmc/test_csg_cad_two_touching_cuboids.py
2 changes: 1 addition & 1 deletion .github/workflows/two_touching_cuboids_cad_to_openmc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ jobs:
run: |
source "${HOME}/conda/etc/profile.d/conda.sh"
source "${HOME}/conda/etc/profile.d/mamba.sh"
mamba activate
mamba activate new_env
pytest tests/test_cad_to_openmc/test_csg_cad_two_touching_cuboids.py
Loading