Skip to content

Commit 56efebd

Browse files
committed
Merge pull request #27 from astroML/new-travis
MAINT: tweak travis build script
2 parents 5e042ed + e2d779a commit 56efebd

File tree

5 files changed

+23
-20
lines changed

5 files changed

+23
-20
lines changed

.travis.yml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,31 @@ language: python
44
sudo: false
55

66
python:
7-
- 2.6
87
- 2.7
9-
- 3.3
108
- 3.4
119
- 3.5
1210

1311
env:
14-
- CONDA_DEPS="numpy scipy nose pip scikit-learn" PIP_DEPS="supersmoother astroML astroML_addons"
12+
global:
13+
- TEST_DIR=/tmp/megaman
14+
- CONDA_DEPS="numpy scipy nose pip coverage scikit-learn"
15+
- PIP_DEPS="supersmoother astroML astroML_addons"
16+
17+
before_install:
18+
- export MINICONDA=$HOME/miniconda
19+
- export PATH="$MINICONDA/bin:$PATH"
20+
- hash -r
21+
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
22+
- bash miniconda.sh -b -f -p $MINICONDA
23+
- conda config --set always_yes yes
24+
- conda update conda
25+
- conda info -a
26+
- conda install python=$TRAVIS_PYTHON_VERSION $CONDA_DEPS
27+
- travis_retry pip install $PIP_DEPS
1528

1629
install:
17-
- conda create -n testenv --yes python=$TRAVIS_PYTHON_VERSION
18-
- source activate testenv
19-
- conda install --yes $CONDA_DEPS
20-
- pip install $PIP_DEPS
2130
- python setup.py install
2231

23-
before_install:
24-
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
25-
- chmod +x miniconda.sh
26-
- ./miniconda.sh -b
27-
- export PATH=/home/travis/miniconda3/bin:$PATH
28-
# miniconda is not always up-to-date with conda.
29-
- conda update --yes conda
30-
3132
script:
32-
- nosetests --with-doctest gatspy
33+
- mkdir -p $TEST_DIR
34+
- cd $TEST_DIR && nosetests -v --with-doctest --with-coverage --cover-package=gatspy gatspy

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
- Make ``supersmoother`` a soft dependency
88
- New feature: ``gatspy.periodic.TrendedLombScargle`` extends ``LombScargle``
99
by adding a linear trend parameter ``d*t`` to the fitted model
10+
- Fixed download URL for RR Lyrae datasets
1011

1112
## (v0.2.1) bugfix release (19 Aug 2015)
1213

MANIFEST.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
include *.md
22
include *.py
33
recursive-include gatspy *.py
4+
recursive-include doc *
5+
recursive-include examples *.ipynb
46
include LICENSE
5-
include Makefile
7+
include Makefile

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Gatspy uses ``nose`` for unit tests. With nosetests installed, type
4141

4242
to run the unit tests.
4343

44-
The tests are run on Python versions 2.6, 2.7, 3.3, 3.4, and 3.5.
44+
The tests are run on Python versions 2.7, 3.4, and 3.5.
4545

4646
## Authors
4747
- [Jake VanderPlas](http://www.vanderplas.com)

setup.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,7 @@ def version(path):
6868
'Intended Audience :: Science/Research',
6969
'License :: OSI Approved :: BSD License',
7070
'Natural Language :: English',
71-
'Programming Language :: Python :: 2.6',
7271
'Programming Language :: Python :: 2.7',
73-
'Programming Language :: Python :: 3.3',
7472
'Programming Language :: Python :: 3.4',
7573
'Programming Language :: Python :: 3.5'],
7674
)

0 commit comments

Comments
 (0)