Skip to content

Commit 160c32b

Browse files
authored
Update for PySAM 2.0 (#874)
* 'none' to None * require pysam 2.0 or later
1 parent fb1ab53 commit 160c32b

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

ci/requirements-py35.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ dependencies:
2424
- shapely # pvfactors dependency
2525
- siphon # conda-forge
2626
- pip:
27-
- nrel-pysam
27+
- nrel-pysam>=2.0
2828
- pvfactors==1.0.1

ci/requirements-py36.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ dependencies:
2424
- shapely # pvfactors dependency
2525
- siphon # conda-forge
2626
- pip:
27-
- nrel-pysam
27+
- nrel-pysam>=2.0
2828
- pvfactors==1.0.1

ci/requirements-py37.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ dependencies:
2424
- shapely # pvfactors dependency
2525
- siphon # conda-forge
2626
- pip:
27-
- nrel-pysam
27+
- nrel-pysam>=2.0
2828
- pvfactors==1.0.1

docs/sphinx/source/whatsnew/v0.7.2.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ Documentation
1818
~~~~~~~~~~~~~
1919
* Add NumFOCUS affiliation to Sphinx documentation :pull:`862`
2020

21+
Requirements
22+
~~~~~~~~~~~~
23+
* nrel-pysam (optional) minimum set to v1.0.0 (:issue:`874`)
24+
2125
Contributors
2226
~~~~~~~~~~~~
2327
* Mark Mikofski (:ghuser:`mikofski`)
28+
* Cliff Hansen (:ghuser:`cwhanse`)

pvlib/ivtools.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def fit_sdm_cec_sam(celltype, v_mp, i_mp, v_oc, i_sc, alpha_sc, beta_voc,
9292
raise ImportError("Requires NREL's PySAM package at "
9393
"https://pypi.org/project/NREL-PySAM/.")
9494

95-
datadict = {'tech_model': '6parsolve', 'financial_model': 'none',
95+
datadict = {'tech_model': '6parsolve', 'financial_model': None,
9696
'celltype': celltype, 'Vmp': v_mp,
9797
'Imp': i_mp, 'Voc': v_oc, 'Isc': i_sc, 'alpha_isc': alpha_sc,
9898
'beta_voc': beta_voc, 'gamma_pmp': gamma_pmp,

0 commit comments

Comments
 (0)