Skip to content

Commit 986f72c

Browse files
committed
Merge branch 'master' of https://github.com/pvlib/pvlib-python into celltemp
2 parents 2d807eb + e3635c2 commit 986f72c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+19312
-781
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,6 @@ coverage.xml
8686
#Ignore some notebooks
8787
*.ipynb
8888
!docs/tutorials/*.ipynb
89+
90+
#Ignore Mac DS_store files
91+
*.DS_Store

.travis.yml

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,8 @@ sudo: false # if false, use TravisCI's container based build
1111
# someday add os: osx to specify osx, but python not yet supported on Travis
1212
matrix:
1313
include:
14-
- python: 2.7
15-
env: CONDA_ENV=py27-min
16-
- python: 2.7
17-
env: CONDA_ENV=py27
18-
- python: 3.4
19-
env: CONDA_ENV=py34
14+
- python: 3.5
15+
env: CONDA_ENV=py35-min
2016
- python: 3.5
2117
env: CONDA_ENV=py35
2218
- python: 3.6
@@ -38,19 +34,15 @@ cache:
3834
# setup miniconda for numpy, scipy, pandas, etc.
3935
before_install:
4036
- echo "before install"
41-
- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
42-
export PYVER="2";
43-
else
44-
export PYVER="3";
45-
fi
37+
- export PYVER="3"
4638
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
4739
export OSSTR="MacOSX-x86_64.sh";
4840
else
4941
export OSSTR="Linux-x86_64.sh";
5042
export PATH=/usr/lib/ccache:$PATH;
5143
fi
5244
- export BASE="http://repo.continuum.io/miniconda/Miniconda"
53-
- export CONDAVER="4.5.4"
45+
- export CONDAVER="4.6.14"
5446
- wget $BASE$PYVER-$CONDAVER-$OSSTR -O miniconda.sh;
5547
- bash miniconda.sh -b -p $HOME/miniconda
5648
- export PATH="$HOME/miniconda/bin:$PATH"
@@ -63,14 +55,6 @@ install:
6355
- echo "install"
6456
- conda env create --file ci/requirements-$CONDA_ENV.yml
6557
- source activate test_env # all envs are named test_env in the yml files
66-
# needed to make sure that pandas is compiled against the right
67-
# version of numpy
68-
- if [[ "$CONDA_ENV" == "py27-min" ]]; then
69-
pip uninstall numpy --yes;
70-
pip uninstall pandas --yes;
71-
pip install --no-cache-dir numpy==1.10.1;
72-
pip install --no-cache-dir pandas==0.16.0;
73-
fi
7458
- conda list
7559
- echo $PATH
7660
- ls -l /home/travis/miniconda/envs/test_env/lib

README.md

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
1-
pvlib-python
2-
============
1+
<img src="docs/sphinx/source/_images/pvlib_logo_horiz.png" width="600">
32

43
[![TravisCI](https://travis-ci.org/pvlib/pvlib-python.svg?branch=master)](https://travis-ci.org/pvlib/pvlib-python)
5-
[![Build status](https://ci.appveyor.com/api/projects/status/gr2eyhc84tvtkopk?svg=true)](https://ci.appveyor.com/project/wholmgren/pvlib-python-fv2to)
64
[![Coverage Status](https://img.shields.io/coveralls/pvlib/pvlib-python.svg)](https://coveralls.io/r/pvlib/pvlib-python)
75
[![codecov](https://codecov.io/gh/pvlib/pvlib-python/branch/master/graph/badge.svg)](https://codecov.io/gh/pvlib/pvlib-python)
86
[![Documentation Status](https://readthedocs.org/projects/pvlib-python/badge/?version=latest)](http://pvlib-python.readthedocs.org/en/latest/)
97
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2554311.svg)](https://doi.org/10.5281/zenodo.2554311)
10-
[![Code Health](https://landscape.io/github/pvlib/pvlib-python/master/landscape.svg?style=flat)](https://landscape.io/github/pvlib/pvlib-python/master)
118
[![status](http://joss.theoj.org/papers/41187535cad22dd4b076c89b72f874b1/status.svg)](http://joss.theoj.org/papers/41187535cad22dd4b076c89b72f874b1)
129
[![Code Quality: Python](https://img.shields.io/lgtm/grade/python/g/pvlib/pvlib-python.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/pvlib/pvlib-python/context:python)
1310
[![Total Alerts](https://img.shields.io/lgtm/alerts/g/pvlib/pvlib-python.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/pvlib/pvlib-python/alerts)
1411

1512

16-
PVLIB Python is a community supported tool that provides a set of
13+
pvlib python is a community supported tool that provides a set of
1714
functions and classes for simulating the performance of photovoltaic
18-
energy systems. PVLIB Python was originally ported from the PVLIB MATLAB
15+
energy systems. pvlib python was originally ported from the PVLIB MATLAB
1916
toolbox developed at Sandia National Laboratories and it implements many
2017
of the models and methods developed at the Labs. More information on
2118
Sandia Labs PV performance modeling programs can be found at
@@ -35,10 +32,9 @@ Installation
3532
pvlib-python releases may be installed using the ``pip`` and ``conda`` tools.
3633
Please see the [Installation page](http://pvlib-python.readthedocs.io/en/latest/installation.html) of the documentation for complete instructions.
3734

38-
pvlib-python is compatible with Python versions 2.7 and 3.4-3.7.
35+
pvlib-python is compatible with Python 3.5 and above.
3936

40-
**Python 2.7 support will end on June 1, 2019**. Releases made after this
41-
date will require Python 3.
37+
**Python 2.7 support ended on June 1, 2019, with pvlib-python 0.6.3.**
4238

4339

4440
Contributing
@@ -83,4 +79,11 @@ If you use pvlib-python in a published work, please cite:
8379

8480
Please also cite the DOI corresponding to the specific version of
8581
pvlib-python that you used. pvlib-python DOIs are listed at
86-
[Zenodo.org](https://zenodo.org/search?page=1&size=20&q=conceptrecid:593284&all_versions&sort=-version)
82+
[Zenodo.org](https://zenodo.org/search?page=1&size=20&q=conceptrecid:593284&all_versions&sort=-version)
83+
84+
NumFOCUS
85+
========
86+
87+
pvlib python is a [NumFOCUS Affiliated Project](https://numfocus.org/sponsored-projects/affiliated-projects)
88+
89+
[![NumFocus Affliated Projects](https://i0.wp.com/numfocus.org/wp-content/uploads/2019/06/AffiliatedProject.png)](https://numfocus.org/sponsored-projects/affiliated-projects)

appveyor.yml

Lines changed: 0 additions & 43 deletions
This file was deleted.

azure-pipelines.yml

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
# https://docs.microsoft.com/azure/devops/pipelines/languages/python
2+
3+
trigger:
4+
- master
5+
6+
7+
jobs:
8+
9+
- job: 'Test_conda_linux'
10+
11+
pool:
12+
vmImage: 'ubuntu-16.04'
13+
14+
strategy:
15+
matrix:
16+
Python35:
17+
python.version: '35'
18+
Python36:
19+
python.version: '36'
20+
coverage: true
21+
Python37:
22+
python.version: '37'
23+
24+
steps:
25+
- bash: echo "##vso[task.prependpath]/usr/share/miniconda/bin"
26+
displayName: Add conda to PATH
27+
- script: conda env create --quiet --file ci/requirements-py$(python.version).yml
28+
displayName: Create Anaconda environment
29+
- script: |
30+
source activate test_env
31+
pip install pytest-azurepipelines
32+
pip install -e .
33+
displayName: 'pip dependencies'
34+
- script: |
35+
source activate test_env
36+
conda list
37+
displayName: 'List installed dependencies'
38+
- script: |
39+
source activate test_env
40+
pytest pvlib --junitxml=junit/test-results.xml --cov --cov-report=xml --cov-report=html
41+
displayName: 'pytest'
42+
# - script: |
43+
# source activate test_env
44+
# flake8 pvlib
45+
# displayName: 'flake8'
46+
- task: PublishTestResults@2
47+
inputs:
48+
testResultsFiles: '**/test-results.xml'
49+
testRunTitle: 'Linux $(python.version)'
50+
- task: PublishCodeCoverageResults@1
51+
inputs:
52+
codeCoverageTool: Cobertura
53+
summaryFileLocation: '$(System.DefaultWorkingDirectory)/**/coverage.xml'
54+
reportDirectory: '$(System.DefaultWorkingDirectory)/**/htmlcov'
55+
condition: eq(variables['coverage'], true)
56+
- script: |
57+
bash <(curl https://codecov.io/bash) -t bbc2bdbe-5e67-4fef-9cb7-f52fe0b703a8 -f coverage.xml -F adder -F subtractor -F conda
58+
displayName: 'codecov'
59+
condition: eq(variables['coverage'], true)
60+
61+
62+
- job: 'Test_conda_windows'
63+
64+
pool:
65+
vmImage: 'vs2017-win2016'
66+
67+
strategy:
68+
matrix:
69+
Python35-windows:
70+
python.version: '35'
71+
Python36-windows:
72+
python.version: '36'
73+
Python37-windows:
74+
python.version: '37'
75+
76+
steps:
77+
- powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
78+
displayName: Add conda to PATH
79+
- script: conda env create --quiet --file ci/requirements-py$(python.version).yml
80+
displayName: Create Anaconda environment
81+
- script: |
82+
call activate test_env
83+
pip install pytest-azurepipelines
84+
pip install -e .
85+
displayName: 'pip dependencies'
86+
- script: |
87+
call activate test_env
88+
conda list
89+
displayName: 'List installed dependencies'
90+
- script: |
91+
call activate test_env
92+
pytest pvlib --junitxml=junit/test-results.xml
93+
displayName: 'pytest'
94+
- task: PublishTestResults@2
95+
inputs:
96+
testResultsFiles: '**/test-results.xml'
97+
testRunTitle: 'Windows $(python.version)'
98+
99+
100+
- job: 'Publish'
101+
dependsOn: 'Test_conda_linux'
102+
pool:
103+
vmImage: 'ubuntu-latest'
104+
105+
steps:
106+
- task: UsePythonVersion@0
107+
inputs:
108+
versionSpec: '3.x'
109+
architecture: 'x64'
110+
111+
- script: python setup.py sdist
112+
displayName: 'Build sdist'

ci/requirements-py27-min.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

ci/requirements-py27.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

ci/requirements-py34.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

ci/requirements-py35-min.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: test_env
2+
channels:
3+
- defaults
4+
dependencies:
5+
- coveralls
6+
- nose
7+
- pip
8+
- pytest
9+
- pytest-cov
10+
- pytest-mock
11+
- pytest-timeout
12+
- python=3.5
13+
- pytz
14+
- requests
15+
- pip:
16+
- numpy==1.10.4
17+
- pandas==0.18.1

ci/requirements-py35.yml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,27 @@
11
name: test_env
22
channels:
3-
- conda-forge
43
- defaults
4+
- conda-forge
55
dependencies:
6-
- python=3.5
7-
- numpy
8-
- scipy
9-
- pytables
10-
- pandas
11-
- pytz
6+
- coveralls
7+
- cython
128
- ephem
9+
- netcdf4
10+
- nose
1311
- numba
14-
- siphon
12+
- numpy
13+
- pandas
14+
- pip
15+
- pytables # tables when using pip+PyPI
1516
- pytest
1617
- pytest-cov
1718
- pytest-mock
18-
- nose
19+
- pytest-timeout
20+
- python=3.5
21+
- pytz
22+
- requests
23+
- scipy
24+
- shapely # pvfactors dependency
25+
- siphon # conda-forge
1926
- pip:
20-
- coveralls
21-
- pytest-timeout
22-
- pvfactors==0.1.5
27+
- pvfactors==1.0.1

0 commit comments

Comments
 (0)