Update STIPS for version 2.0 release

.github/workflows/ci_workflows.yml

@@ -14,14 +14,6 @@ jobs:
       matrix:
         include:
 
-#          - name: Python 2.7
-#            os: ubuntu-latest
-#            python: 2.7
-
-          - name: Python 3.7
-            os: ubuntu-latest
-            python: 3.7
-
           - name: Python 3.8
             os: ubuntu-latest
             python: 3.8
@@ -30,13 +22,13 @@ jobs:
             os: ubuntu-latest
             python: 3.9
 
-          - name: Python 3.8 Mac
+          - name: Python 3.9 Mac
             os: macos-latest
-            python: 3.8
+            python: 3.9
 
           - name: Python Long
             os: ubuntu-latest
-            python: 3.8
+            python: 3.9
 
     steps:
     - name: Checkout code
@@ -50,26 +42,6 @@ jobs:
         environment-file: environment.yml
         python-version: ${{ matrix.python }}
         auto-activate-base: false
-#    - name: Install Required Data
-#      shell: bash -l {0}
-#      run: |
-#        export TEST_DATA=${HOME}/test_data
-#        mkdir -p ${TEST_DATA}
-#        wget https://stsci.box.com/shared/static/4nebx2ndxr7c77lgocfbvxo7c2hyd3in.tgz -O ${TEST_DATA}/stips_data_current.tar.gz
-#        tar -xzvf ${TEST_DATA}/stips_data_current.tar.gz -C ${TEST_DATA}
-#        mkdir -p ${TEST_DATA}/synphot
-#        wget -qO- https://ssb.stsci.edu/trds/tarfiles/synphot1.tar.gz -O ${TEST_DATA}/synphot1.tar.gz
-#        tar -xzvf ${TEST_DATA}/synphot1.tar.gz -C ${TEST_DATA}/synphot/
-#        wget -qO- https://ssb.stsci.edu/trds/tarfiles/synphot2.tar.gz -O ${TEST_DATA}/synphot2.tar.gz
-#        tar -xzvf ${TEST_DATA}/synphot2.tar.gz -C ${TEST_DATA}/synphot/
-#        wget -qO- https://ssb.stsci.edu/trds/tarfiles/synphot5.tar.gz -O ${TEST_DATA}/synphot5.tar.gz
-#        tar -xzvf ${TEST_DATA}/synphot5.tar.gz -C ${TEST_DATA}/synphot/
-#        wget -qO- https://ssb.stsci.edu/trds/tarfiles/synphot6.tar.gz -O ${TEST_DATA}/synphot6.tar.gz
-#        tar -xzvf ${TEST_DATA}/synphot6.tar.gz -C ${TEST_DATA}/synphot/
-#        wget -qO- https://stsci.box.com/shared/static/7voehzi5krrpml5wgyg8bo954ew7arh2.gz -O ${TEST_DATA}/pandeia_data-1.5.2rc2_roman.gz
-#        tar -xzvf ${TEST_DATA}/pandeia_data-1.5.2rc2_roman.gz -C ${TEST_DATA}
-#        wget -qO- https://stsci.box.com/shared/static/qcptcokkbx7fgi3c00w2732yezkxzb99.gz -O ${TEST_DATA}/webbpsf_data.gz
-#        tar -xzvf ${TEST_DATA}/webbpsf_data.gz -C ${TEST_DATA}
     - name: Test with tox
       shell: bash -l {0}
       if: ${{ matrix.name != 'Python Long' }}
@@ -94,7 +66,7 @@ jobs:
       with:
         activate-environment: stips
         environment-file: environment.yml
-        python-version: 3.7
+        python-version: 3.9
         auto-activate-base: false
     - name: Build Docs
       shell: bash -l {0}

CHANGES.rst

@@ -3,7 +3,19 @@ Release Notes
 #############
 
 Version History and Change Log
--------------------------------
+------------------------------
+
+Version 2.0.0
+=============
+
+- STIPS now uses an ePSF, and calculates source appearance on a per-source basis
+- Dropped support for python 2, and python <= 3.7
+- Dropped support for HST and JWST instruments
+- Dropped support for jbt background tool, as its results are JWST-specific
+- Updated pandeia to 1.7
+- Updated webbpsf to 1.0.0
+- Dropped astropy helpers code
+
 
 Version 1.0.8
 =============

Dockerfile

@@ -1,20 +1,13 @@
 FROM continuumio/miniconda3
 MAINTAINER Space Telescope Science Institute <[email protected]>
 
-# RUN "sh" "-c" "echo nameserver 8.8.8.8 >> /etc/resolv.conf"
-# RUN "sh" "-c" "echo forcing APT update"
-
-
 #########
 # Setup #
 #########
 
 ENV HOME /root
 WORKDIR $HOME
 
-# Place to store data and source
-RUN mkdir -p /opt
-
 # Clone STScI-STIPS
 RUN git clone https://github.com/spacetelescope/STScI-STIPS.git
 ENV STIPSDIR $HOME/STScI-STIPS
@@ -23,104 +16,17 @@ ENV STIPSDIR $HOME/STScI-STIPS
 # Basic apt Requirements #
 ##########################
 
-WORKDIR $HOME
-
-RUN apt-get update
-RUN apt-get install -y python3.7
-RUN apt-get install -y python-pip
-RUN apt-get install -y wget
-
-# matplotlib requirement
-RUN apt-get install -y pkg-config
-RUN apt-get install -y libfreetype6-dev
-RUN apt-get install -y rsync
-RUN apt-get install -y git
-
-# SciPy
-RUN apt-get install -y libblas-dev
-RUN apt-get install -y liblapack-dev
-RUN apt-get install -y gfortran
-
-# Update pip
-RUN pip install -U pip
-RUN pip install -U setuptools
+WORKDIR $STIPSDIR
 
+RUN conda env create -f environment.yml
+RUN echo "conda activate stips" >> ~/.bashrc
+SHELL ["/bin/bash", "--login", "-c"]
 
 ##################
 # Reference Data #
 ##################
 
-# Install reference data under /opt
-
-WORKDIR /opt
-
-# Extract STIPS reference data
-RUN wget -qO- https://stsci.box.com/shared/static/4nebx2ndxr7c77lgocfbvxo7c2hyd3in.tgz | tar xvz
-ENV stips_data /opt/stips_data
-
-# Extract PySynphot reference data
-RUN wget -qO- https://ssb.stsci.edu/trds/tarfiles/synphot1.tar.gz | tar xvz
-RUN wget -qO- https://ssb.stsci.edu/trds/tarfiles/synphot2.tar.gz | tar xvz
-RUN wget -qO- https://ssb.stsci.edu/trds/tarfiles/synphot5.tar.gz | tar xvz
-RUN wget -qO- https://ssb.stsci.edu/trds/tarfiles/synphot6.tar.gz | tar xvz
-ENV PYSYN_CDBS /opt/grp/hst/cdbs
-
-# Extract Pandeia reference data
-RUN wget -qO- https://stsci.box.com/shared/static/7voehzi5krrpml5wgyg8bo954ew7arh2.gz | tar -xvz
-ENV pandeia_refdata /opt/pandeia_data-1.5.2rc2_roman
-
-# Extract WebbPSF reference data
-# (note: version number env vars are declared close to where they are used
-# to prevent unnecessary rebuilds of the Docker image)
-ENV WEBBPSF_DATA_VERSION 0.9.0
-RUN wget -qO- https://stsci.box.com/shared/static/qcptcokkbx7fgi3c00w2732yezkxzb99.gz | tar xvz
-ENV WEBBPSF_PATH /opt/webbpsf-data
-
-# Prepare environment variables
-ENV PYHOME /opt/conda
-ENV PYTHON_VERSION 3.7
-ENV PATH $HOME/bin:$PATH
-ENV LD_LIBRARY_PATH $HOME/lib:$LD_LIBRARY_PATH
-
-
-########################################
-# Setup Conda and Install Requirements #
-########################################
-
-WORKDIR $HOME
-
-#RUN conda env update --file $STIPSDIR/environment.yml
-RUN conda env create -f $STIPSDIR/environment.yml
-ENV PATH /opt/conda/envs/stips/bin:$PATH
-RUN echo "conda activate stips" >> /root/.bashrc
-ENV CONDA_DEFAULT_ENV stips
-
-# Prepare environment variables
-ENV WEBBPSF_SKIP_CHECK 1
-
-
-##############################
-# Install Other Requirements #
-##############################
-
 WORKDIR $HOME
 
-# Montage
-WORKDIR /opt
-RUN git clone https://github.com/Caltech-IPAC/Montage.git
-# ADD initdistdata.c ./Montage/lib/src/two_plane_v1.1/initdistdata.c
-WORKDIR /opt/Montage
-RUN make
-RUN pip install montage-wrapper
-ENV PATH /opt/Montage/bin:$PATH
-WORKDIR $HOME
-
-
-#################
-# Install STIPS #
-#################
-
-WORKDIR $STIPSDIR
-RUN python setup.py develop
-
-WORKDIR $HOME
+RUN echo -e "import stips\nstips.DownloadReferenceData()" >> activate_stips.py
+RUN python activate_stips.py