Skip to content

Commit 8e44b73

Browse files
authored
Merge pull request #58 from ocefpaf/dont_pkg_test
Re-factor datasets
2 parents 3df5154 + 7f2e58a commit 8e44b73

File tree

8 files changed

+216
-191
lines changed

8 files changed

+216
-191
lines changed

.travis.yml

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
1-
language: python
1+
language: minimal
22

33
sudo: false
44

55
matrix:
66
fast_finish: true
77
include:
8-
- python: 3.6
9-
env: TEST_TARGET=default
10-
- python: 3.6
11-
env: TEST_TARGET=coding_standards
12-
allow_failures:
13-
- python: 3.6
14-
env: TEST_TARGET=coding_standards
8+
- name: default
9+
env: TEST_TARGET=default PY=3.7
10+
- python: coding_standards
11+
env: TEST_TARGET=coding_standards PY=3.7
1512

1613
before_install:
1714
- wget http://bit.ly/miniconda -O miniconda.sh
1815
- bash miniconda.sh -b -p $HOME/miniconda
1916
- export PATH="$HOME/miniconda/bin:$PATH"
2017
- conda config --set always_yes yes --set changeps1 no --set show_channel_urls true
2118
- conda update conda
19+
- conda config --remove channels defaults --force
2220
- conda config --add channels conda-forge --force
23-
- conda create --name TEST python=$TRAVIS_PYTHON_VERSION --file requirements.txt --file requirements-dev.txt
21+
- conda create --name TEST python=$PY --file requirements.txt --file requirements-dev.txt
2422
- source activate TEST
2523
# GUI tests.
2624
- "export DISPLAY=:99.0"
@@ -31,10 +29,10 @@ install:
3129
- python setup.py sdist && version=$(python setup.py --version) && pushd dist && pip install oceans-${version}.tar.gz && popd
3230

3331
script:
34-
- if [[ $TEST_TARGET == 'default' ]]; then
35-
pytest -vv oceans --doctest-modules ;
36-
fi
37-
38-
- if [[ $TEST_TARGET == 'coding_standards' ]]; then
39-
flake8 --max-line-length=105 oceans --exclude=_version.py ;
40-
fi
32+
- if [[ $TEST_TARGET == 'default' ]]; then
33+
pytest -vv oceans --doctest-modules ;
34+
fi
35+
36+
- if [[ $TEST_TARGET == 'coding_standards' ]]; then
37+
flake8 --max-line-length=105 oceans --exclude=_version.py ;
38+
fi

CHANGES.txt

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
11
Changelog
22
---------
33

4-
Version 0.5.0, unreleased
4+
Version 0.6.0
5+
6+
* Re-factored datasets and fixed data sources URLs.
7+
8+
Version 0.5.1
9+
10+
* Fix find packages in setup.py #57.
11+
12+
Version 0.5.0
13+
14+
* Fixed pandas rolling_mean deprecation #54.
15+
* Fixed failing tests.
16+
* Added NaN support for MLD #53 and #56.
17+
18+
Version 0.4.1
519

620
* Replaced custom smooth filter for `scipy`'s `ndimage` filter.
721
* Re-factor `datasets` to avoid the `basemap` syntax in favor of a `bbox` like syntax.
@@ -12,18 +26,19 @@ Version 0.5.0, unreleased
1226
* Removed `shapely` and use `matplotlib.path.Path` in `in_polygon` instead.
1327
* Many speed improvements via lazy imports and updates.
1428
* Re-added a re-factored version of the filters module.
29+
* Re-factored datasets and fixed many data sources.
1530

16-
Version 0.4.0, 27-Oct-2016.
31+
Version 0.4.0
1732

18-
* re-written `get_isobath` function that uses latest matplotlib contour machinery.
33+
* Re-written `get_isobath` function that uses latest matplotlib contour machinery.
1934
* Use integer indexes to fix `numpy` deprecations.
2035
* Change license from MIT to BSD 3-Clause.
2136

22-
Version 0.3.0, 17-Aug-2016.
37+
Version 0.3.0
2338

2439
* Fix `nanmean` and `nanstd` removed from latest `scipy`.
2540

26-
Version 0.2.5, 30-Jul-2015.
41+
Version 0.2.5
2742

2843
* Lazy imports.
2944
* Several minor bug fixes.
@@ -34,11 +49,11 @@ Version 0.2.4, 05-May-2015.
3449
* Re-write of `woa_subset` to use iris instead of Pandas.
3550
* Deprecate 'state' option in soundspeed.
3651

37-
Version 0.2.3, 23-Jan-2015.
52+
Version 0.2.3
3853

3954
* Several small bugs and typos fixes.
4055

41-
Version 0.2.2, 18-Aug-2014.
56+
Version 0.2.2
4257

4358
* Mixed Layer Depth functions.
4459
* Critical depth and Light extinction coefficient.
@@ -48,16 +63,16 @@ Version 0.2.1, 07-Apr-2014.
4863

4964
* Python3 support.
5065

51-
Version 0.2.0, 06-Aug-2013.
66+
Version 0.2.0
5267

5368
* Moved CTDProfile to a separated module (python-ctd).
5469

55-
Version 0.1.0, 26-Jun-2012
70+
Version 0.1.0
5671

5772
* Added several of new functions and sub-modules
5873
* CTDProfile class (pandas DataFrame for CTDs).
5974
* time_series methods to extend pandas Series.
6075

61-
Version 0.0.1, 13-Oct-2011
76+
Version 0.0.1
6277

63-
* Initial release.
78+
* Initial release.

0 commit comments

Comments
 (0)