Skip to content

Commit 3e88458

Browse files
cwhansecwhanse
committed
Merge branch 'master' of https://github.com/pvlib/pvlib-python 
2 parents e0b0813 + f38fe07 commit 3e88458

53 files changed

Lines changed: 19114 additions & 623 deletions

Some content is hidden

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

‎README.md‎

Lines changed: 4 additions & 7 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
@@ -83,4 +80,4 @@ If you use pvlib-python in a published work, please cite:
8380

8481
Please also cite the DOI corresponding to the specific version of
8582
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)
83+
[Zenodo.org](https://zenodo.org/search?page=1&size=20&q=conceptrecid:593284&all_versions&sort=-version)

‎appveyor.yml‎

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

‎azure-pipelines.yml‎

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

‎ci/requirements-py27.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: test_env
22
channels:
3-
- conda-forge
43
- defaults
4+
- conda-forge
55
dependencies:
66
- python=2.7
77
- numpy
@@ -14,9 +14,10 @@ dependencies:
1414
- siphon
1515
- pytest
1616
- pytest-cov
17-
- pytest-mock
1817
- nose
18+
- shapely # pvfactors dependency
1919
- pip:
2020
- coveralls
21+
- pytest-mock
2122
- pytest-timeout
22-
- pvfactors==0.1.5
23+
- pvfactors==1.0.1

‎ci/requirements-py34.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ dependencies:
1414
- siphon
1515
- pytest
1616
- pytest-cov
17-
- pytest-mock
1817
- nose
1918
- pip:
2019
- coveralls
20+
- pytest-mock
2121
- pytest-timeout

‎ci/requirements-py35.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: test_env
22
channels:
3-
- conda-forge
43
- defaults
4+
- conda-forge
55
dependencies:
66
- python=3.5
77
- numpy
@@ -14,9 +14,10 @@ dependencies:
1414
- siphon
1515
- pytest
1616
- pytest-cov
17-
- pytest-mock
1817
- nose
18+
- shapely # pvfactors dependency
1919
- pip:
2020
- coveralls
21+
- pytest-mock
2122
- pytest-timeout
22-
- pvfactors==0.1.5
23+
- pvfactors==1.0.1

‎ci/requirements-py36.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ dependencies:
1414
- siphon
1515
- pytest
1616
- pytest-cov
17-
- pytest-mock
1817
- nose
18+
- shapely # pvfactors dependency
1919
- pip:
2020
- coveralls
21-
- pvfactors==0.1.5
21+
- pytest-mock
22+
- pytest-timeout
23+
- pvfactors==1.0.1

‎ci/requirements-py37.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ dependencies:
1111
- pytz
1212
- ephem
1313
- numba
14-
# - siphon
14+
- siphon
1515
- pytest
1616
- pytest-cov
17-
- pytest-mock
1817
- nose
18+
- shapely # pvfactors dependency
1919
- pip:
2020
- coveralls
21-
- pvfactors==0.1.5
21+
- pytest-mock
22+
- pytest-timeout
23+
- pvfactors==1.0.1

‎docs/environment.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ dependencies:
1313
- ephem
1414
- numba
1515
- ipython=6.3
16-
- numpydoc
1716
- matplotlib=2.2.2
1817
- siphon=0.7.0
1918
- sphinx=1.7.2

‎docs/sphinx/source/_images/pvlib_logo_horiz.png‎

81.8 KB
Loading

0 commit comments

Comments
 (0)