From eda0feeed312a86446af105729c7ecd2f89fa624 Mon Sep 17 00:00:00 2001 From: William F Godoy Date: Wed, 29 Jan 2020 17:02:41 -0500 Subject: [PATCH 1/3] Updated conda scripts --- scripts/conda/meta.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/conda/meta.yaml b/scripts/conda/meta.yaml index 6494069..df7d902 100644 --- a/scripts/conda/meta.yaml +++ b/scripts/conda/meta.yaml @@ -1,14 +1,15 @@ package: - name: adios2-examples-openmpi + name: adios2-examples version: 2.5.0 build: number: 0 - string: full + string: openmpi source: git_url: https://github.com/ornladios/adios2-examples.git - git_rev: master + git_rev: v2.5.0 + git_depth: 1 requirements: build: @@ -17,13 +18,13 @@ requirements: - mpi4py - numpy=1.15 - cmake - - adios2-openmpi + - adios2-openmpi=2.5.0=full run: - python - openmpi - mpi4py - numpy=1.15 - - adios2-openmpi + - adios2-openmpi=2.5.0=full - matplotlib about: From 7e19fb5843361b25a051c84597701aeeaec06cdd Mon Sep 17 00:00:00 2001 From: William F Godoy Date: Wed, 29 Jan 2020 17:14:55 -0500 Subject: [PATCH 2/3] Modified sh permission post-install --- source/cpp/gray-scott/CMakeLists.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/source/cpp/gray-scott/CMakeLists.txt b/source/cpp/gray-scott/CMakeLists.txt index 27dcfb0..cb3da24 100644 --- a/source/cpp/gray-scott/CMakeLists.txt +++ b/source/cpp/gray-scott/CMakeLists.txt @@ -23,7 +23,10 @@ install(FILES "adios2.xml" "visit-bp4.session" "visit-bp4.session.gui" "simulation/settings-files.json" "simulation/settings-staging.json" "plot/decomp.py" "plot/gsplot.py" "plot/pdfplot.py" - "cleanup.sh" "README.md" - DESTINATION - ${CMAKE_INSTALL_PREFIX}/share/adios2-examples/gray-scott) - \ No newline at end of file + "README.md" + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/adios2-examples/gray-scott) + + +install(PROGRAMS "cleanup.sh" + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/adios2-examples/gray-scott) + From 4cda644e6241c89464ecc7911d7ba3494eef7171 Mon Sep 17 00:00:00 2001 From: William F Godoy Date: Wed, 29 Jan 2020 17:20:13 -0500 Subject: [PATCH 3/3] Test conda scripts with rc2 --- scripts/conda/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/conda/meta.yaml b/scripts/conda/meta.yaml index df7d902..7538218 100644 --- a/scripts/conda/meta.yaml +++ b/scripts/conda/meta.yaml @@ -1,6 +1,6 @@ package: name: adios2-examples - version: 2.5.0 + version: 2.5.0-rc2 build: number: 0 @@ -8,7 +8,7 @@ build: source: git_url: https://github.com/ornladios/adios2-examples.git - git_rev: v2.5.0 + git_rev: v2.5.0-rc2 git_depth: 1 requirements: