diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml deleted file mode 100644 index 573bc99f..00000000 --- a/.github/workflows/python-package-conda.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Goodman Pipeline with Conda - -on: [push] - -jobs: - build-linux: - runs-on: ubuntu-latest - strategy: - max-parallel: 5 - - steps: - - uses: actions/checkout@v2 - - name: Set up Python 3.8 - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Install dependencies - run: | - # $CONDA is an environment variable pointing to the root of the miniconda directory - $CONDA/bin/conda env update --file environment.yml --name base - - name: Compile DCR Binaries - run: | - SOURCE_DIR=${{ github.workspace }}/goodman_pipeline/data/dcr-source/dcr - make --directory $SOURCE_DIR - chmod +x $SOURCE_DIR/dcr - echo "${{ github.workspace }}/goodman_pipeline/data/dcr-source/dcr" >> $GITHUB_PATH - - name: Lint with flake8 - run: | - $CONDA/bin/conda install flake8 - # stop the build if there are Python syntax errors or undefined names - $CONDA/bin/flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics - # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide - $CONDA/bin/flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - - name: Test with pytest - run: | - conda install pytest - $CONDA/bin/pytest diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 6303225c..44d48d9c 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.6, 3.7, 3.8] + python-version: ['3.8', '3.9', '3.10', '3.11'] steps: - uses: actions/checkout@v2 diff --git a/.readthedocs.yml b/.readthedocs.yml index 25f53d60..26a861e2 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -5,10 +5,8 @@ sphinx: formats: all - - python: - version: 3.5 + version: 3.8 install: - method: pip path: . diff --git a/README.md b/README.md index aa2b39f8..08739684 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Goodman High Throughput Spectrograph Data Reduction Pipeline -![Goodman Pipeline](https://github.com/soar-telescope/goodman_pipeline/workflows/Goodman%20Pipeline/badge.svg?branch=master) +![Goodman Pipeline](https://github.com/soar-telescope/goodman_pipeline/actions/workflows/python-package.yml/badge.svg) [![codecov](https://codecov.io/gh/soar-telescope/goodman_pipeline/branch/main/graph/badge.svg)](https://codecov.io/gh/soar-telescope/goodman_pipeline) [![Documentation Status](https://readthedocs.org/projects/goodman/badge/?version=latest)](http://goodman.readthedocs.io/en/latest/?badge=latest) [![pypi](https://img.shields.io/pypi/v/goodman_pipeline.svg?style=flat)](https://pypi.org/project/goodman-pipeline/) diff --git a/docs/conf.py b/docs/conf.py index dca3b47a..a53eb39a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -109,7 +109,7 @@ # # html_theme = 'bootstrap-astropy' -html_theme = 'sphinx_rtd_theme' +html_theme = 'pydata_sphinx_theme' html_logo = '_static/soar_logo.png' diff --git a/docs/index.rst b/docs/index.rst index 646eda36..aef89d96 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -12,7 +12,7 @@ Welcome to the Goodman HTS Pipeline Documentation ================================================= -.. image:: https://github.com/soar-telescope/goodman_pipeline/workflows/Goodman%20Pipeline/badge.svg?branch=master +.. image:: https://github.com/soar-telescope/goodman_pipeline/actions/workflows/python-package.yml/badge.svg :alt: Goodman Pipeline .. image:: https://codecov.io/gh/soar-telescope/goodman_pipeline/branch/main/graph/badge.svg :target: https://codecov.io/gh/soar-telescope/goodman_pipeline @@ -25,10 +25,6 @@ Welcome to the Goodman HTS Pipeline Documentation :target: http://www.astropy.org/ -.. image:: https://img.shields.io/lgtm/alerts/g/soar-telescope/goodman_pipeline.svg?logo=lgtm&logoWidth=18 - :target: https://lgtm.com/projects/g/soar-telescope/goodman_pipeline/alerts/ -.. image:: https://img.shields.io/lgtm/grade/python/g/soar-telescope/goodman_pipeline.svg?logo=lgtm&logoWidth=18 - :target: https://lgtm.com/projects/g/soar-telescope/goodman_pipeline/context:python This is the User Manual for the *Goodman Spectroscopic Data Reduction Pipeline*. It provides an overview of the pipeline's main features, diff --git a/environment.yml b/environment.yml index 59f5de01..bed43dbe 100644 --- a/environment.yml +++ b/environment.yml @@ -1,6 +1,6 @@ name: goodman_pipeline dependencies: - - python=3.8 + - python - numpy - pandas - matplotlib @@ -11,6 +11,7 @@ dependencies: - pip: - ccdproc - coveralls + - pydata-sphinx-theme - astroplan - mock - sphinx