diff --git a/.travis.yml b/.travis.yml index 06cd246..1698a85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,15 +55,6 @@ matrix: include: - # Try MacOS X, usually enough only to run from cron as hardly there are - # issues that are not picked up by a linux worker. We set language to - # 'c' since 'python' doesn't work on non-Linux platforms. - - os: osx - language: c - name: Python 3.7 with required dependencies - stage: Cron tests - env: PYTHON_VERSION=3.7 TOXENV=py37-test - # Do a regular build on Linux with Python 3.8, with cov # For Linux we use language: python to avoid using conda. - os: linux @@ -79,20 +70,6 @@ matrix: stage: Comprehensive tests env: TOXENV=build_docs - # Now try Astropy dev with the latest Python - - os: linux - python: 3.8 - name: Python 3.8 with developer version of astropy - stage: Comprehensive tests - env: TOXENV=py38-test-devdeps - - # And with an older Python, Astropy LTS, and the oldest supported Numpy - - os: linux - python: 3.6 - name: Python 3.6 astropy LTS and Numpy 1.16 - stage: Comprehensive tests - env: TOXENV=py36-test-astropylts-numpy116 - # Add a job that runs from cron only and tests against astropy dev and # numpy dev to give a change for early discovery of issues and feedback # for both developer teams. @@ -102,24 +79,6 @@ matrix: stage: Cron tests env: TOXENV=py38-test-devdeps - # Try on Windows. - - os: windows - language: c - name: Python 3.8 with required dependencies - stage: Comprehensive tests - env: PYTHON_VERSION=3.8 TOXENV=py38-test - - # Try other python versions and Numpy versions. Since we can assume that - # the Numpy developers have taken care of testing Numpy with different - # versions of Python, we can vary Python and Numpy versions at the same - # time. - - - os: linux - python: 3.7 - name: Python 3.7 with astropy 3.0 and Numpy 1.17 - stage: Comprehensive tests - env: TOXENV=py37-test-astropy30-numpy117 - # Do a code style check - os: linux python: 3.8 diff --git a/README.rst b/README.rst index 679e5b2..09494d4 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,13 @@ -Example atmospheric retrieval package -------------------------------------- +retrieval +--------- + +.. image:: https://travis-ci.com/bmorris3/retrieval.svg?branch=master + :target: https://travis-ci.com/bmorris3/retrieval + :alt: Testing Status + +.. image:: https://readthedocs.org/projects/retrieval/badge/?version=latest + :target: https://retrieval.readthedocs.io/en/latest/?badge=latest + :alt: Documentation Status .. image:: http://img.shields.io/badge/powered%20by-AstroPy-orange.svg?style=flat :target: http://www.astropy.org @@ -9,7 +17,7 @@ Example atmospheric retrieval package License ------- -This project is Copyright (c) Brett M. Morris, Chloe Fisher and licensed under +This project is Copyright (c) Brett M. Morris & Chloe Fisher and licensed under the terms of the BSD 3-Clause license. This package is based upon the `Astropy package template `_ which is licensed under the BSD 3-clause licence. See the licenses folder for @@ -20,30 +28,4 @@ Contributing ------------ We love contributions! retrieval is open source, -built on open source, and we'd love to have you hang out in our community. - -**Imposter syndrome disclaimer**: We want your help. No, really. - -There may be a little voice inside your head that is telling you that you're not -ready to be an open source contributor; that your skills aren't nearly good -enough to contribute. What could you possibly offer a project like this one? - -We assure you - the little voice in your head is wrong. If you can write code at -all, you can contribute code to open source. Contributing to open source -projects is a fantastic way to advance one's coding skills. Writing perfect code -isn't the measure of a good developer (that would disqualify all of us!); it's -trying to create something, making mistakes, and learning from those -mistakes. That's how we all improve, and we are happy to help others learn. - -Being an open source contributor doesn't just mean writing code, either. You can -help out by writing documentation, tests, or even giving feedback about the -project (and yes - that includes giving feedback about the contribution -process). Some of these contributions may be the most valuable to the project as -a whole, because you're coming to the project with fresh eyes, so you can see -the errors and assumptions that seasoned contributors have glossed over. - -Note: This disclaimer was originally written by -`Adrienne Lowe `_ for a -`PyCon talk `_, and was adapted by -retrieval based on its use in the README file for the -`MetPy project `_. +built on open source, and we'd love to have your help. diff --git a/retrieval/__init__.py b/retrieval/__init__.py index 65b8d0e..911d9c9 100644 --- a/retrieval/__init__.py +++ b/retrieval/__init__.py @@ -6,4 +6,4 @@ from ._astropy_init import * # noqa # ---------------------------------------------------------------------------- -__all__ = [] +from .core import * # noqa diff --git a/retrieval/utils/tests/__init__.py b/retrieval/core.py similarity index 100% rename from retrieval/utils/tests/__init__.py rename to retrieval/core.py diff --git a/retrieval/data/water_opacity_grid.npy b/retrieval/data/water_opacity_grid.npy new file mode 100644 index 0000000..aa7a7f0 Binary files /dev/null and b/retrieval/data/water_opacity_grid.npy differ diff --git a/retrieval/extern/__init__.py b/retrieval/extern/__init__.py deleted file mode 100644 index 3b1f211..0000000 --- a/retrieval/extern/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# Licensed under a 3-clause BSD style license - see LICENSE.rst -""" -This packages contains python packages that are bundled with the package but -are external to it, and hence are developed in a separate source tree. -""" diff --git a/retrieval/utils/__init__.py b/retrieval/utils/__init__.py deleted file mode 100644 index d3f4517..0000000 --- a/retrieval/utils/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -# Licensed under a 3-clause BSD style license - see LICENSE.rst - -# This sub-module is destined for common non-package specific utility -# functions. diff --git a/setup.cfg b/setup.cfg index 25c37cf..ec1b658 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,9 +15,10 @@ github_project = bmorris3/retrieval zip_safe = False packages = find: python_requires = >=3.6 -setup_requires = setuptools_scm +setup_requires = + setuptools_scm + astropy install_requires = - numpy corner [options.extras_require]