Skip to content

Commit

Permalink
more packages in the pip installer
Browse files Browse the repository at this point in the history
  • Loading branch information
shimwell committed Mar 18, 2024
1 parent 90456d0 commit 6bfc929
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 9 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/ci_with_benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_with_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
22 changes: 17 additions & 5 deletions .github/workflows/ci_with_pip_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ classifiers = [
dependencies = [
"trimesh",
"networkx",
"cadquery-ocp>=7.7.2"
"cadquery>=2.4.0"
]
dynamic = ["version"]

Expand Down

0 comments on commit 6bfc929

Please sign in to comment.