Merge pull request #492 from ExoCTK/optimize_contam

Optimize contam tool

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 name: ExoCTK CI
 
-on: [push, pull_request]
+on: [pull_request]
 
 jobs:
 
@@ -12,7 +12,7 @@ jobs:
       max-parallel: 5
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.8, 3.9]
 
     steps:
       - uses: actions/checkout@v2
@@ -42,12 +42,7 @@ jobs:
           echo " "
           echo "Installing exoctk package"
           echo " "
-          python setup.py develop
-
-          # echo " "
-          # echo "Reinstall numpy to fix numpy.core.multiarray error"
-          # echo " "
-          pip install -U numpy
+          python setup.py develop --no-deps
 
           echo " "
           echo "Testing package installation"

.rtd-environment.yml

@@ -1,6 +1,9 @@
 channels:
     - astropy
 
+python:
+  version: 3.8
+
 dependencies:
     - astropy
     - matplotlib

ci/setup_conda_env.sh

@@ -1,9 +1,4 @@
 #!/bin/bash
-echo "Creating base conda environment for Python $PYTHON_VERSION"
-conda create --yes --prefix /home/travis/envs python=$PYTHON_VERSION
-conda activate /home/travis/envs
-conda install sphinx numpy flask
-
 echo "Creating ExoCTK conda environment for Python $PYTHON_VERSION"
 conda env update -f "env/environment-${PYTHON_VERSION}.yml" || exit 1
 export CONDA_ENV=exoctk-$PYTHON_VERSION

env/environment-3.8.yml

@@ -4,47 +4,47 @@ channels:
   - http://ssb.stsci.edu/astroconda
 dependencies:
   - astropy<4.1
-  - bokeh=2.3.3
+  - bokeh=2.3.0
   - boto3
-  - cython=0.29.24
+  - cython=0.29.22
   - docopt=0.6.2
-  - docutils=0.17.1
+  - docutils=0.16
   - flake8=3.9.0
   - flask=1.1.2
   - gunicorn=20.1.0
-  - h5py=3.6.0
-  - ipython=7.29.0
+  - h5py=2.10.0
+  - ipython=7.22.0
   - jupyter=1.0.0
   - matplotlib=3.3.4
   - numpy=1.19.2
   - numpydoc=1.1.0
-  - pandas=1.3.2
+  - pandas=1.2.3
   - paramiko=2.7.2
   - pip=20.3.3
-  - pytest=6.2.4
+  - pytest=6.2.3
   - python=3.8.5
   - pyyaml
   - scipy=1.6.2
-  - scp=0.14.1
-  - sphinx=4.2.0
-  - sqlalchemy=1.4.27
-  - twine=3.2.0
+  - scp=0.13.3
+  - sphinx=3.5.3
+  - sqlalchemy=1.3.23
   - wtforms=2.3.3
   - pip:
-    - asteval==0.9.25
+    - asteval==0.9.22
     - awscli
-    - bandit==1.7.1
+    - bandit==1.7.0
     - batman-package==2.4.8
     - bibtexparser==1.2.0
     - corner==2.2.1
-    - ddtrace==0.57.0
-    - flask_wtf==1.0.0
-    - lmfit==1.0.2
-    - platon==4.0
+    - flask_wtf==0.14.3
+    - hotsoss==0.1.8
+    - platon==5.1.2
     - pysiaf==0.10.0
-    - pysynphot==2.0.0
-    - sphinx_astropy==1.6.0
+    - pysynphot==1.0.0
+    - pyvo==1.1
+    - regions==0.5
+    - sphinx_astropy==1.3
     - svo-filters==0.4.1
-    - werkzeug>=2.0
+    - werkzeug==0.16.1
     - git+https://github.com/spacetelescope/jwst_gtvt.git@cd6bc76f66f478eafbcc71834d3e735c73e03ed5
     - git+https://github.com/astropy/astroquery.git@ccc96185beeff86f3a12a31a00a801afcebe1dbe

env/environment-3.9.yml

@@ -4,46 +4,48 @@ channels:
   - http://ssb.stsci.edu/astroconda
 dependencies:
   - astropy=4.2
-  - bokeh=2.3.3
+  - bokeh=2.3.0
   - boto3
   - cython=0.29.22
   - docopt=0.6.2
   - flake8=3.9.0
   - flask=1.1.2
-  - h5py=3.6.0
-  - ipython=7.29.0
+  - h5py=2.10.0
+  - ipython=7.22.0
   - jupyter=1.0.0
   - matplotlib=3.3.4
   - numpy=1.19.2
   - numpydoc=1.1.0
-  - pandas=1.3.2
+  - pandas=1.2.3
   - paramiko=2.7.2
   - pip=20.3.3
-  - pytest=6.2.4
+  - pytest=6.2.3
   - python=3.9.1
   - pyyaml
   - scipy=1.6.2
-  - scp=0.14.1
-  - sphinx=4.2.0
-  - sqlalchemy=1.4.27
-  - twine=3.2.0
+  - scp=0.13.3
+  - sphinx=3.5.3
+  - sqlalchemy=1.3.23
   - wtforms=2.3.3
   - pip:
-    - asteval==0.9.25
+    - asteval==0.9.22
     - awscli
-    - bandit==1.7.1
+    - bandit==1.7.0
     - batman-package==2.4.8
     - bibtexparser==1.2.0
     - corner==2.2.1
-    - ddtrace==0.57.0
-    - docutils==0.17.1
-    - flask_wtf==1.0.0
+    - docutils==0.15.2
+    - flask_wtf==0.14.3
+    - hotsoss==0.1.8
     - gunicorn==20.0.4
-    - platon==5.3
+    - platon==5.1.2
+    - pyerfa>=1.7
     - pysiaf==0.10.0
-    - pysynphot==2.0.0
-    - sphinx_astropy==1.6.0
+    - pysynphot==1.0.0
+    - pyvo==1.1
+    - regions==0.5
+    - sphinx_astropy==1.3
     - svo-filters==0.4.1
-    - werkzeug>=2.0
+    - werkzeug==0.16.1
     - git+https://github.com/spacetelescope/jwst_gtvt.git@cd6bc76f66f478eafbcc71834d3e735c73e03ed5
     - git+https://github.com/astropy/astroquery.git@ccc96185beeff86f3a12a31a00a801afcebe1dbe

exoctk/contam_visibility/__init__.py

@@ -6,7 +6,6 @@
 from . import ephemeris_old2x
 from . import visibilityPA
 from . import contamination_figure
-from . import resolve
 from . import time_extensionsx
 from . import f_visibilityPeriods
 from . import quaternionx