From 2a27db8b4c5644db69681f88b728f6b7ccc194cc Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Fri, 10 Jan 2020 10:19:01 -0700 Subject: [PATCH 1/8] update whats new for #844 and other contributors --- docs/sphinx/source/whatsnew/v0.7.1.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/sphinx/source/whatsnew/v0.7.1.rst b/docs/sphinx/source/whatsnew/v0.7.1.rst index 85059e376c..7f8f068c2b 100644 --- a/docs/sphinx/source/whatsnew/v0.7.1.rst +++ b/docs/sphinx/source/whatsnew/v0.7.1.rst @@ -20,6 +20,8 @@ Enhancements Bug fixes ~~~~~~~~~ +* Fix error in logic for emitting deprecation warning in + :py:func:`~pvlib.pvsystem.sapm` (:pull:`844`) * Changed the PSM3 API endpoint for TMY requests in `iotools.get_psm3`. Testing @@ -36,3 +38,7 @@ Contributors ~~~~~~~~~~~~ * Kevin Anderson (:ghuser:`kanderso-nrel`) * Mark Mikofski (:ghuser:`mikofski`) +* :ghuser:`dzimmanck` +* Will Holmgren (:ghuser:`wholmgren`) +* Mark Mikofski (:ghuser:`mikofski`) +* Cliff Hansen (:ghuser:`cwhanse`) From 34b633a67ce8c8256a3adac80638e05be8dd2451 Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Fri, 10 Jan 2020 10:27:25 -0700 Subject: [PATCH 2/8] rebase --- docs/sphinx/source/whatsnew/v0.7.1.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sphinx/source/whatsnew/v0.7.1.rst b/docs/sphinx/source/whatsnew/v0.7.1.rst index 7f8f068c2b..0026cc8a2f 100644 --- a/docs/sphinx/source/whatsnew/v0.7.1.rst +++ b/docs/sphinx/source/whatsnew/v0.7.1.rst @@ -15,6 +15,7 @@ Enhancements * Added `leap_day` parameter to `iotools.get_psm3` instead of hardcoding it as False. * Added :py:func:`~pvlib.iotools.get_pvgis_tmy` to get PVGIS TMY datasets. + (:pull:`845`) * Added :py:func:`~pvlib.iotools.parse_epw` to parse a file-like buffer containing weather data in the EPW format. @@ -40,5 +41,4 @@ Contributors * Mark Mikofski (:ghuser:`mikofski`) * :ghuser:`dzimmanck` * Will Holmgren (:ghuser:`wholmgren`) -* Mark Mikofski (:ghuser:`mikofski`) * Cliff Hansen (:ghuser:`cwhanse`) From 8df3c67a20f2af92bd06d4be4b6ba5d9f86027cf Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Fri, 10 Jan 2020 11:25:06 -0700 Subject: [PATCH 3/8] epw docstring noqa fix --- pvlib/iotools/epw.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pvlib/iotools/epw.py b/pvlib/iotools/epw.py index 8a6ae6cd25..07e1542a0f 100644 --- a/pvlib/iotools/epw.py +++ b/pvlib/iotools/epw.py @@ -68,7 +68,7 @@ def read_epw(filename, coerce_year=None): =============== ====== ========================================= - ============================= ================================================================================================================================================================================================================== # noqa: E501 + ============================= ================================================================================================================================================================================================================== EPWData field description ============================= ================================================================================================================================================================================================================== index A pandas datetime index. NOTE, times are set to local standard time (daylight savings is not included). Days run from 0-23h to comply with PVLIB's convention @@ -114,7 +114,7 @@ def read_epw(filename, coerce_year=None): .. [1] `EnergyPlus documentation, Auxiliary Programs `_ - ''' + ''' # noqa: E501 if filename.startswith('http'): # Attempts to download online EPW file From 5e268aa97a0fa8671c8f3233d64c739c7ee9b0bd Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Fri, 10 Jan 2020 11:30:47 -0700 Subject: [PATCH 4/8] update whatsnew date --- docs/sphinx/source/whatsnew/v0.7.1.rst | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/docs/sphinx/source/whatsnew/v0.7.1.rst b/docs/sphinx/source/whatsnew/v0.7.1.rst index 0026cc8a2f..7804f31a85 100644 --- a/docs/sphinx/source/whatsnew/v0.7.1.rst +++ b/docs/sphinx/source/whatsnew/v0.7.1.rst @@ -1,11 +1,7 @@ .. _whatsnew_0710: -v0.7.1 (MONTH DAY, YEAR) ------------------------- - - -API Changes -~~~~~~~~~~~ +v0.7.1 (January 10, 2020) +------------------------- Enhancements ~~~~~~~~~~~~ From a0ad0020fa12af97283197caa930e254d0de1006 Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Fri, 17 Jan 2020 15:58:19 -0700 Subject: [PATCH 5/8] add anton. minor api.rst clean up --- docs/sphinx/source/api.rst | 4 +++- docs/sphinx/source/whatsnew/v0.7.1.rst | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/sphinx/source/api.rst b/docs/sphinx/source/api.rst index 43cfd5afe2..01af8f6505 100644 --- a/docs/sphinx/source/api.rst +++ b/docs/sphinx/source/api.rst @@ -299,7 +299,8 @@ PVWatts model pvsystem.pvwatts_losses Functions for fitting diode models -------------------------------- +---------------------------------- + .. autosummary:: :toctree: generated/ @@ -309,6 +310,7 @@ Functions for fitting diode models Losses ------ + .. autosummary:: :toctree: generated/ diff --git a/docs/sphinx/source/whatsnew/v0.7.1.rst b/docs/sphinx/source/whatsnew/v0.7.1.rst index 9621866764..af0368821d 100644 --- a/docs/sphinx/source/whatsnew/v0.7.1.rst +++ b/docs/sphinx/source/whatsnew/v0.7.1.rst @@ -1,6 +1,6 @@ .. _whatsnew_0710: -v0.7.1 (January 10, 2020) +v0.7.1 (January 17, 2020) ------------------------- Enhancements @@ -45,3 +45,4 @@ Contributors * Will Holmgren (:ghuser:`wholmgren`) * Cliff Hansen (:ghuser:`cwhanse`) * Valliappan CA (:ghuser:`nappaillav`) +* Anton Driesse (:ghuser:`adriesse`) From 08004a388190ecd2db48d4170d9dbdf42d6737e1 Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Fri, 17 Jan 2020 16:11:11 -0700 Subject: [PATCH 6/8] escape asterisk --- pvlib/iotools/epw.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pvlib/iotools/epw.py b/pvlib/iotools/epw.py index 82a7fd7305..ca59f84248 100644 --- a/pvlib/iotools/epw.py +++ b/pvlib/iotools/epw.py @@ -179,7 +179,7 @@ def read_epw(filename, coerce_year=None): | precipitable_water | Total precipitable water contained in a | | | column of unit cross section from earth | | | to top of atmosphere, cm. Note that some| - | | old *_TMY3.epw files may have incorrect | + | | old \*_TMY3.epw files may have incorrect| | | unit if it was retrieved from | | | www.energyplus.net. | +-------------------------------+-----------------------------------------+ From 457cfb3e2cdd91843901fe451370cfd1ee22763b Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Fri, 17 Jan 2020 16:11:58 -0700 Subject: [PATCH 7/8] add docs auto_examples to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ab0452c628..cc540f70c0 100644 --- a/.gitignore +++ b/.gitignore @@ -41,6 +41,7 @@ pvlib/spa_c_files/spa_tester.c # generated documentation docs/sphinx/source/generated docs/sphinx/source/savefig +docs/sphinx/source/auto_examples # Installer logs pip-log.txt From 2024a880d4dbfd8cd1e2450c7ccfc74eb00f178a Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Fri, 17 Jan 2020 16:18:55 -0700 Subject: [PATCH 8/8] pep8 --- pvlib/iotools/epw.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pvlib/iotools/epw.py b/pvlib/iotools/epw.py index ca59f84248..df93e125c5 100644 --- a/pvlib/iotools/epw.py +++ b/pvlib/iotools/epw.py @@ -8,7 +8,7 @@ def read_epw(filename, coerce_year=None): - ''' + r''' Read an EPW file in to a pandas dataframe. Note that values contained in the metadata dictionary are unchanged