From 95b0d0ce29595852944e2dc1b06929657314748c Mon Sep 17 00:00:00 2001 From: Simon Torres Date: Tue, 26 Jan 2021 16:24:53 -0300 Subject: [PATCH 1/3] moved all test from subpackages to single location along main package, created tox.ini and pyproject.toml --- .gitignore | 4 + goodman_pipeline/core/tests/__init__.py | 1 - goodman_pipeline/images/tests/__init__.py | 1 - .../spectroscopy/tests/__init__.py | 1 - goodman_pipeline/tests/__init__.py | 0 .../{core => }/tests/test_ccdproc.py | 0 .../{core => }/tests/test_check_version.py | 0 .../{core => }/tests/test_core.py | 114 +++++++++--------- .../tests/test_data_classifier.py | 2 +- .../{images => }/tests/test_goodman_ccd.py | 2 +- .../tests/test_image_processor.py | 6 +- .../tests/test_night_organizer.py | 2 +- .../{spectroscopy => }/tests/test_redspec.py | 6 +- .../tests/test_wavelength.py | 8 +- .../test_wcs_functional.py} | 2 +- .../test_wcs_unittest.py} | 2 +- goodman_pipeline/version.py | 2 +- goodman_pipeline/wcs/tests/__init__.py | 1 - pyproject.toml | 7 ++ setup.cfg | 22 +++- setup.py | 3 +- tox.ini | 108 +++++++++++++++++ 22 files changed, 215 insertions(+), 79 deletions(-) delete mode 100644 goodman_pipeline/core/tests/__init__.py delete mode 100644 goodman_pipeline/images/tests/__init__.py delete mode 100644 goodman_pipeline/spectroscopy/tests/__init__.py create mode 100644 goodman_pipeline/tests/__init__.py rename goodman_pipeline/{core => }/tests/test_ccdproc.py (100%) rename goodman_pipeline/{core => }/tests/test_check_version.py (100%) rename goodman_pipeline/{core => }/tests/test_core.py (96%) rename goodman_pipeline/{images => }/tests/test_data_classifier.py (99%) rename goodman_pipeline/{images => }/tests/test_goodman_ccd.py (86%) rename goodman_pipeline/{images => }/tests/test_image_processor.py (85%) rename goodman_pipeline/{images => }/tests/test_night_organizer.py (99%) rename goodman_pipeline/{spectroscopy => }/tests/test_redspec.py (97%) rename goodman_pipeline/{spectroscopy => }/tests/test_wavelength.py (97%) rename goodman_pipeline/{wcs/tests/test_functional.py => tests/test_wcs_functional.py} (99%) rename goodman_pipeline/{wcs/tests/test_unittest.py => tests/test_wcs_unittest.py} (99%) delete mode 100644 goodman_pipeline/wcs/tests/__init__.py create mode 100644 pyproject.toml create mode 100644 tox.ini diff --git a/.gitignore b/.gitignore index c1df247d..e8d5b918 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,7 @@ docs/_build/* goodman_pipeline/data/dcr-source/dcr goodman_pipeline/data/dcr-source/*.o /dev-tools/ +.tox/* +.tmp/* +.eggs/* +.cache/* \ No newline at end of file diff --git a/goodman_pipeline/core/tests/__init__.py b/goodman_pipeline/core/tests/__init__.py deleted file mode 100644 index c3961685..00000000 --- a/goodman_pipeline/core/tests/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from __future__ import absolute_import diff --git a/goodman_pipeline/images/tests/__init__.py b/goodman_pipeline/images/tests/__init__.py deleted file mode 100644 index 3be6bd29..00000000 --- a/goodman_pipeline/images/tests/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from __future__ import absolute_import \ No newline at end of file diff --git a/goodman_pipeline/spectroscopy/tests/__init__.py b/goodman_pipeline/spectroscopy/tests/__init__.py deleted file mode 100644 index 3be6bd29..00000000 --- a/goodman_pipeline/spectroscopy/tests/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from __future__ import absolute_import \ No newline at end of file diff --git a/goodman_pipeline/tests/__init__.py b/goodman_pipeline/tests/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/goodman_pipeline/core/tests/test_ccdproc.py b/goodman_pipeline/tests/test_ccdproc.py similarity index 100% rename from goodman_pipeline/core/tests/test_ccdproc.py rename to goodman_pipeline/tests/test_ccdproc.py diff --git a/goodman_pipeline/core/tests/test_check_version.py b/goodman_pipeline/tests/test_check_version.py similarity index 100% rename from goodman_pipeline/core/tests/test_check_version.py rename to goodman_pipeline/tests/test_check_version.py diff --git a/goodman_pipeline/core/tests/test_core.py b/goodman_pipeline/tests/test_core.py similarity index 96% rename from goodman_pipeline/core/tests/test_core.py rename to goodman_pipeline/tests/test_core.py index 0095761d..8f75143e 100644 --- a/goodman_pipeline/core/tests/test_core.py +++ b/goodman_pipeline/tests/test_core.py @@ -21,62 +21,62 @@ logging.disable(logging.CRITICAL) # import all classes in core.py -from ..core import (GenerateDcrParFile, - NightDataContainer, - NoMatchFound, - NotEnoughLinesDetected, - NoTargetException, - ReferenceData, - SaturationValues, - SpectroscopicMode) +from goodman_pipeline.core.core import (GenerateDcrParFile, + NightDataContainer, + NoMatchFound, + NotEnoughLinesDetected, + NoTargetException, + ReferenceData, + SaturationValues, + SpectroscopicMode) # import of functions in core.py -from ..core import (astroscrappy_lacosmic, - add_linear_wavelength_solution, - add_wcs_keys, - bias_subtract, - bin_reference_data, - call_cosmic_rejection, - classify_spectroscopic_data, - combine_data, - convert_time, - create_master_bias, - create_master_flats, - cross_correlation, - dcr_cosmicray_rejection, - define_trim_section, - extraction, - extract_fractional_pixel, - extract_optimal, - evaluate_wavelength_solution, - fix_keywords, - fractional_sum, - get_best_flat, - get_central_wavelength, - get_lines_in_lamp, - get_overscan_region, - get_spectral_characteristics, - get_slit_trim_section, - get_twilight_time, - identify_targets, - image_overscan, - image_trim, - interpolate, - is_file_saturated, - linearize_spectrum, - name_master_flats, - normalize_master_flat, - ra_dec_to_deg, - read_fits, - record_trace_information, - save_extracted, - search_comp_group, - setup_logging, - trace, - trace_targets, - validate_ccd_region, - write_fits) +from goodman_pipeline.core.core import (astroscrappy_lacosmic, + add_linear_wavelength_solution, + add_wcs_keys, + bias_subtract, + bin_reference_data, + call_cosmic_rejection, + classify_spectroscopic_data, + combine_data, + convert_time, + create_master_bias, + create_master_flats, + cross_correlation, + dcr_cosmicray_rejection, + define_trim_section, + extraction, + extract_fractional_pixel, + extract_optimal, + evaluate_wavelength_solution, + fix_keywords, + fractional_sum, + get_best_flat, + get_central_wavelength, + get_lines_in_lamp, + get_overscan_region, + get_spectral_characteristics, + get_slit_trim_section, + get_twilight_time, + identify_targets, + image_overscan, + image_trim, + interpolate, + is_file_saturated, + linearize_spectrum, + name_master_flats, + normalize_master_flat, + ra_dec_to_deg, + read_fits, + record_trace_information, + save_extracted, + search_comp_group, + setup_logging, + trace, + trace_targets, + validate_ccd_region, + write_fits) def fake_subprocess_popen(*args, stdout, stderr): @@ -233,9 +233,9 @@ class ClassifySpectroscopicData(TestCase): def setUp(self): self.path = os.path.join( os.getcwd(), - 'goodman_pipeline/data/test_data/test_classify_spectroscopic'); + 'test_classify_spectroscopic') if not os.path.isdir(self.path): - os.mkdir(self.path) + os.makedirs(self.path) def tearDown(self): if os.path.isdir(self.path): @@ -1386,11 +1386,13 @@ def tearDown(self): self.assertFalse(os.path.isfile(norm_flat)) def test_get_best_flat(self): - # print(self.flat_name_base) + print(self.flat_name_base) + print(os.path.dirname(__file__)) master_flat, master_flat_name = get_best_flat( flat_name=self.flat_name_base, path=self.flat_path) + print(master_flat_name) self.assertIsInstance(master_flat, CCDData) self.assertEqual(os.path.basename(master_flat_name), self.reference_flat_name) diff --git a/goodman_pipeline/images/tests/test_data_classifier.py b/goodman_pipeline/tests/test_data_classifier.py similarity index 99% rename from goodman_pipeline/images/tests/test_data_classifier.py rename to goodman_pipeline/tests/test_data_classifier.py index 550b3835..5b3a5f02 100644 --- a/goodman_pipeline/images/tests/test_data_classifier.py +++ b/goodman_pipeline/tests/test_data_classifier.py @@ -9,7 +9,7 @@ from ccdproc import CCDData from unittest import TestCase, skip -from ..data_classifier import DataClassifier +from goodman_pipeline.images.data_classifier import DataClassifier class DataClassifierTests(TestCase): diff --git a/goodman_pipeline/images/tests/test_goodman_ccd.py b/goodman_pipeline/tests/test_goodman_ccd.py similarity index 86% rename from goodman_pipeline/images/tests/test_goodman_ccd.py rename to goodman_pipeline/tests/test_goodman_ccd.py index 91d62e1f..800f7728 100644 --- a/goodman_pipeline/images/tests/test_goodman_ccd.py +++ b/goodman_pipeline/tests/test_goodman_ccd.py @@ -1,7 +1,7 @@ from __future__ import absolute_import from unittest import TestCase, skip -from ..goodman_ccd import get_args, MainApp +from goodman_pipeline.images.goodman_ccd import get_args, MainApp class MainAppTest(TestCase): diff --git a/goodman_pipeline/images/tests/test_image_processor.py b/goodman_pipeline/tests/test_image_processor.py similarity index 85% rename from goodman_pipeline/images/tests/test_image_processor.py rename to goodman_pipeline/tests/test_image_processor.py index a787c60a..1923995d 100644 --- a/goodman_pipeline/images/tests/test_image_processor.py +++ b/goodman_pipeline/tests/test_image_processor.py @@ -4,9 +4,9 @@ from unittest import TestCase, skip from ccdproc import CCDData -from ...core import NightDataContainer -from ..image_processor import ImageProcessor -from ..goodman_ccd import get_args +from goodman_pipeline.core import NightDataContainer +from goodman_pipeline.images.image_processor import ImageProcessor +from goodman_pipeline.images.goodman_ccd import get_args import numpy as np diff --git a/goodman_pipeline/images/tests/test_night_organizer.py b/goodman_pipeline/tests/test_night_organizer.py similarity index 99% rename from goodman_pipeline/images/tests/test_night_organizer.py rename to goodman_pipeline/tests/test_night_organizer.py index 447c421d..e244f938 100644 --- a/goodman_pipeline/images/tests/test_night_organizer.py +++ b/goodman_pipeline/tests/test_night_organizer.py @@ -9,7 +9,7 @@ from ccdproc import CCDData from unittest import TestCase, skip -from ..night_organizer import NightOrganizer +from goodman_pipeline.images.night_organizer import NightOrganizer def create_fake_data(technique, instrument, path): diff --git a/goodman_pipeline/spectroscopy/tests/test_redspec.py b/goodman_pipeline/tests/test_redspec.py similarity index 97% rename from goodman_pipeline/spectroscopy/tests/test_redspec.py rename to goodman_pipeline/tests/test_redspec.py index 534c846c..0d55009e 100644 --- a/goodman_pipeline/spectroscopy/tests/test_redspec.py +++ b/goodman_pipeline/tests/test_redspec.py @@ -5,7 +5,7 @@ import shutil from unittest import TestCase -from ...spectroscopy.redspec import (get_args, MainApp) +from goodman_pipeline.spectroscopy.redspec import (get_args, MainApp) class TestArguments(TestCase): @@ -103,8 +103,8 @@ def test_destination_path_sysexit(self): def test_get_args(): - from ...spectroscopy.redspec import get_args - import argparse + # from ...spectroscopy.redspec import get_args + # import argparse arguments = ['--data-path', './', '--proc-path', './', '--search-pattern', 'test-pattern', diff --git a/goodman_pipeline/spectroscopy/tests/test_wavelength.py b/goodman_pipeline/tests/test_wavelength.py similarity index 97% rename from goodman_pipeline/spectroscopy/tests/test_wavelength.py rename to goodman_pipeline/tests/test_wavelength.py index e4b9ad3d..ef307f01 100644 --- a/goodman_pipeline/spectroscopy/tests/test_wavelength.py +++ b/goodman_pipeline/tests/test_wavelength.py @@ -10,11 +10,11 @@ from astropy.modeling import models, Model from ccdproc import CCDData from unittest import TestCase, skip -from ..wavelength import (WavelengthCalibration) +from goodman_pipeline.spectroscopy.wavelength import (WavelengthCalibration) -from ..redspec import get_args -from ...core import add_wcs_keys, write_fits -from ...core import ReferenceData, NoMatchFound +from goodman_pipeline.spectroscopy.redspec import get_args +from goodman_pipeline.core import add_wcs_keys, write_fits +from goodman_pipeline.core import ReferenceData, NoMatchFound class WavelengthCalibrationTests(TestCase): diff --git a/goodman_pipeline/wcs/tests/test_functional.py b/goodman_pipeline/tests/test_wcs_functional.py similarity index 99% rename from goodman_pipeline/wcs/tests/test_functional.py rename to goodman_pipeline/tests/test_wcs_functional.py index 706b0212..a6c25d0d 100644 --- a/goodman_pipeline/wcs/tests/test_functional.py +++ b/goodman_pipeline/tests/test_wcs_functional.py @@ -1,7 +1,7 @@ from __future__ import absolute_import from unittest import TestCase, skip -from ..wcs import WCS +from goodman_pipeline.wcs.wcs import WCS import numpy as np import os import re diff --git a/goodman_pipeline/wcs/tests/test_unittest.py b/goodman_pipeline/tests/test_wcs_unittest.py similarity index 99% rename from goodman_pipeline/wcs/tests/test_unittest.py rename to goodman_pipeline/tests/test_wcs_unittest.py index 746363bd..d496fabe 100644 --- a/goodman_pipeline/wcs/tests/test_unittest.py +++ b/goodman_pipeline/tests/test_wcs_unittest.py @@ -1,7 +1,7 @@ from __future__ import absolute_import from unittest import TestCase, skip -from ..wcs import WCS +from goodman_pipeline.wcs.wcs import WCS import numpy as np import os import re diff --git a/goodman_pipeline/version.py b/goodman_pipeline/version.py index a71579f8..58324900 100644 --- a/goodman_pipeline/version.py +++ b/goodman_pipeline/version.py @@ -1,2 +1,2 @@ # This is an automatic generated file please do not edit -__version__ = '1.3.2.dev1' \ No newline at end of file +__version__ = '1.3.2' \ No newline at end of file diff --git a/goodman_pipeline/wcs/tests/__init__.py b/goodman_pipeline/wcs/tests/__init__.py deleted file mode 100644 index c3961685..00000000 --- a/goodman_pipeline/wcs/tests/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from __future__ import absolute_import diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 00000000..21f01d0f --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,7 @@ +[build-system] + +requires = ["setuptools", + "setuptools_scm", + "wheel"] + +build-backend = 'setuptools.build_meta' \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index eea6a878..0c09bb86 100644 --- a/setup.cfg +++ b/setup.cfg @@ -22,6 +22,16 @@ license = BSD-3-Clause # url = edit_on_github = False github_project = soar-telescope/goodman_pipeline + +# version should be PEP440 compatible (http://www.python.org/dev/peps/pep-0440) +version = 1.3.2 + +[options] +zip_safe = False +include_package_data = True +packages = find: +python_requires = >=3.6 +setup_requires = setuptools_scm install_requires = numpy pandas @@ -31,5 +41,13 @@ install_requires = astropy ccdproc astroplan -# version should be PEP440 compatible (http://www.python.org/dev/peps/pep-0440) -version = 1.3.2 + +# [options.entry_points] +# console_scripts = +# astropy-package-template-example = packagename.example_mod:main + +[options.extras_require] +test = + requests +docs = + sphinx-astropy diff --git a/setup.py b/setup.py index 99f5b3d1..0a40b734 100644 --- a/setup.py +++ b/setup.py @@ -48,6 +48,7 @@ def create_version_py(packagename, version, source_dir='.'): # conf.read([os.path.join(os.path.dirname(__file__), '..', 'setup.cfg')]) conf.read([os.path.join(os.path.dirname(__file__), 'setup.cfg')]) metadata = dict(conf.items('metadata')) +options = dict(conf.items('options')) PACKAGENAME = metadata['package_name'] @@ -65,7 +66,7 @@ def create_version_py(packagename, version, source_dir='.'): AUTHOR_EMAIL = metadata['author_email'] -INSTALL_REQUIRES = metadata['install_requires'].split() +INSTALL_REQUIRES = options['install_requires'].split() # freezes version information in version.py create_version_py(PACKAGENAME, VERSION) diff --git a/tox.ini b/tox.ini new file mode 100644 index 00000000..aabc595c --- /dev/null +++ b/tox.ini @@ -0,0 +1,108 @@ +[tox] +envlist = + py{36,37,38}-test{,-alldeps,-devdeps}{,-cov} + py{36,37,38}-test-numpy{116,117,118} + py{36,37,38}-test-astropy{30,40,lts} + py{36,37,38}-test-external + build_docs + linkcheck + codestyle +requires = + setuptools >= 30.3.0 + pip >= 19.3.1 + requests +isolated_build = true +# indexserver = +# NIGHTLY = https://pypi.anaconda.org/scipy-wheels-nightly/simple + +[testenv] +# Suppress display of matplotlib plots generated during docs build +setenv = + MPLBACKEND=agg + # Disable the accelerate linear algebra library when running on macos as + # latest numpy versions do not work with it + # NPY_BLAS_ORDER= + # NPY_LAPACK_ORDER= + +# Pass through the following environment variables which may be needed for the CI +passenv = HOME WINDIR LC_ALL LC_CTYPE CC CI TRAVIS + +# Run the tests in a temporary directory to make sure that we don't import +# this package from the source tree +changedir = .tmp/{envname} + +# tox environments are constructed with so-called 'factors' (or terms) +# separated by hyphens, e.g. test-devdeps-cov. Lines below starting with factor: +# will only take effect if that factor is included in the environment name. To +# see a list of example environments that can be run, along with a description, +# run: +# +# tox -l -v +# +description = + run tests + alldeps: with all optional dependencies + devdeps: with the latest developer version of key dependencies + oldestdeps: with the oldest supported version of key dependencies + cov: and test coverage + numpy116: with numpy 1.16.* + numpy117: with numpy 1.17.* + numpy118: with numpy 1.18.* + astropy30: with astropy 3.0.* + astropy40: with astropy 4.0.* + astropylts: with the latest astropy LTS + external: with outside packages as dependencies + +# The following provides some specific pinnings for key packages +deps = + -rrequirements.txt + + pytest-cov + + numpy116: numpy==1.16.* + numpy117: numpy==1.17.* + numpy118: numpy==1.18.* + + astropy30: astropy==3.0.* + astropy40: astropy==4.0.* + astropylts: astropy==4.0.* + + # devdeps: :NIGHTLY:numpy + # devdeps: git+https://github.com/astropy/astropy.git#egg=astropy + + # external: asdf + # external: git+https://github.com/spacetelescope/jwst@stable + +# The following indicates which extras_require from setup.cfg will be installed +extras = + test + alldeps: all + +commands = + pip freeze + pytest {toxinidir}/goodman_pipeline + # !cov: pytest --pyargs goodman_pipeline {toxinidir}/docs {posargs} + # cov: pytest --pyargs goodman_pipeline {toxinidir}/docs --cov goodman_pipeline --cov-config={toxinidir}/setup.cfg {posargs} + +[testenv:build_docs] +changedir = docs +description = invoke sphinx-build to build the HTML docs +extras = docs +commands = + pip freeze + sphinx-build -W -b html . _build/html + +[testenv:linkcheck] +changedir = docs +description = check the links in the HTML docs +extras = docs +commands = + pip freeze + sphinx-build -W -b linkcheck . _build/html + +[testenv:codestyle] +skip_install = true +changedir = . +description = check code style, e.g. with flake8 +deps = flake8 +commands = flake8 goodman_pipeline --count --max-line-length=100 --select=E101,W191,W291,W292,W293,W391,E111,E112,E113,E502,E722,E901,E902 \ No newline at end of file From e1915c09cd04bb6e421740cf3a33fbcc9f32e446 Mon Sep 17 00:00:00 2001 From: Simon Torres Date: Tue, 26 Jan 2021 16:42:29 -0300 Subject: [PATCH 2/3] Removed .travis.yml file and build badges --- .travis.yml | 32 -------------------------------- README.md | 5 ++--- docs/index.rst | 4 ++-- 3 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ff7676f3..00000000 --- a/.travis.yml +++ /dev/null @@ -1,32 +0,0 @@ -language: python -python: -- '3.6' -- '3.7' -- '3.8' - -branches: - only: - - master - -install: - -- pip install -r requirements.txt - -# Run DCR installer -- ./travis_install_dcr.sh -- export "PATH=$(pwd)/goodman_pipeline/data/dcr-source/dcr:$PATH" - -# install -- python setup.py test -- python setup.py install - -script: -- pytest -- coverage run --branch --omit=/home/travis/virtualenv --source= setup.py test - -after_success: -- coveralls - -notifications: - slack: - secure: nXR+xnqukl9rkA5ckId4eZ3sZO0BoXKATrPtKRDn9E9NAmgq5MZYzVpfiBTk1hSjec7IuKQ4WCHvmvdbgu5HBUvhf8pjEbIFdVjkoK/UEIkXLYIHazEF7PQG+9fMwXzNrv7NluBrA6nR4uF//Hz8ZKC2i/RG0wL4YDn9sEZqNGaCJ7toTONYT4sAzoGyHKR5yq18TVM6+D/7NDq/QOYEW9JbGaEc6URhYFZNlgSSd6glaxnyO9htoAKHKuk2vT31FgNpjHZrR34Upaw7NtdvSXlIAJjY4CwEunzwo48vEG10ZQydLJavk9hZw0pdwt5weroJiAfx6+j0kkt0i19o5pU2DDWqRgDds05Wt71t1lkCxV77VhsU7s85nWOsBL8351pF6/RGbNhg9LUbSrGA5PIbUXkKnOyrok27cZHoKKaSltgkABeGZdq/GsMvcp2ubDHvgnPAxAfZSmBlwhqjK7ugob8+sLEWRKHxVY71hl+/TCNd1MDLbROrU5QpyqTBco6EdEKJAV3m59837GBIHqGWEI6kYLt8QJDbT2SLfnnRFT9p3NaiNdN8ODCWhGjFZjHe2igUlOTqq/Zvd81k5SWB3Ewah9y12oDuiCh1rFq8yVnXHX7n7NV1ZxKlrKbcyCj9klFY9/C6GSCebftFkIv3GlXn4Lr4gWu3l0TmdAw= diff --git a/README.md b/README.md index 92a104b5..86076d14 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,12 @@ # Goodman High Throughput Spectrograph Data Reduction Pipeline -[![Build Status](https://travis-ci.org/soar-telescope/goodman_pipeline.svg?branch=master)](https://travis-ci.org/soar-telescope/goodman_pipeline) +![Goodman Pipeline](https://github.com/soar-telescope/goodman_pipeline/workflows/Goodman%20Pipeline/badge.svg?branch=master) [![Coverage Status](https://coveralls.io/repos/github/soar-telescope/goodman_pipeline/badge.svg?branch=master)](https://coveralls.io/github/soar-telescope/goodman_pipeline?branch=master) [![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/) [![astropy](http://img.shields.io/badge/powered%20by-AstroPy-orange.svg?style=flat)](http://www.astropy.org/) -![Goodman Pipeline](https://github.com/soar-telescope/goodman_pipeline/workflows/Goodman%20Pipeline/badge.svg?branch=master) -![Goodman Pipeline with Conda](https://github.com/soar-telescope/goodman_pipeline/workflows/Goodman%20Pipeline%20with%20Conda/badge.svg) + ![Upload to PYPI](https://github.com/soar-telescope/goodman_pipeline/workflows/Upload%20to%20PYPI/badge.svg) ## Overview diff --git a/docs/index.rst b/docs/index.rst index 07213b62..9a217382 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -12,8 +12,8 @@ Welcome to the Goodman HTS Pipeline Documentation ================================================= -.. image:: https://travis-ci.org/soar-telescope/goodman_pipeline.svg?branch=master - :target: https://travis-ci.org/soar-telescope/goodman_pipeline +.. image:: https://github.com/soar-telescope/goodman_pipeline/workflows/Goodman%20Pipeline/badge.svg?branch=master + :alt: Goodman Pipeline .. image:: https://coveralls.io/repos/github/soar-telescope/goodman_pipeline/badge.svg?branch=master :target: https://coveralls.io/github/soar-telescope/goodman_pipeline?branch=master .. image:: https://readthedocs.org/projects/goodman/badge/?version=latest From 1b72c91075a8bbc2363b70775eb7904e8d30a913 Mon Sep 17 00:00:00 2001 From: Simon Torres Date: Tue, 26 Jan 2021 16:50:40 -0300 Subject: [PATCH 3/3] Added reference lamp library link --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 86076d14..cc6a2eb0 100644 --- a/README.md +++ b/README.md @@ -50,8 +50,8 @@ open a [new Issue](https://github.com/soar-telescope/goodman_pipeline/issues/new We acknowledge the important contribution of [David Sanmartim](https://github.com/dsanmartim), who developed the initial incarnation of the redccd module. We thank [Tina Armond](https://github.com/tarmond) for her -invaluable help in adding calibrated comparison lamps to the library of -reference comparison lamps for wavelngth solution. +invaluable help in adding calibrated comparison lamps to the [library](https://goodman.readthedocs.io/projects/lamps/en/latest/) of +reference comparison lamps for wavelength solution. Our work would not be possible without the friendly work atmosphere at CTIO headquarters in La Serena, were we can interact with our SOAR and CTIO