From 42ff44cc4e80767a0d2a996e988f1ac1f6e7bca9 Mon Sep 17 00:00:00 2001
From: Hugo Buddelmeijer <hugo@buddelmeijer.nl>
Date: Mon, 18 Sep 2023 19:07:06 +0200
Subject: [PATCH] Use ScopeSim 0.6.2 and ScopeSim_Templates 0.4.4
---
conda-recipe/run_test.sh | 4 ++--
micadowise.yml | 7 ++-----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/conda-recipe/run_test.sh b/conda-recipe/run_test.sh
index 87711a29b..f7455c3f6 100755
--- a/conda-recipe/run_test.sh
+++ b/conda-recipe/run_test.sh
@@ -56,12 +56,12 @@ python -c "import skycalc_ipy" || pip install skycalc_ipy
# ScopeSIM should have a conda package
#python -c "import scopesim" || pip install git+https://github.com/AstarVienna/ScopeSim.git@master
-python -c "import scopesim" || pip install "ScopeSIM==0.5.4"
+python -c "import scopesim" || pip install "ScopeSIM==0.6.2"
# ScopeSim_Templates fetches data from the internet, which does not work
# when using conda-build.
#python -c "import scopesim_templates" || pip install -e git+https://github.com/AstarVienna/ScopeSim_Templates.git@master
-python -c "import scopesim_templates" || pip install "ScopeSIM_Templates==0.4.2"
+python -c "import scopesim_templates" || pip install "ScopeSIM_Templates==0.4.4"
# TODO: Fetch ScopeSim data package.
# IRDB
diff --git a/micadowise.yml b/micadowise.yml
index 389eac33b..0cb34b9e9 100644
--- a/micadowise.yml
+++ b/micadowise.yml
@@ -18,11 +18,8 @@ dependencies:
- pip
- pip:
- skycalc_ipy
- - "ScopeSim==0.5.4"
- - "scopesim_templates==0.4.2"
- # ScopeSIM 0.2.0 breaks simulating a cluster for large detectors.
- # - ScopeSim==0.1.4
- # dev_master should work again
+ - "ScopeSim==0.6.2"
+ - "scopesim_templates==0.4.4"
#- git+https://github.com/AstarVienna/ScopeSim.git@master
# - ScopeSim_Templates
#- git+https://github.com/AstarVienna/ScopeSim_Templates.git@dev_master
--
GitLab