Skip to content

Commit c16d1d7

Browse files
ChilippChilipp
committed
Merge branch 'dev'
2 parents 07a199c + 5808a28 commit c16d1d7

39 files changed

Lines changed: 145 additions & 68 deletions

‎.gitmodules‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,3 +118,15 @@
118118
path = tests/reference_figures/win32/py3.6/mpl2.2
119119
url = https://github.com/Chilipp/psy-maps-references.git
120120
branch = win32_py3.6_mpl2.2
121+
[submodule "tests/reference_figures/linux/py3.7/mpl3.0"]
122+
path = tests/reference_figures/linux/py3.7/mpl3.0
123+
url = https://github.com/Chilipp/psy-maps-references.git
124+
branch = linux_py3.7_mpl3.0
125+
[submodule "tests/reference_figures/darwin/py3.7/mpl3.0"]
126+
path = tests/reference_figures/darwin/py3.7/mpl3.0
127+
url = https://github.com/Chilipp/psy-maps-references.git
128+
branch = darwin_py3.7_mpl3.0
129+
[submodule "tests/reference_figures/win32/py3.7/mpl3.0"]
130+
path = tests/reference_figures/win32/py3.7/mpl3.0
131+
url = https://github.com/Chilipp/psy-maps-references.git
132+
branch = win32_py3.7_mpl3.0

‎.travis.yml‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,17 @@ env:
33
global:
44
- COMMIT_AUTHOR_EMAIL="philipp.sommer@unil.ch"
55
- secure: "BCB8Pm2uloMjoQ42Y8iGur19Tq0O1KzepehSDrgc8HjebbUbRSJimHt6uSOUbjIE7GZe4UB9Me0mGn2g3/EpSH8LKB2WCrAK5ZSgZx+B0kejDBP/a6k+RvC6TJ6YJOuxKcHpagL9jgvJfHyZlFo8RC3lxjkWqcm06tL4ImVFIBDBzxvRMAZyxXlpaIyYEJAf9mkh7rplUsR0DMFTrLI+3Kz0KVUyUTlYKLzzG8pJ6Qq5dmNHVHXa3UVK+JWTOGhizAjX9oPJhrBbSxDlk54pTMRH/LtJEMDCXBN7PtbyKnI3Wu4ayoL3eBjy0zRfRB5msFjfge7Ray5ECR8Sw5U/TARFllNnsloTbRDxoRwEEHtqTRLGR3Zk8P2WHu+Vl3YYPmAKpHWKBxuIO0cStjMDTM0rz1ySNttqM8qidky7PXs3uZ5J6t4XmsdOmI1hYYZEE3Xa5FDw0TB5y3h3+vPl3Na0E5P730/TZ9Ib6DOix3wMr7BgfMPzNA0Hcv5oORwPmqsHhhtwx4op8FF8RUj8nh/KIzSVXJauEz0+Tc1BklhY3hhqdORsdkb8FAetCP1XKMWAi2PPNNQTzbDQbNd/M+6miNE/YCSTX6S0Cv+6jhmyTNU4cQj1Tm24xsjG+i/YJTbnraKnhmQAAPtw24GQkc4e3uAFiMjUndXCxi7k4WI="
6+
- secure: "LLvrEhLftLyg62WfCWzOUF9sA5Xw28dlxLqksiwXDOg2GLe7s8+2lX+/e3qhYaIDtP1EUTRgFvfZ3SpZvlLGgPazKSI8FzTxoMt4KIzxTVyOWdAcWA49zm/Ij5pVx46YV8wqPQoH87Ep9A+CllcBgwHxFQrf7egHZP7O2FpYz3RHzfTXP4XRiBcXclgX2b5/rFXpZoe3wn1ETWXjV4IsW+uVRDels7ZlhkrEac2ddCqiEQNY8ovTzGvoIkYfBY2vjjqIs1STkdF2yYTutD4c1vztw7zRRvMvIAphSP9FssGjhvkqcqlGkoqUKwBfaEyv2P9IGrJWQnodHRMM/6nel/R5XVGClRKr/RfL017Sap2B4Y6d0Q8qmLCnjHtGThAMCteT6caND5wju/0rbtZeGxPZLhI+r6MITxdJiW65xlBUeTohcWmtlMyR+cNtdXS+mtyRxltUc/mElk/UXvDlCu76UlC0FygaLZWaHeFSFAreB9dqMM8eTGG95ea1HyFOiJC5RgxLMu2aTDQZgFzNVorGNr7DaHDrjQy/3cVUgRUpmyPdoSf3nIUT1RRwp1jss8Gi9VgezGXwxrZY8YN7vTAXNv4xF6sDgWjVE6tOqFz1CShYPvYLjzp3SVsnAg8efsL+az0YcElyZreH5OlMaI7CvvYgJ9ftkWO4ORCQdv8="
67
matrix:
78
include:
89
# linux environments
910
- env:
10-
- PYTHON_VERSION=3.6
11-
- MPL_VERSION=2.2
11+
- PYTHON_VERSION=3.7
12+
- MPL_VERSION=3.0
1213
os: linux
1314
- env:
1415
- PYTHON_VERSION=3.6
15-
- MPL_VERSION=2.1
16-
os: linux
17-
- env:
18-
- PYTHON_VERSION=3.6
19-
- MPL_VERSION=2.0
16+
- MPL_VERSION=2.2
2017
os: linux
2118
- env:
2219
- PYTHON_VERSION=3.6
@@ -34,10 +31,6 @@ matrix:
3431
- PYTHON_VERSION=2.7
3532
- MPL_VERSION=2.1
3633
os: linux
37-
- env:
38-
- PYTHON_VERSION=2.7
39-
- MPL_VERSION=2.0
40-
os: linux
4134
- env:
4235
- PYTHON_VERSION=2.7
4336
- MPL_VERSION=1.5
@@ -48,16 +41,12 @@ matrix:
4841
os: linux
4942
# osx environments
5043
- env:
51-
- PYTHON_VERSION=3.6
52-
- MPL_VERSION=2.2
53-
os: osx
54-
- env:
55-
- PYTHON_VERSION=3.6
56-
- MPL_VERSION=2.1
44+
- PYTHON_VERSION=3.7
45+
- MPL_VERSION=3.0
5746
os: osx
5847
- env:
5948
- PYTHON_VERSION=3.6
60-
- MPL_VERSION=2.0
49+
- MPL_VERSION=2.2
6150
os: osx
6251
- env:
6352
- PYTHON_VERSION=3.6
@@ -67,10 +56,6 @@ matrix:
6756
- PYTHON_VERSION=2.7
6857
- MPL_VERSION=2.1
6958
os: osx
70-
- env:
71-
- PYTHON_VERSION=2.7
72-
- MPL_VERSION=2.0
73-
os: osx
7459
- env:
7560
- PYTHON_VERSION=2.7
7661
- MPL_VERSION=1.5
@@ -115,6 +100,8 @@ install:
115100
- hash -r
116101
- conda config --set always_yes yes --set changeps1 no
117102
- conda update -q conda
103+
# install conda build and anaconda-client for deploy
104+
- conda install conda-build anaconda-client
118105
# Useful for debugging any issues with conda
119106
- conda info -a
120107
- 'ENVKEY=py"${PYTHON_VERSION}"_mpl"${MPL_VERSION}"'
@@ -147,6 +134,9 @@ install:
147134
- psyplot -aV
148135
# export the token to make it available for the deploy
149136
- export GH_REPO_TOKEN=$GH_REPO_TOKEN_SAVE
137+
# add conda-forge channel for build
138+
- conda config --add channels chilipp/label/$TRAVIS_BRANCH
139+
- conda config --add channels conda-forge
150140

151141
script:
152142
# create the necessary references
@@ -158,6 +148,7 @@ script:
158148
else
159149
py.test -v -n $NCORES --cov-append --cov=psy_maps;
160150
fi
151+
- conda build ci/conda-recipe --python $PYTHON_VERSION --no-test
161152

162153
after_success:
163154
- coveralls
@@ -175,3 +166,9 @@ deploy:
175166
on:
176167
condition: "-e deploy_references"
177168
all_branches: true
169+
- provider: script
170+
script: ci/deploy_anaconda.sh
171+
skip_cleanup: true
172+
on:
173+
condition: '$MPL_VERSION == 3.0'
174+
all_branches: true

‎appveyor.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,11 @@ environment:
66
secure: AbhjnJXZWHhEiEN6cjQmZ4hCn05Ff/V2CCBv4mZux9NljqdYgHfnVT4nBgsKiaQJ
77

88
matrix:
9+
- PYTHON_VERSION: "3.7"
10+
MPL_VERSION: "3.0"
911
- PYTHON_VERSION: "3.6"
1012
MPL_VERSION: "2.2"
1113
- PYTHON_VERSION: "3.6"
12-
MPL_VERSION: "2.1"
13-
- PYTHON_VERSION: "3.6"
14-
MPL_VERSION: "2.0"
15-
- PYTHON_VERSION: "3.6"
16-
MPL_VERSION: "1.5"
17-
- PYTHON_VERSION: "3.5"
18-
MPL_VERSION: "2.1"
19-
- PYTHON_VERSION: "3.5"
20-
MPL_VERSION: "2.0"
21-
- PYTHON_VERSION: "3.5"
2214
MPL_VERSION: "1.5"
2315
install:
2416
# save local state and delete the GH_REPO_TOKEN because it is not needed

‎ci/conda-recipe/meta.yaml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{% set name = "psy-maps" %}
2+
{% set version = "1.2.0" %}
3+
4+
package:
5+
name: {{ name|lower }}
6+
version: {{ version }}
7+
8+
source:
9+
path: ../../
10+
11+
build:
12+
number: 0
13+
script: python setup.py install --single-version-externally-managed --record record.txt
14+
15+
requirements:
16+
build:
17+
- python
18+
- setuptools
19+
run:
20+
- python
21+
- psyplot
22+
- psy-simple
23+
- cartopy
24+
25+
test:
26+
imports:
27+
- psy_maps
28+
29+
about:
30+
home: https://github.com/Chilipp/psy-maps
31+
license: GPL-2.0
32+
license_family: GPL
33+
license_file: LICENSE
34+
summary: Psyplot plugin for visualization on a map
35+
36+
description: |
37+
This psyplot plugin uses the cartopy package to visualize geo-referenced
38+
data on a map
39+
doc_url: http://psyplot.readthedocs.io/projects/psy-maps
40+
dev_url: https://github.com/Chilipp/psy-maps
41+
42+
extra:
43+
recipe-maintainers:
44+
- Chilipp

‎ci/deploy_anaconda.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/bash
2+
anaconda -t $CONDA_REPO_TOKEN upload -l $TRAVIS_BRANCH --force "$(ls $HOME/miniconda/conda-bld/${TRAVIS_OS_NAME}-64/*.tar.bz2)"

‎ci/install_python.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ $BASE_URL = "https://www.python.org/ftp/python/"
1010

1111
function DownloadMiniconda ($python_version, $platform_suffix) {
1212
$webclient = New-Object System.Net.WebClient
13-
if ($python_version -match "3.[456]") {
13+
if ($python_version -match "3.[4567]") {
1414
$filename = "Miniconda3-latest-Windows-" + $platform_suffix + ".exe"
1515
} else {
1616
$filename = "Miniconda-latest-Windows-" + $platform_suffix + ".exe"

‎docs/conf.py‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
warnings.filterwarnings(
3939
'ignore', message=("This has been deprecated in mpl 1.5,"))
4040
warnings.filterwarnings('ignore', message="invalid value encountered in ")
41+
warnings.filterwarnings('ignore', message="\s*examples.directory")
42+
warnings.filterwarnings('ignore', message='numpy.dtype size changed')
4143

4244
# -- General configuration ------------------------------------------------
4345

@@ -67,16 +69,22 @@
6769

6870
# process the examples if they don't exist already
6971
process_examples = (
70-
not osp.exists(osp.join(osp.dirname(__file__), 'examples')) or on_rtd)
72+
not osp.exists(osp.join(osp.dirname(__file__), 'examples')))
7173

7274
if on_rtd:
7375
spr.call([sys.executable] +
7476
('-m ipykernel install --user --name python3 '
7577
'--display-name python3').split())
7678

77-
if on_rtd or not osp.exists(osp.join(osp.dirname(__file__), 'api')):
79+
if not osp.exists(osp.join(osp.dirname(__file__), 'api')):
7880
spr.check_call(['bash', 'apigen.bash'])
7981

82+
# HACK: Create an empty file called '<string>' to prevent
83+
# https://github.com/sphinx-doc/sphinx/issues/5614
84+
if not osp.exists('<string>'):
85+
with open('<string>', 'w') as f:
86+
pass
87+
8088
# The cdo example would require the installation of climate data operators
8189
# which is a bit of an overkill
8290
example_gallery_config = dict(
@@ -210,19 +218,19 @@
210218
intersphinx_mapping = {
211219
'pandas': ('http://pandas.pydata.org/pandas-docs/stable/', None),
212220
'numpy': ('https://docs.scipy.org/doc/numpy/', None),
213-
'matplotlib': ('http://matplotlib.org/', None),
221+
'matplotlib': ('https://matplotlib.org/', None),
214222
'sphinx': ('http://www.sphinx-doc.org/en/stable/', None),
215223
'xarray': ('http://xarray.pydata.org/en/stable/', None),
216-
'cartopy': ('http://scitools.org.uk/cartopy/docs/latest/', None),
217-
'mpl_toolkits': ('http://matplotlib.org/basemap/', None),
224+
'cartopy': ('https://scitools.org.uk/cartopy/docs/latest/', None),
225+
'mpl_toolkits': ('https://matplotlib.org/basemap/', None),
218226
'psyplot': ('https://psyplot.readthedocs.io/en/latest/', None),
219227
'psy_simple': (
220228
'https://psyplot.readthedocs.io/projects/psy-simple/en/latest/', None),
221229
'psy_reg': (
222230
'https://psyplot.readthedocs.io/projects/psy-reg/en/latest/', None),
223231
}
224232
if six.PY3:
225-
intersphinx_mapping['python'] = ('https://docs.python.org/3.6/', None)
233+
intersphinx_mapping['python'] = ('https://docs.python.org/3.7/', None)
226234
else:
227235
intersphinx_mapping['python'] = ('https://docs.python.org/2.7/', None)
228236

‎docs/environment.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
name: psyplot_docs
22
channels:
33
- chilipp/label/dev
4-
- conda-forge
4+
- chilipp/label/master
5+
- chilipp
56
dependencies:
6-
- python=3.6
7+
- python=3.7
78
- dask
89
- xarray
910
- netCDF4
@@ -15,9 +16,8 @@ dependencies:
1516
- ipykernel
1617
- sphinx
1718
- cartopy
18-
- proj4<5
1919
- psyplot
20-
- psy-simple>1.0.1
20+
- psy-simple
2121
- pip:
2222
- autodocsumm
2323
- sphinx-nbexamples

‎docs/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Sphinx
22
# https://github.com/sphinx-doc/sphinx/blob/master/CHANGES
3-
sphinx==1.8.0 # rq.filter: >=1.3
3+
sphinx==1.8.2 # rq.filter: >=1.3

examples/example_icon.ipynb renamed to examples/example_ugrid.ipynb

File renamed without changes.

0 commit comments

Comments
 (0)