Skip to content

Swap nlr-pysam for nrel-pysam and bound python above at 3.15 exclusive #2945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
markcampanelli wants to merge 1 commit into from
Closed

Swap nlr-pysam for nrel-pysam and bound python above at 3.15 exclusive #2945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,6 @@ results
.beads/
.claude/
.runtime/

# uv
uv.lock
2 changes: 1 addition & 1 deletion ci/requirements-py3.11.yml
View file
Open in desktop
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 >=8, <9
- solarfactors
2 changes: 1 addition & 1 deletion ci/requirements-py3.12.yml
View file
Open in desktop
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 >=8, <9
- solarfactors
2 changes: 1 addition & 1 deletion ci/requirements-py3.13.yml
View file
Open in desktop
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 >=8, <9
- solarfactors
2 changes: 1 addition & 1 deletion ci/requirements-py3.14.yml
View file
Open in desktop
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 >=8, <9
- solarfactors
6 changes: 3 additions & 3 deletions pvlib/ivtools/sdm/cec.py
View file
Open in desktop
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.
RuntimeError
if parameter extraction is not successful.

Expand All @@ -76,8 +76,8 @@ 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 NLR's PySAM package at "
"https://pypi.org/project/NLR-PySAM/.")

datadict = {'tech_model': '6parsolve', 'financial_model': None,
'celltype': celltype, 'Vmp': v_mp,
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ description = "A set of functions and classes for simulating the performance of
authors = [
{ name = "pvlib python Developers", email = "pvlib-admin@googlegroups.com" },
]
requires-python = ">=3.11"
requires-python = ">=3.11, <3.15"
dependencies = [
'numpy >= 1.23.2',
'pandas >= 1.5.0',
Expand Down Expand Up @@ -49,7 +49,7 @@ dynamic = ["version"]
optional = [
'cython',
'ephem',
'nrel-pysam',
'nlr-pysam >= 8, < 9',
'numba >= 0.17.0',
'solarfactors >= 1.6.1',
'statsmodels',
Expand Down
Loading