Update configuration

conda-forge · Aug 17, 2020 · 02c1b06 · 02c1b06
1 parent 6f4f724
commit 02c1b06
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -5,6 +5,9 @@ if [[ -n "$enable_moab" && "$enable_moab" != "nomoab" ]]; then
   export CONFIGURE_ARGS="--moab=${PREFIX} ${CONFIGURE_ARGS}"
 fi
 
+if [[ -n "$enable_dagmc" && "$enable_dagmc" != "nodagmc" ]]; then
+  export CONFIGURE_ARGS="--dagmc=${PREFIX} ${CONFIGURE_ARGS}"
+fi
 # Install PyNE
 export VERBOSE=1
 ${PYTHON} setup.py install \

diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -2,9 +2,9 @@ enable_moab:
   - nomoab
   - moab
 
-enable_openmc:
-    - noopenmc
-    - openmc
+enable_dagmc:
+    - nodagmc
+    - dagmc
 
 channel_targets:
   - conda-forge pyne_rc
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,13 +1,13 @@
 {% set org = "pyne" %}
 {% set version = "0.7.0" %}
-{% set build = "9" %}
+{% set build = "10" %}
 {% set sha256 = "c29de9ab374dc38e5dcd9c7ea8b15a3d916fb2237b8928f1b5526ea74906cb29" %}
 
 {% set rcnum = "3" %}
 
 # ensure moab is defined (needed for conda-smithy recipe-lint)
 {% set enable_moab = enable_moab or 'nomoab' %}
-{% set enable_openmc = enable_openmc or 'noopenmc' %}
+{% set enable_dagmc = enable_dagmc or 'nodagmc' %}
 
 
 package:
@@ -27,13 +27,14 @@ build:
   {% set moab_prefix = "nomoab" %}
   {% endif %} 
 
-  {% if enable_openmc == 'openmc' %}
-  {% set openmc_prefix = "openmc" %}
+  {% if enable_dagmc == 'dagmc' %}
+  {% set dagmc_prefix = "dagmc" %}
+  {% set moab_prefix = "moab" %}
   {% else %}
-  {% set openmc_prefix = "noopenmc" %}
+  {% set dagmc_prefix = "nodagmc" %}
   {% endif %} 
 
-  string: "{{ moab_prefix }}_{{ openmc_prefix }}py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ build }}"
+  string: "{{ moab_prefix }}_{{ dagmc_prefix }}py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ build }}"
 
   skip: True  # [win or osx]
   detect_binary_files_with_prefix: true
@@ -52,6 +53,7 @@ requirements:
     - pytables
     - cython
     - moab  # [ enable_moab == 'moab']
+    - dagmc  # [ enable_dagmc == 'dagmc']
   run:
     - python
     - hdf5
@@ -61,7 +63,7 @@ requirements:
     - future
     - jinja2
     - moab  # [ enable_moab == 'moab']
-    - openmc  # [ enable_openmc == 'openmc']
+    - dagmc  # [ enable_dagmc == 'dagmc']
 test:
   requires:
     - nose