Skip to content

Commit

Permalink
Merge 6c93cd2 into e2362fe
Browse files Browse the repository at this point in the history
  • Loading branch information
astrofrog committed Jan 13, 2020
2 parents e2362fe + 6c93cd2 commit 12e7944
Show file tree
Hide file tree
Showing 22 changed files with 295 additions and 1,453 deletions.
File renamed without changes.
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

13 changes: 13 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
version: 2

build:
image: latest

# Install regular dependencies.
python:
version: 3.7
install:
- method: pip
path: .
extra_requirements:
- docs
11 changes: 0 additions & 11 deletions .rtd-environment.yml

This file was deleted.

82 changes: 30 additions & 52 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,81 +1,59 @@
language: c
language: python

# The apt packages below are needed for sphinx builds, which can no longer
# be installed with sudo apt-get.
addons:
apt:
packages:
- graphviz
- texlive-latex-extra
- dvipng
- libgfortran3 # for casatools

env:
global:
# The following versions are the 'default' for tests, unless
# overidden underneath. They are defined here in order to save having
# to repeat them for all configurations.
- PYTHON_VERSION=3.6
- SETUP_CMD='test'
- NUMPY_VERSION=stable
- ASTROPY_VERSION=stable
# matplotlib>2 is an install requirement of pvextractor, so we may as
# well include it here
- CONDA_DEPENDENCIES='matplotlib sip glue-core scipy'
- CONDA_CHANNELS='astropy glueviz'
- PVEXTRACTOR="https://github.com/radio-astro-tools/pvextractor/archive/master.zip"
- REGIONS="https://github.com/astropy/regions/archive/master.zip"
# lock to reproject v0.5.1: master branch acquired serious regressions in #166
- REPROJECT="https://github.com/astropy/reproject/archive/v0.5.1.tar.gz"
- RADIOBEAM="https://github.com/radio-astro-tools/radio-beam/archive/master.zip"
- PIP_DEPENDENCIES="Cython $PVEXTRACTOR $RADIOBEAM $REGIONS $REPROJECT"
- SETUP_XVFB=True
- ON_TRAVIS=True
- INSTALL_CASA=False
- TOXENV=''
- TOXARGS=''
- TOXPOSARGS=''

matrix:
include:
- env: SETUP_CMD='egg_info'

# Test with development versions
- env: PYTHON_VERSION=3.7 ASTROPY_VERSION='development'
name: py37_astropy-dev
- python: 3.7
env: TOXENV='py37-test'
name: "Python 3.7 with minimal dependencies"

# Do a coverage test in Python 3.
# make sure *everything* is run for coverage tests
## COVERAGE TESTS DISABLED: they don't work any more. I have found no combination of anything that fixes this.
- env: SETUP_CMD='test --coverage'
CONDA_DEPENDENCIES='matplotlib yt bottleneck sip aplpy joblib glue-core scipy'
INSTALL_CASA=True
name: coverage
- python: 3.7
env: TOXENV='py37-test-all'
name: "Python 3.7 with all dependencies (except CASA)"

# Check for sphinx doc build warnings - we do this first because it
# may run for a long time.
- env: SETUP_CMD='build_sphinx -w' NUMPY_VERSION=1.16
PIP_DEPENDENCIES="Cython $PVEXTRACTOR $RADIOBEAM $REGIONS $REPROJECT sphinx-astropy"
name: docs
- python: 3.6
env: TOXENV='py36-test-casa'
name: "Python 3.6 with minimal dependencies and CASA"

- python: 3.8
env: TOXENV='py38-test-all-dev'
name: "Python 3.8, all dependencies, and dev versions of key dependencies"

- env: ASTROPY_VERSION='development'
name: astropy-dev
- python: 3.8
env: TOXENV='build_docs'
name: "Documentation"

- env: CONDA_DEPENDENCIES="matplotlib=3 aplpy yt bottleneck joblib $CONDA_DEPENDENCIES"
ASTROPY_VERSION='development'
name: vistools

- env: # separate joblib-only test
CONDA_DEPENDENCIES="joblib $CONDA_DEPENDENCIES"
ASTROPY_VERSION='development'
name: joblib


install:
- git clone git://github.com/astropy/ci-helpers.git
- source ci-helpers/travis/setup_conda.sh
- if [[ $INSTALL_CASA == True ]]; then pip install --progress-bar off --extra-index-url https://casa-pip.nrao.edu/repository/pypi-group/simple casatools casatasks; fi
before_install:
# We need a full clone to make sure setuptools_scm
# works properly
- git fetch --unshallow .
- git fetch --depth=1000000

script:
- python setup.py $SETUP_CMD
- pip install tox
- tox $TOXARGS -- $TOXPOSARGS

after_success:
- if [[ $SETUP_CMD == 'test --coverage' ]]; then coveralls --rcfile='spectral_cube/tests/coveragerc'; fi
- pip install coveralls coverage
- coverage combine .tmp/*/.coverage
- coverage report
- coveralls
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
- Refactor tests to use fixtures for accessing data instead of needing to
run a script to generate test files. #598

- Refactor package infrastructure to no longer use astropy-helpers. #599

0.4.5 (unreleased)
------------------
- Added support for casatools-based io in #541 and beam reading from CASA
Expand Down
8 changes: 1 addition & 7 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
include README.md
include CHANGES.rst
include LICENSE.rst

include ez_setup.py
include ah_bootstrap.py
include pyproject.toml
include setup.cfg

recursive-include *.pyx *.c *.pxd
Expand All @@ -16,8 +14,4 @@ prune build
prune docs/_build
prune docs/api

recursive-include astropy_helpers *
exclude astropy_helpers/.git
exclude astropy_helpers/.gitignore

global-exclude *.pyc *.o
29 changes: 0 additions & 29 deletions README.md

This file was deleted.

40 changes: 40 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
About
=====

|Join the chat at https://gitter.im/radio-astro-tools/spectral-cube|

This package aims to facilitate the reading, writing, manipulation, and
analysis of spectral data cubes. More information is available in the
documentation, avaliable `online at
readthedocs.org <http://spectral-cube.rtfd.org>`__.

.. figure:: http://img.shields.io/badge/powered%20by-AstroPy-orange.svg?style=flat
:alt: Powered by Astropy Badge

Powered by Astropy Badge

Credits
=======

This package is developed by:

- Chris Beaumont ([@ChrisBeaumont](http://github.com/ChrisBeaumont))
- Adam Ginsburg ([@keflavich](http://github.com/keflavich))
- Adam Leroy ([@akleroy](http://github.com/akleroy))
- Thomas Robitaille ([@astrofrog](http://github.com/astrofrog))
- Erik Rosolowsky ([@low-sky](http://github.com/low-sky))
- Eric Koch ([@e-koch](https://github.com/e-koch))

Build and coverage status
=========================

|Build Status| |Coverage Status| |DOI|

.. |Join the chat at https://gitter.im/radio-astro-tools/spectral-cube| image:: https://badges.gitter.im/Join%20Chat.svg
:target: https://gitter.im/radio-astro-tools/spectral-cube?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
.. |Build Status| image:: https://travis-ci.org/radio-astro-tools/spectral-cube.png?branch=master
:target: https://travis-ci.org/radio-astro-tools/spectral-cube
.. |Coverage Status| image:: https://coveralls.io/repos/radio-astro-tools/spectral-cube/badge.svg?branch=master
:target: https://coveralls.io/r/radio-astro-tools/spectral-cube?branch=master
.. |DOI| image:: https://zenodo.org/badge/doi/10.5281/zenodo.11485.png
:target: http://dx.doi.org/10.5281/zenodo.11485

0 comments on commit 12e7944

Please sign in to comment.