diff --git a/.github/workflows/conda-build-test.yml b/.github/workflows/conda-build-test.yml index 05ec01c..331d66a 100644 --- a/.github/workflows/conda-build-test.yml +++ b/.github/workflows/conda-build-test.yml @@ -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 diff --git a/README.md b/README.md index 91c91c7..36e722a 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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. diff --git a/conda/meta.yaml b/conda/meta.yaml index 7e5c236..fcdd308 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -21,10 +21,11 @@ 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: @@ -32,8 +33,8 @@ test: 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: