Merge pull request #577 from ExoCTK/develop

Merge v1.2.5 into master

.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.9', '3.10', '3.11']
 
     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"

.pyup.yml

@@ -29,7 +29,7 @@ search: True
 # default: empty
 # allowed: list
 requirements:
-  - pip_requirements.txt:
+  - requirements.txt:
       # update all dependencies and pin them
       update: all
       pin: True
@@ -38,7 +38,7 @@ requirements:
 # requires private repo permissions, even on public repos
 # default: empty
 assignees:
-  - bourque
+  - hover2pi
 
 # configure the branch prefix the bot is using
 # default: pyup-

.readthedocs.yaml

@@ -0,0 +1,29 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.9"
+    # You can also specify other tool versions:
+    # nodejs: "19"
+    # rust: "1.64"
+    # golang: "1.19"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+   configuration: docs/conf.py
+
+# If using Sphinx, optionally build your docs in additional formats such as PDF
+# formats:
+#    - pdf
+
+# Optionally declare the Python requirements required to build your docs
+python:
+   install:
+   - requirements: requirements.txt

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.10.yml

@@ -0,0 +1,52 @@
+name: exoctk-3.10
+channels:
+  - conda-forge
+  - defaults
+dependencies:
+  - astropy>=5.3.1
+  - bokeh>=3.2.2
+  - cython>=0.29.35
+  - docopt>=0.6.2
+  - docutils>=0.16
+  - flake8>=6.0.0
+  - flask>=2.2.2
+  - ipython>=8.12.0
+  - jupyter>=1.0.0
+  - matplotlib>=3.7.1
+  - numpydoc>=1.5.0
+  - pandas>=2.0.3
+  - paramiko>=2.8.1
+  - pip>=23.1.2
+  - pytest>=7.3.1
+  - python=3.10.11
+  - pyyaml>=6.0.0
+  - scp>=0.14.1
+  - sphinx>=5.0.2
+  - sqlalchemy>=1.4.39
+  - wtforms>=2.3.3
+  - pip:
+    - asteval>=0.9.31
+    - awscli>=1.29.4
+    - bandit>=1.7.5
+    - batman-package>=2.4.8
+    - bibtexparser>=1.4.0
+    - boto3>=1.28.5
+    - corner>=2.2.2
+    - docutils>=0.16
+    - flask_wtf>=1.1.1
+    - h5py>=3.9.0
+    - hotsoss>=0.1.9
+    - gunicorn>=21.1.0
+    - numpy>=1.25.1
+    - platon>=5.4
+    - pyerfa>=2.0.0
+    - pysiaf>=0.20.0
+    - pysynphot>=2.0.0
+    - pyvo>=1.4.1
+    - regions>=0.7
+    - scipy>=1.11.1
+    - sphinx_astropy>=1.9.1
+    - svo-filters>=0.4.4
+    - werkzeug==2.0.3
+    - jwst_gtvt>=1.0.0
+    - astroquery>=0.4.6

env/environment-3.11.yml

@@ -0,0 +1,52 @@
+name: exoctk-3.11
+channels:
+  - conda-forge
+  - defaults
+dependencies:
+  - astropy>=5.3.1
+  - bokeh>=3.2.2
+  - cython>=0.29.35
+  - docopt>=0.6.2
+  - docutils>=0.16
+  - flake8>=6.0.0
+  - flask>=2.2.2
+  - ipython>=8.12.0
+  - jupyter>=1.0.0
+  - matplotlib>=3.7.1
+  - numpydoc>=1.5.0
+  - pandas>=2.0.3
+  - paramiko>=2.8.1
+  - pip>=23.1.2
+  - pytest>=7.3.1
+  - python=3.11.0
+  - pyyaml>=6.0.0
+  - scp>=0.14.1
+  - sphinx>=5.0.2
+  - sqlalchemy>=1.4.39
+  - wtforms>=2.3.3
+  - pip:
+    - asteval>=0.9.31
+    - awscli>=1.29.4
+    - bandit>=1.7.5
+    - batman-package>=2.4.8
+    - bibtexparser>=1.4.0
+    - boto3>=1.28.5
+    - corner>=2.2.2
+    - docutils>=0.16
+    - flask_wtf>=1.1.1
+    - h5py>=3.9.0
+    - hotsoss>=0.1.9
+    - gunicorn>=21.1.0
+    - numpy>=1.25.1
+    - platon>=5.4
+    - pyerfa>=2.0.0
+    - pysiaf>=0.20.0
+    - pysynphot>=2.0.0
+    - pyvo>=1.4.1
+    - regions>=0.7
+    - scipy>=1.11.1
+    - sphinx_astropy>=1.9.1
+    - svo-filters>=0.4.4
+    - werkzeug==2.0.3
+    - jwst_gtvt>=1.0.0
+    - astroquery>=0.4.6