Merge pull request #116 from astrophpeter/peter-fsps

Peter fsps

Author: astrophpeter

.github/workflows/continuous-integration.yml

@@ -18,6 +18,7 @@ jobs:
       - name: docker compose up
         run: |
           touch env/.env.dev
+          bash run/get_fsps_files.sh
           bash run/blast.run.sh ci
       - uses: codecov/codecov-action@v3
         with:

.gitignore

@@ -157,3 +157,5 @@ data/cutout_cdn/2010ai/*
 static/
 
 .DS_Store
+
+data/fsps/*

app/Dockerfile

@@ -10,5 +10,8 @@ RUN pip install -r /requirements.txt
 RUN mkdir /app
 RUN mkdir /cutout_cdn
 RUN mkdir /ghost_output
+RUN mkdir /fsps
+
+RUN
 COPY . /app
 WORKDIR /app

app/requirements.txt

@@ -101,3 +101,4 @@ healpy==1.14.0
 dustmaps
 astro-sedpy
 django-revproxy
+fsps==0.4.1

docker/docker-compos.old.test.yml

@@ -12,6 +12,7 @@ services:
       - ../data/tns_staging:/tns_staging
       - ../data/transmission:/transmission
       - ../data/dustmaps:/dustmaps
+      - ../data/fsps/:/fsps
   nginx_base:
     restart: always
     image: nginx:1.21-alpine
@@ -37,3 +38,4 @@ services:
       - ../data/tns_staging:/tns_staging
       - ../data/transmission:/transmission
       - ../data/dustmaps:/dustmaps
+      - ../data/fsps/:/fsps

docker/docker-compose.blast_base.yml

@@ -1,41 +1,2 @@
 FAQs
 ====
-
-
-Docker
-------
-
-1. I'm getting the error :code:`unknown flag: --profile` when I try and start
-the docker containers.
-
-You need to update your docker version to a more recent one which supports
---profiles flag. You need Docker Compose version 1.28.0 or later. If you are
-having trouble installing the required version of docker, there is still support
-for the old version.
-
-For the slim stack:
-
-.. code:: none
-
-    bash run/blast.run.sh old_slim_dev
-
-or if you want the full stack:
-
-.. code:: none
-
-    bash run/blast.run.sh old_full_dev
-
-To run tests,
-
-.. code:: none
-
-    bash run/blast.run.sh old_test
-
-And finally, to build the docs locally,
-
-.. code:: none
-
-    bash run/blast.run.sh old_docs
-
-But be warned, I will remove this at some point. So getting the most recent
-version of docker installed is the best solution.

docker/docker-compose.old.docs.yml

@@ -17,5 +17,7 @@ WEB_APP_HOST = app
 WEB_SERVER_HOST = nginx
 FLOWER_HOST = flower
 
+SPS_HOME = /fsps
+
 #blast image
 BLAST_IMAGE = blast_base

docker/docker-compose.old.full_dev.yml

@@ -33,5 +33,9 @@ WEB_APP_HOST = app
 WEB_SERVER_HOST = nginx
 FLOWER_HOST = flower
 
+SPS_HOME = /fsps
+
 #blast image
 BLAST_IMAGE = blast_latest
+
+FSPS_VOLUME = data/fsps/

docker/docker-compose.old.slim_dev.yml

@@ -1,12 +1,9 @@
 #!/bin/env bash
 bash app/entrypoints/clean_data.sh
+bash run/get_fsps_files.sh
 
 case "$1" in
       test) docker compose --profile $1 --project-name blast -f docker/docker-compose.yml --env-file env/.env.dev up --build --exit-code-from app_test;;
         ci) docker compose --profile $1 --project-name blast -f docker/docker-compose.yml --env-file env/.env.ci up --build --exit-code-from app_ci;;
-      old_slim_dev) docker compose --project-name blast -f docker/docker-compose.old.slim_dev.yml --env-file env/.env.dev up --build;;
-      old_full_dev) docker compose --project-name blast -f docker/docker-compose.old.full_dev.yml --env-file env/.env.dev up --build;;
-      old_test) docker compose --project-name blast -f docker/docker-compose.old.test.yml --env-file env/.env.dev up --build --exit-code-from app_test;;
-      old_docs) docker compose --project-name blast -f docker/docker-compose.old.docs.yml up --build;;
          *) docker compose --profile $1 --project-name blast -f docker/docker-compose.yml --env-file env/.env.dev up --build;;
 esac

docs/dev_faqs.rst

@@ -0,0 +1,9 @@
+#!/bin/env bash
+
+if [[ -f data/fsps/README.md ]]
+then
+    echo "fsps files already downloaded"
+else
+  echo "downloading fsps files"
+  git clone https://github.com/cconroy20/fsps.git data/fsps
+fi