Skip to content

Commit

Permalink
Change testing to py36 (#76)
Browse files Browse the repository at this point in the history
  • Loading branch information
fmaussion committed May 7, 2017
1 parent 5385465 commit 33a0412
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 26 deletions.
36 changes: 18 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ matrix:
include:
- python: 2.7
env: CONDA_ENV=py27-all MPL=--mpl
- python: 3.5
env: CONDA_ENV=py35-all MPL=--mpl
- python: 3.5
env: CONDA_ENV=py35-all-mpl1 MPL=--mpl
- python: 3.5
env: CONDA_ENV=py35-min MPL=
- python: 3.5
env: CONDA_ENV=py35-xr MPL=
- python: 3.5
env: CONDA_ENV=py35-xarray-dev MPL=--mpl
- python: 3.5
env: CONDA_ENV=py35-all-rc MPL=--mpl
- python: 3.6
env: CONDA_ENV=py36-all MPL=--mpl
- python: 3.6
env: CONDA_ENV=py36-all-mpl1 MPL=--mpl
- python: 3.6
env: CONDA_ENV=py36-min MPL=
- python: 3.6
env: CONDA_ENV=py36-xr MPL=
- python: 3.6
env: CONDA_ENV=py36-xarray-dev MPL=--mpl
- python: 3.6
env: CONDA_ENV=py36-all-rc MPL=--mpl
allow_failures:
- python: 3.5
env: CONDA_ENV=py35-xr MPL=
- python: 3.5
env: CONDA_ENV=py35-xarray-dev MPL=--mpl
- python: 3.5
env: CONDA_ENV=py35-all-rc MPL=--mpl
- python: 3.6
env: CONDA_ENV=py36-xr MPL=
- python: 3.6
env: CONDA_ENV=py36-xarray-dev MPL=--mpl
- python: 3.6
env: CONDA_ENV=py36-all-rc MPL=--mpl

before_install:
- "export DISPLAY=:99.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: test_env
channels:
- conda-forge
dependencies:
- python=3.5
- python=3.6
- six
- numpy
- scipy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- conda-forge/label/rc
- conda-forge
dependencies:
- python=3.5
- python=3.6
- six
- numpy
- scipy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: test_env
channels:
- conda-forge
dependencies:
- python=3.5
- python=3.6
- six
- numpy
- scipy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: test_env
channels:
- conda-forge
dependencies:
- python=3.5
- python=3.6
- six
- numpy
- scipy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: test_env
channels:
- conda-forge
dependencies:
- python=3.5
- python=3.6
- six
- numpy
- scipy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: test_env
channels:
- conda-forge
dependencies:
- python=3.5
- python=3.6
- six
- numpy
- scipy
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@

# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {
'python': ('https://docs.python.org/3.5/', None),
'python': ('https://docs.python.org/3.6/', None),
'pandas': ('http://pandas.pydata.org/pandas-docs/stable/', None),
'numpy': ('http://docs.scipy.org/doc/numpy/', None),
}
2 changes: 1 addition & 1 deletion docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: salem
channels:
- conda-forge
dependencies:
- python=3.5
- python=3.6
- numpy
- scipy
- matplotlib
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
]

DESCRIPTION = 'Geoscientific data I/O and map projections'
Expand Down

0 comments on commit 33a0412

Please sign in to comment.