From 02c1b06fe5a1918b6bd0b7214c26aeadb3a04ff3 Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Mon, 17 Aug 2020 05:53:02 -0500 Subject: [PATCH] Update configuration --- recipe/build.sh | 3 +++ recipe/conda_build_config.yaml | 6 +++--- recipe/meta.yaml | 16 +++++++++------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 5e7a6e1..d79403e 100644 --- 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 index 5c23f53..bf12bb5 100644 --- 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 index 5629518..f703b62 100644 --- 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