Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/requirements-py3.11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ dependencies:
- scipy >= 1.7.2
- statsmodels
- pip:
- nrel-pysam>=2.0
- nlr-pysam
- solarfactors
2 changes: 1 addition & 1 deletion ci/requirements-py3.12.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ dependencies:
- scipy >= 1.7.2
- statsmodels
- pip:
- nrel-pysam>=2.0
- nlr-pysam
- solarfactors
2 changes: 1 addition & 1 deletion ci/requirements-py3.13.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ dependencies:
- scipy >= 1.7.2
- statsmodels
- pip:
- nrel-pysam>=2.0
- nlr-pysam
- solarfactors
2 changes: 1 addition & 1 deletion ci/requirements-py3.14.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ dependencies:
- scipy >= 1.7.2
- statsmodels
- pip:
# - nrel-pysam>=2.0 # not available for py 3.14 as of 2025-11-03
- nlr-pysam
- solarfactors
3 changes: 3 additions & 0 deletions docs/sphinx/source/whatsnew/v0.16.2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ Enhancements
* Add ``dataset`` parameter to :py:func:`~pvlib.iotools.get_era5`
allowing for choosing between ERA5 and ERA5-Land datasets.
(:pull:`2780`)
* Support PySAM on Python 3.14 via the ``nlr-pysam`` package.
(:pull:`2872`)

Documentation
~~~~~~~~~~~~~
Expand Down Expand Up @@ -72,6 +74,7 @@ Contributors
* Adam R. Jensen (:ghuser:`AdamRJensen`)
* Cliff Hansen (:ghuser:`cwhanse`)
* Chen Yi (:ghuser:`chenyi6758-source`)
* Mohammad Kazemi (:ghuser:`mokazemi`)
* Rajiv Daxini (:ghuser:`rdaxini`)
* jason-writer (:ghuser:`jason-writer`)
* :ghuser:`mmporong`
Expand Down
8 changes: 5 additions & 3 deletions pvlib/ivtools/sdm/cec.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def fit_cec_sam(celltype, v_mp, i_mp, v_oc, i_sc, alpha_sc, beta_voc,
Raises
------
ImportError
if NREL-PySAM is not installed.
if ``NLR-PySAM`` is not installed.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we not format this in lowercase as the package name is formatted, especially if using double back ticks?

Suggested change
if ``NLR-PySAM`` is not installed.
if ``nlr-pysam`` is not installed.

RuntimeError
if parameter extraction is not successful.

Expand All @@ -76,8 +76,10 @@ def fit_cec_sam(celltype, v_mp, i_mp, v_oc, i_sc, alpha_sc, beta_voc,
try:
from PySAM import PySSC
except ImportError:
raise ImportError("Requires NREL's PySAM package at "
"https://pypi.org/project/NREL-PySAM/.")
raise ImportError(
"Requires PySAM. Install 'NLR-PySAM' for PySAM >= 8.0.0 "
"(older versions were distributed as 'NREL-PySAM')."
)

datadict = {'tech_model': '6parsolve', 'financial_model': None,
'celltype': celltype, 'Vmp': v_mp,
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dynamic = ["version"]
optional = [
'cython',
'ephem',
'nrel-pysam',
'nlr-pysam',
'numba >= 0.17.0',
'solarfactors >= 1.6.1',
'statsmodels',
Expand Down