From 8d6d07f82a4b5558d345f913fd2f592cf23da358 Mon Sep 17 00:00:00 2001
From: Willem-Jan Vriend <wjvriend@astro.rug.nl>
Date: Wed, 12 Oct 2022 10:32:05 +0200
Subject: [PATCH] irdb git clone gives wrong version
---
build.sh | 8 ++++----
conda-recipe/run_test.sh | 10 ++++++----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/build.sh b/build.sh
index cd792405f..26ae49763 100755
--- a/build.sh
+++ b/build.sh
@@ -55,11 +55,11 @@ if [ "${DELETE}" = "YES" ] ; then
fi
# download the irdb packages, line below downloads zip files
-#python -c 'import scopesim; scopesim.download_packages(["Armazones", "ELT", "MICADO", "LFOA", "MAORY"])'
+python -c 'import scopesim; scopesim.download_packages(["Armazones", "ELT", "MICADO", "LFOA", "MAORY"])'
# TODO git checkout the irdb repo and point to it
-rm -Rf inst_pkgs
-git clone https://github.com/AstarVienna/irdb.git
-ln -s irdb inst_pkgs
+#rm -Rf inst_pkgs
+#git clone https://github.com/AstarVienna/irdb.git
+#ln -s irdb inst_pkgs
python src/micado/toolbox/yaml_from_did.py
python src/micado/toolbox/python_from_vodml.py
diff --git a/conda-recipe/run_test.sh b/conda-recipe/run_test.sh
index 562e7aa9b..113e97920 100755
--- a/conda-recipe/run_test.sh
+++ b/conda-recipe/run_test.sh
@@ -65,11 +65,13 @@ python -c "import scopesim_templates" || pip install "ScopeSIM_Templates==0.4.2"
# TODO: Fetch ScopeSim data package.
# IRDB
-#python -c 'import scopesim; scopesim.download_packages(["Armazones", "ELT", "MICADO", "LFOA", "MAORY"])'
+python -c 'import scopesim; scopesim.download_packages(["Armazones", "ELT", "MICADO", "LFOA", "MAORY"])'
+# or install via pip install ?
#pip install git+https://github.com/AstarVienna/irdb.git@master
-rm -Rf inst_pkgs
-git clone https://github.com/AstarVienna/irdb.git
-ln -s irdb inst_pkgs
+# or use git clone ?
+#rm -Rf inst_pkgs
+#git clone https://github.com/AstarVienna/irdb.git
+#ln -s irdb inst_pkgs
if [[ -n ${MICADO_INTEGRATION_TESTS:+x} ]]; then
--
GitLab