Skip to content

Commit

Permalink
Merge pull request #8 from fusion-energy/adding_build_test
Browse files Browse the repository at this point in the history
Adding build test
  • Loading branch information
shimwell authored Sep 16, 2022
2 parents 32b7f92 + b9eb32c commit cb41aae
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/conda-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ jobs:
- name: Set up conda
run: |
apt-get --allow-releaseinfo-change update
apt install -y libgl1-mesa-glx
conda install -y anaconda-client conda-build
conda config --set anaconda_upload no
conda install boa -c conda-forge
- name: Build and test
env:
GIT_DESCRIBE_TAG: 0.1
run: |
conda build conda -c fusion-energy -c conda-forge --config-file conda/conda_build_config.yaml
conda mambabuild conda -c fusion-energy -c conda-forge --config-file conda/conda_build_config.yaml
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ It is strongly advised to used the DAGMC overlap checker to check the
resulting h5m file (see checking for overlaps section below).


~~# Installation - Conda~~
# Installation - Conda

~~This single line command should install the package and dependencies (including moab)~~
This single line command should install the package and dependencies (including moab)

~~```bash~~
~~conda install -c fusion-energy -c fusion-energy vertices_to_h5m~~
~~```~~
```bash
conda install -c fusion-energy -c fusion-energy vertices_to_h5m
```

# Installation - Pip + Conda

Expand All @@ -43,6 +43,7 @@ conda install -c conda-forge moab
pip install vertices_to_h5m
```


# Examples

These examples with volumes made from just four triangles to keep the examples minimal.
Expand Down
5 changes: 3 additions & 2 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,20 @@ requirements:
- setuptools>=46.4.0
- setuptools_scm>=6.3.1
run:
- python {{ python }}
- python
- moab * nompi_tempest_*
- trimesh
- networkx
- scipy # trimesh makes use of scipy to fix normals in some cases

test:
imports:
- vertices_to_h5m
requires:
- pytest
- dagmc_h5m_file_inspector
- openmc_data_downloader
- openmc
- scipy # trimesh makes use of scipy to fix normals in some cases
source_files:
- tests/
commands:
Expand Down

0 comments on commit cb41aae

Please sign in to comment.