Skip to content

Commit

Permalink
Merge pull request #94 from pllim/rtd-pr-build
Browse files Browse the repository at this point in the history
TST: Enable RTD PR build, update Travis
  • Loading branch information
mwcraig committed Sep 7, 2019
2 parents dd0e14d + 79ce98c commit 8dfe3e8
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 41 deletions.
23 changes: 23 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
version: 2

sphinx:
builder: html
configuration: docs/conf.py
fail_on_warning: true

# Set the version of Python and requirements required to build your docs
python:
version: 3.7
system_packages: true
install:
- requirements: docs/requirements.txt
- method: setuptools
path: .

submodules:
include: all

# Don't build any extra formats
formats: []
14 changes: 0 additions & 14 deletions .rtd-environment.yml

This file was deleted.

22 changes: 3 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,13 @@ sudo: false
#
# https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise

addons:
apt:
packages:
- graphviz
- texlive-latex-extra
- dvipng

env:
global:

# The following versions are the 'default' for tests, unless
# overridden underneath. They are defined here in order to save having
# to repeat them for all configurations.
- PYTHON_VERSION=3.6
- PYTHON_VERSION=3.7
- NUMPY_VERSION=stable
- ASTROPY_VERSION=stable
- GINGA_VERSION=stable
Expand Down Expand Up @@ -69,20 +62,12 @@ matrix:

include:
- stage: Initial tests
env: PYTHON_VERSION=3.6 SETUP_CMD='egg_info'
- stage: Initial tests
env: PYTHON_VERSION=3.7 SETUP_CMD='egg_info'
env: SETUP_CMD='egg_info'

# Do a coverage test.
- stage: Initial tests
env: SETUP_CMD='test --coverage'

# Check for sphinx doc build warnings - we do this first because it
# may run for a long time
- stage: Comprehensive tests
env: SETUP_CMD='build_docs -w'
PIP_DEPENDENCIES='sphinx-astropy'

# Now try Astropy dev with the latest Python and LTS with Python 3.x.
- stage: Comprehensive tests
env: ASTROPY_VERSION=development
Expand All @@ -97,12 +82,11 @@ matrix:
# time.

- stage: Comprehensive tests
env: NUMPY_VERSION=1.14
env: PYTHON_VERSION=3.6 NUMPY_VERSION=1.14

- stage: Comprehensive tests
os: windows
env: SETUP_CMD='test'
PYTHON_VERSION=3.7

# Do a PEP8 test with flake8
- stage: Comprehensive tests
Expand Down
5 changes: 5 additions & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Cython
numpy
astropy
matplotlib
sphinx-astropy
8 changes: 0 additions & 8 deletions readthedocs.yml

This file was deleted.

0 comments on commit 8dfe3e8

Please sign in to comment.