Skip to content

Commit f7ba1ad

Browse files
committed
Merge branch 'master' of https://github.com/pvlib/pvlib-python into townsend_snow_loss
2 parents f79e906 + 5047b26 commit f7ba1ad

25 files changed

+175
-85
lines changed

.github/workflows/asv_check.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: asv
2+
3+
# CI ASV CHECK is aimed to verify that the benchmarks execute without error.
4+
on: [pull_request, push]
5+
6+
jobs:
7+
quick:
8+
runs-on: ubuntu-latest
9+
defaults:
10+
run:
11+
shell: bash -el {0}
12+
13+
steps:
14+
- uses: actions/checkout@v3
15+
with:
16+
fetch-depth: 0
17+
18+
- name: Install Python
19+
uses: actions/setup-python@v3
20+
with:
21+
python-version: '3.9.7'
22+
23+
- name: Install asv
24+
run: pip install asv==0.4.2
25+
26+
- name: Run asv benchmarks
27+
run: |
28+
cd benchmarks
29+
asv machine --yes
30+
asv run HEAD^! --quick --dry-run --show-stderr | sed "/failed$/ s/^/##[error]/" | tee benchmarks.log
31+
if grep "failed" benchmarks.log > /dev/null ; then
32+
exit 1
33+
fi
34+

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</tr>
3636
<tr>
3737
<td>Code Quality</td>
38-
 <td>
38+
<td>
3939
<a href="https://lgtm.com/projects/g/pvlib/pvlib-python/context:python">
4040
<img src="https://img.shields.io/lgtm/grade/python/g/pvlib/pvlib-python.svg?logo=lgtm&logoWidth=18" alt="lgtm quality grade" />
4141
</a>
@@ -46,7 +46,7 @@
4646
</tr>
4747
<tr>
4848
<td>Coverage</td>
49-
 <td>
49+
<td>
5050
<a href="https://coveralls.io/r/pvlib/pvlib-python">
5151
<img src="https://img.shields.io/coveralls/pvlib/pvlib-python.svg" alt="coveralls coverage" />
5252
</a>
@@ -62,11 +62,12 @@
6262
<img src="https://img.shields.io/badge/benchmarks-asv-lightgrey" />
6363
</a>
6464
</td>
65-
</tr>
65+
</tr>
66+
<tr>
6667
<td>Publications</td>
6768
<td>
68-
<a href="https://doi.org/10.5281/zenodo.3762635">
69-
<img src="https://zenodo.org/badge/DOI/10.5281/zenodo.3762635.svg" alt="zenodo reference">
69+
<a href="https://doi.org/10.5281/zenodo.593284">
70+
<img src="https://zenodo.org/badge/DOI/10.5281/zenodo.593284.svg" alt="zenodo reference">
7071
</a>
7172
<a href="http://joss.theoj.org/papers/41187535cad22dd4b076c89b72f874b1">
7273
<img src="http://joss.theoj.org/papers/41187535cad22dd4b076c89b72f874b1/status.svg" alt="JOSS reference" />
@@ -107,7 +108,7 @@ Installation
107108
============
108109

109110
pvlib-python releases may be installed using the ``pip`` and ``conda`` tools.
110-
Please see the [Installation page](http://pvlib-python.readthedocs.io/en/stable/installation.html) of the documentation for complete instructions.
111+
Please see the [Installation page](https://pvlib-python.readthedocs.io/en/stable/user_guide/installation.html) of the documentation for complete instructions.
111112

112113

113114
Contributing

benchmarks/asv.conf.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,12 @@
116116
{
117117
"python": "3.6",
118118
"numpy": "1.16.0",
119-
"pandas": "0.22.0",
119+
"pandas": "0.25.0",
120120
"scipy": "1.2.0",
121121
// Note: these don't have a minimum in setup.py
122122
"h5py": "2.10.0",
123123
"ephem": "3.7.6.0",
124-
"numba": "0.36.1",
124+
"numba": "0.40.0",
125125
},
126126
// latest versions available
127127
{

ci/requirements-py36-min.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616
- dataclasses
1717
- h5py==3.1.0
1818
- numpy==1.16.0
19-
- pandas==0.22.0
19+
- pandas==0.25.0
2020
- scipy==1.2.0
2121
- pytest-rerunfailures # conda version is >3.6
2222
- pytest-remotedata # conda package is 0.3.0, needs > 0.3.1

ci/requirements-py36.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies:
1111
- nose
1212
- numba
1313
- numpy >= 1.16.0
14-
- pandas >= 0.22.0
14+
- pandas >= 0.25.0
1515
- pip
1616
- pytest
1717
- pytest-cov

ci/requirements-py37.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies:
1111
- nose
1212
- numba
1313
- numpy >= 1.16.0
14-
- pandas >= 0.22.0
14+
- pandas >= 0.25.0
1515
- pip
1616
- pytest
1717
- pytest-cov

ci/requirements-py38.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies:
1111
- nose
1212
- numba
1313
- numpy >= 1.16.0
14-
- pandas >= 0.22.0
14+
- pandas >= 0.25.0
1515
- pip
1616
- pytest
1717
- pytest-cov

ci/requirements-py39.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies:
1111
- nose
1212
# - numba # python 3.9 compat in early 2021
1313
- numpy >= 1.16.0
14-
- pandas >= 0.22.0
14+
- pandas >= 0.25.0
1515
- pip
1616
- pytest
1717
- pytest-cov

docs/examples/iv-modeling/plot_singlediode.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
for i, case in conditions.iterrows():
104104
label = (
105105
"$G_{eff}$ " + f"{case['Geff']} $W/m^2$\n"
106-
"$T_{cell}$ " + f"{case['Tcell']} $C$"
106+
"$T_{cell}$ " + f"{case['Tcell']} $\\degree C$"
107107
)
108108
plt.plot(curve_info['v'][i], curve_info['i'][i], label=label)
109109
v_mp = curve_info['v_mp'][i]

docs/sphinx/source/conf.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
# for generating GH links with linenumbers
2121
import inspect
2222

23+
# import distutils before calling pd.show_versions()
24+
# https://github.com/pypa/setuptools/issues/3044
25+
import distutils # noqa: F401
2326
import pandas as pd
2427
pd.show_versions()
2528

@@ -244,7 +247,7 @@ def setup(app):
244247
# In-line links to references as numbers in brackets.
245248
app.add_css_file("reference_format.css")
246249
# Add a warning banner at the top of the page if viewing the "latest" docs
247-
app.add_javascript("version-alert.js")
250+
app.add_js_file("version-alert.js")
248251

249252
# -- Options for LaTeX output ---------------------------------------------
250253

@@ -343,8 +346,6 @@ def setup(app):
343346
'matplotlib': ('https://matplotlib.org/stable', None),
344347
}
345348

346-
nbsphinx_allow_errors = True
347-
348349
ipython_warning_is_error = False
349350

350351
# suppress "WARNING: Footnote [1] is not referenced." messages

0 commit comments

Comments
 (0)