Skip to content

Commit 09126e9

Browse files
wholmgrencwhanse
authored andcommitted
add python 3.7 to test matrix, documentation, setup.py (#520)
* add python 3.7 to travis ci * minor updates to other configs * update travis config * update travis config * update travis config * update documentation * update setup.py for 3.7
1 parent a26d8e1 commit 09126e9

File tree

7 files changed

+45
-12
lines changed

7 files changed

+45
-12
lines changed

.travis.yml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
language: python
77
sudo: false # if false, use TravisCI's container based build
88

9+
# assume linux if not specified
10+
# someday add os: osx to specify osx, but python not yet supported on Travis
911
matrix:
1012
include:
1113
- python: 2.7
@@ -18,25 +20,34 @@ matrix:
1820
env: CONDA_ENV=py35
1921
- python: 3.6
2022
env: CONDA_ENV=py36
23+
- python: 3.6
24+
env: CONDA_ENV=py37
2125

2226
addons:
2327
apt:
2428
packages:
2529
- ccache
2630

2731
cache:
28-
# - pip
2932
- ccache
3033

31-
# setup miniconda for numpy, scipy, pandas
34+
# setup miniconda for numpy, scipy, pandas, etc.
3235
before_install:
3336
- echo "before install"
34-
- export PATH=/usr/lib/ccache:$PATH
3537
- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
36-
wget http://repo.continuum.io/miniconda/Miniconda-3.16.0-Linux-x86_64.sh -O miniconda.sh;
38+
export PYVER="2";
39+
else
40+
export PYVER="3";
41+
fi
42+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
43+
export OSSTR="MacOSX-x86_64.sh";
3744
else
38-
wget http://repo.continuum.io/miniconda/Miniconda3-3.16.0-Linux-x86_64.sh -O miniconda.sh;
45+
export OSSTR="Linux-x86_64.sh";
46+
export PATH=/usr/lib/ccache:$PATH;
3947
fi
48+
- export BASE="http://repo.continuum.io/miniconda/Miniconda"
49+
- export CONDAVER="4.5.4"
50+
- wget $BASE$PYVER-$CONDAVER-$OSSTR -O miniconda.sh;
4051
- bash miniconda.sh -b -p $HOME/miniconda
4152
- export PATH="$HOME/miniconda/bin:$PATH"
4253
- hash -r
@@ -59,12 +70,10 @@ install:
5970
- conda list
6071
- echo $PATH
6172
- ls -l /home/travis/miniconda/envs/test_env/lib
62-
#- pip install . # use pip to automatically install anything not in the yml files (i.e. numpy/scipy/pandas for py3*)
63-
#- pip install scipy # won't do anything if already installed
6473
- pip install -e .
6574

6675
script:
67-
- py.test pvlib --cov=pvlib --cov-report term-missing
76+
- pytest pvlib --cov=pvlib --cov-report term-missing
6877

6978
after_success:
7079
coveralls

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Installation
3131
pvlib-python releases may be installed using the ``pip`` and ``conda`` tools.
3232
Please see the [Installation page](http://pvlib-python.readthedocs.io/en/latest/installation.html) of the documentation for complete instructions.
3333

34-
pvlib-python is compatible with Python versions 2.7, 3.4, 3.5, 3.6
34+
pvlib-python is compatible with Python versions 2.7 and 3.4-3.7
3535

3636

3737
Contributing

appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ environment:
88
matrix:
99
- PYTHON_VERSION: "2.7"
1010
- PYTHON_VERSION: "3.6"
11+
# - PYTHON_VERSION: "3.7" # appveyor supports 3.7, but siphon package not yet available for py 3.7 as of 2018-08-04. dont want to bother with a more complicated config
1112

1213
platform:
1314
- x86

ci/requirements-py36.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ dependencies:
99
- pytables
1010
- pandas
1111
- pytz
12-
#- ephem
13-
#- numba
14-
#- siphon
12+
- ephem
13+
- numba
14+
- siphon
1515
- pytest
1616
- pytest-cov
1717
- pytest-mock

ci/requirements-py37.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: test_env
2+
channels:
3+
- defaults
4+
- conda-forge
5+
dependencies:
6+
- python=3.7
7+
- numpy
8+
- scipy
9+
- pytables
10+
- pandas
11+
- pytz
12+
- ephem
13+
- numba
14+
# - siphon
15+
- pytest
16+
- pytest-cov
17+
- pytest-mock
18+
- nose
19+
- pip:
20+
- coveralls

docs/sphinx/source/whatsnew/v0.6.0.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ Enhancements
5858
:func:`~pvlib.singlediode_methods.bishop88_i_from_v`,
5959
:func:`~pvlib.singlediode_methods.bishop88_v_from_i`, and
6060
:func:`~pvlib.singlediode_methods.bishop88_mpp`.
61+
* Python 3.7 officially supported. (:issue:`496`)
6162

6263

6364
Bug fixes
@@ -93,6 +94,7 @@ Testing
9394
* Additional test refactoring to limit test result dependence to a single
9495
function per test. (:issue:`394`)
9596
* Use pytest-mock to ensure that ModelChain DC model is set up correctly.
97+
* Add Python 3.7 to build matrix
9698

9799

98100
Contributors

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
'Programming Language :: Python :: 3.4',
6161
'Programming Language :: Python :: 3.5',
6262
'Programming Language :: Python :: 3.6',
63+
'Programming Language :: Python :: 3.7',
6364
'Topic :: Scientific/Engineering',
6465
]
6566

0 commit comments

Comments
 (0)