Skip to content

Commit b313c64

Browse files
AdamRJensenAdamRJensen
committed
Squashed commit of the following:
commit 5047b26 Author: Prajwal Borkar <[email protected]> Date: Tue May 17 19:14:53 2022 +0530 Updated get_cams protocol to https #1457 (#1458) * Updated get_cams protocol to https #1457 * Updated instances of http to https. #1457 * Updated documentation links to https * Added Contributor commit a0812b1 Author: roger-lcc <[email protected]> Date: Wed May 4 20:01:42 2022 +0800 CI asv check (#1454) * CI asv check * added CI asv check * CI asv check * CI asv check * updated CI asv check * Update docs/sphinx/source/whatsnew/v0.9.2.rst updated v0.9.2.rst Co-authored-by: Kevin Anderson <[email protected]> Co-authored-by: Kevin Anderson <[email protected]> commit 83e379a Author: Kevin Anderson <[email protected]> Date: Thu Apr 28 19:26:09 2022 -0400 Bump pandas to 0.25.0; test updates (#1448) * bump pandas min from 0.22.0 to 0.25.0 * fix buggy test__check_pandas_assert_kwargs don't use monkeypatch and mocker in the same test function. pytest-dev/pytest-mock#289 * fix psm3 test (apparent_zenith -> solar_zenith) * whatsnew * better UTC conversion in sun_rise_set_transit_ephem * helpful comments * more whatsnew * '3.0' -> '3' in read_crn test? * apply dtypes during parsing in read_crn * move dropna() post-processing into read_fwf call * fix read_crn for pandas<1.2.0 * Update pvlib/solarposition.py Co-authored-by: Will Holmgren <[email protected]> * nix pytz * UTC -> utc * address simd arccos issue in tracking.singleaxis Co-authored-by: Will Holmgren <[email protected]> commit 8d0f863 Author: Naman Priyadarshi <[email protected]> Date: Tue Apr 12 22:55:58 2022 +0530 Advance numba from 0.36.1 to 0.40.0 in asv py3.6 environment (#1440) * Advance numba from 0.36.1 to 0.40.0 * Advance numba from 0.36.1 to 0.40.0 * Updated whatsnew.rst commit 5cb695d Author: Naman Priyadarshi <[email protected]> Date: Wed Apr 6 23:58:03 2022 +0530 Remove unnecessary **kwargs from spa_python and get_total_irradiance (#1437) * Update Solarposition.py Removed **kwargs from pvlib.solarposition.spa_python * Added v0.9.2.rst, changes in pvlib/irradiance.py and pvlib/location.py Made new v0.9.2.rst and removed **kwargs from pvlib/irradiance.py (Line 309) and pvlib/location.py (Line 234-235) * Update docs/sphinx/source/whatsnew/v0.9.2.rst * Update docs/sphinx/source/whatsnew/v0.9.2.rst Co-authored-by: Kevin Anderson <[email protected]> commit 8460b36 Author: Kevin Anderson <[email protected]> Date: Tue Mar 29 15:31:25 2022 -0600 Finalize 0.9.1 (#1431) * fix heading levels in user_guide/bifacial.rst * whatsnew cleanup * fix readme html missing tag, maybe unicode zero-width spaces? * readme: link to universal zenodo doi * readme: update installation link for #1173 * whatsnew date * additional contributors * delete errant space commit edbf2a6 Author: RoyCoding8 <[email protected]> Date: Wed Mar 30 01:58:18 2022 +0530 Updated plot_singlediode.py (#1434) * Update plot_singlediode.py Changed the unit from C to degree C (°C) * Update plot_singlediode.py Changed to LaTeX \degree symbol in matplotlib which avoids any encoding issues with using Unicode characters. * Update v0.9.1.rst Added name to the contributors' list * Update v0.9.1.rst commit cf4a8ad Author: Kevin Anderson <[email protected]> Date: Tue Mar 29 14:04:40 2022 -0600 Update sphinx to 4.5.0 (#1435) * bump sphinx and pydata-sphinx-theme versions * clean up sphinx conf.py * fix distutils strangeness, maybe * use freshly-released sphinx==4.5.0 commit 884a153 Author: Kevin Anderson <[email protected]> Date: Wed Mar 23 13:41:35 2022 -0600 Clarify delta_t docstring descriptions (#1429) * clarify delta_t docstrings * whatsnew commit c243183 Author: Kevin Anderson <[email protected]> Date: Thu Mar 17 12:01:57 2022 -0600 Deprecate pvlib.forecast (#1426) * deprecate pvlib.forecast classes * catch warnings in tests * add warning admonition to forecasts.rst * whatsnew * stickler * pin pytest < 7.1.0 * pin pytest in the right place this time * more warning suppression in tests * unpin pytest * Update docs/sphinx/source/whatsnew/v0.9.1.rst * copy warning to reference/forecasting.rst commit e3baa12 Author: Kevin Anderson <[email protected]> Date: Thu Mar 17 11:28:56 2022 -0600 Fix conditional dependency on dataclasses (#1422) * better conditional dependency on dataclasses * whatsnew commit 27cba7a Author: Naman Priyadarshi <[email protected]> Date: Thu Mar 17 22:48:08 2022 +0530 Added asv benchmarking badge to the table of badges in the main README. (#1427) * Update Readme.md Added benchmarks asv badge to the badge section * Updated v.0.9.1.rst Added my name to the list of Contributers. commit 1893b20 Author: Adam R. Jensen <[email protected]> Date: Mon Mar 14 18:37:58 2022 +0100 Add variable mapping of psm3 (#1374) * Add variable mapping of psm3 * Add enhancement entry in whatsnew * Fix stickler * Map keys in metadata dict * Remove double spaces in docs * Fix stickler * Doc update Co-authored-by: Kevin Anderson <[email protected]> * Reformatting - changes by kanderso-nrel * Update docstring table with 2020 * Add deprecation warning test coverage * Rename to VARIABLE_MAP * Change apparent_zenith to solar_zenith Based on the decision in #1403 * Update attributes docstring * Change elevation to altitude when mapping variables * Update psm3 variable mapping test Co-authored-by: Kevin Anderson <[email protected]>
1 parent fa8b9e4 commit b313c64

30 files changed

+372
-124
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: 13 additions & 5 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>
@@ -55,11 +55,19 @@
5555
</a>
5656
</td>
5757
</tr>
58+
<tr>
59+
<td>Benchmarks</td>
60+
<td>
61+
<a href="https://pvlib-benchmarker.github.io/pvlib-benchmarks/">
62+
<img src="https://img.shields.io/badge/benchmarks-asv-lightgrey" />
63+
</a>
64+
</td>
65+
</tr>
5866
<tr>
5967
<td>Publications</td>
6068
<td>
61-
<a href="https://doi.org/10.5281/zenodo.3762635">
62-
<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">
6371
</a>
6472
<a href="http://joss.theoj.org/papers/41187535cad22dd4b076c89b72f874b1">
6573
<img src="http://joss.theoj.org/papers/41187535cad22dd4b076c89b72f874b1/status.svg" alt="JOSS reference" />
@@ -100,7 +108,7 @@ Installation
100108
============
101109

102110
pvlib-python releases may be installed using the ``pip`` and ``conda`` tools.
103-
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.
104112

105113

106114
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)