From 90a0b2f4e4a88d8b0a275560bdd0d7410633621b Mon Sep 17 00:00:00 2001 From: Cliff Hansen Date: Thu, 30 Jan 2020 09:15:32 -0700 Subject: [PATCH 1/3] 'none' to None --- pvlib/ivtools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pvlib/ivtools.py b/pvlib/ivtools.py index 6f101324f7..60fc806d4a 100644 --- a/pvlib/ivtools.py +++ b/pvlib/ivtools.py @@ -92,7 +92,7 @@ def fit_sdm_cec_sam(celltype, v_mp, i_mp, v_oc, i_sc, alpha_sc, beta_voc, raise ImportError("Requires NREL's PySAM package at " "https://pypi.org/project/NREL-PySAM/.") - datadict = {'tech_model': '6parsolve', 'financial_model': 'none', + datadict = {'tech_model': '6parsolve', 'financial_model': None, 'celltype': celltype, 'Vmp': v_mp, 'Imp': i_mp, 'Voc': v_oc, 'Isc': i_sc, 'alpha_isc': alpha_sc, 'beta_voc': beta_voc, 'gamma_pmp': gamma_pmp, From 807b09b5b9aff0b03a810beaa30b32c59043b1a8 Mon Sep 17 00:00:00 2001 From: Cliff Hansen Date: Thu, 30 Jan 2020 09:35:03 -0700 Subject: [PATCH 2/3] require pysam 2.0 or later --- ci/requirements-py35.yml | 2 +- ci/requirements-py36.yml | 2 +- ci/requirements-py37.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/requirements-py35.yml b/ci/requirements-py35.yml index 5fc0077991..fe528f9aab 100644 --- a/ci/requirements-py35.yml +++ b/ci/requirements-py35.yml @@ -24,5 +24,5 @@ dependencies: - shapely # pvfactors dependency - siphon # conda-forge - pip: - - nrel-pysam + - nrel-pysam>=2.0 - pvfactors==1.0.1 diff --git a/ci/requirements-py36.yml b/ci/requirements-py36.yml index e415f67c7d..ba4da5ce30 100644 --- a/ci/requirements-py36.yml +++ b/ci/requirements-py36.yml @@ -24,5 +24,5 @@ dependencies: - shapely # pvfactors dependency - siphon # conda-forge - pip: - - nrel-pysam + - nrel-pysam>=2.0 - pvfactors==1.0.1 diff --git a/ci/requirements-py37.yml b/ci/requirements-py37.yml index 1a6809fba6..359695067e 100644 --- a/ci/requirements-py37.yml +++ b/ci/requirements-py37.yml @@ -24,5 +24,5 @@ dependencies: - shapely # pvfactors dependency - siphon # conda-forge - pip: - - nrel-pysam + - nrel-pysam>=2.0 - pvfactors==1.0.1 From 4fa1afa4b87774e98c6b9abd1c2bc64f50a66a79 Mon Sep 17 00:00:00 2001 From: Cliff Hansen Date: Thu, 6 Feb 2020 12:54:34 -0700 Subject: [PATCH 3/3] add note to whatsnew --- docs/sphinx/source/whatsnew/v0.7.2.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/sphinx/source/whatsnew/v0.7.2.rst b/docs/sphinx/source/whatsnew/v0.7.2.rst index abd4771101..ce84fe8857 100644 --- a/docs/sphinx/source/whatsnew/v0.7.2.rst +++ b/docs/sphinx/source/whatsnew/v0.7.2.rst @@ -18,6 +18,11 @@ Documentation ~~~~~~~~~~~~~ * Add NumFOCUS affiliation to Sphinx documentation :pull:`862` +Requirements +~~~~~~~~~~~~ +* nrel-pysam (optional) minimum set to v1.0.0 (:issue:`874`) + Contributors ~~~~~~~~~~~~ * Mark Mikofski (:ghuser:`mikofski`) +* Cliff Hansen (:ghuser:`cwhanse`)