diff --git a/.gitignore b/.gitignore index 0258b3975c..8bfccb4468 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,6 @@ results .beads/ .claude/ .runtime/ + +# uv +uv.lock diff --git a/ci/requirements-py3.11.yml b/ci/requirements-py3.11.yml index f3eb4061f6..b738a822a8 100644 --- a/ci/requirements-py3.11.yml +++ b/ci/requirements-py3.11.yml @@ -24,5 +24,5 @@ dependencies: - scipy >= 1.7.2 - statsmodels - pip: - - nrel-pysam>=2.0 + - nlr-pysam >=8, <9 - solarfactors diff --git a/ci/requirements-py3.12.yml b/ci/requirements-py3.12.yml index d43be0a995..e951575ce7 100644 --- a/ci/requirements-py3.12.yml +++ b/ci/requirements-py3.12.yml @@ -24,5 +24,5 @@ dependencies: - scipy >= 1.7.2 - statsmodels - pip: - - nrel-pysam>=2.0 + - nlr-pysam >=8, <9 - solarfactors diff --git a/ci/requirements-py3.13.yml b/ci/requirements-py3.13.yml index 6ea6545572..c93a5dc374 100644 --- a/ci/requirements-py3.13.yml +++ b/ci/requirements-py3.13.yml @@ -24,5 +24,5 @@ dependencies: - scipy >= 1.7.2 - statsmodels - pip: - - nrel-pysam>=2.0 + - nlr-pysam >=8, <9 - solarfactors diff --git a/ci/requirements-py3.14.yml b/ci/requirements-py3.14.yml index 095006018b..dcca752ab0 100644 --- a/ci/requirements-py3.14.yml +++ b/ci/requirements-py3.14.yml @@ -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 diff --git a/pvlib/ivtools/sdm/cec.py b/pvlib/ivtools/sdm/cec.py index 881e51ebdb..2cc0cd5795 100644 --- a/pvlib/ivtools/sdm/cec.py +++ b/pvlib/ivtools/sdm/cec.py @@ -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. @@ -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, diff --git a/pyproject.toml b/pyproject.toml index de7fbb7fb8..3286ec2e92 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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', @@ -49,7 +49,7 @@ dynamic = ["version"] optional = [ 'cython', 'ephem', - 'nrel-pysam', + 'nlr-pysam >= 8, < 9', 'numba >= 0.17.0', 'solarfactors >= 1.6.1', 'statsmodels',