Merge branch 'main' of https://github.com/pvlib/pvlib-python into gro…

…und_diffuse_doc

.github/workflows/flake8.yml

@@ -20,7 +20,7 @@ jobs:
           git remote add upstream https://github.com/pvlib/pvlib-python.git
           git fetch upstream $GITHUB_BASE_REF
       - name: Run Flake8 linter
-        run: git diff upstream/$GITHUB_BASE_REF HEAD | flake8
+        run: git diff upstream/$GITHUB_BASE_REF HEAD -- "*.py" | flake8
           --exclude pvlib/version.py
           --ignore E201,E241,E226,W503,W504
           --max-line-length 79

.github/workflows/pytest-remote-data.yml

@@ -56,7 +56,7 @@ jobs:
     strategy:
       fail-fast: false  # don't cancel other matrix jobs when one fails
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
+        python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
         suffix: ['']  # the alternative to "-min"
         include:
           - python-version: 3.7

.github/workflows/pytest.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: false  # don't cancel other matrix jobs when one fails
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
+        python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
         environment-type: [conda, bare]
         suffix: ['']  # placeholder as an alternative to "-min"
         include:

README.md

@@ -7,11 +7,11 @@
     <a href="https://pypi.org/project/pvlib/">
     <img src="https://img.shields.io/pypi/v/pvlib.svg" alt="latest release" />
     </a>
-    <a href="https://anaconda.org/conda-forge/pvlib-python">
-    <img src="https://anaconda.org/conda-forge/pvlib-python/badges/version.svg" />
+    <a href="https://anaconda.org/conda-forge/pvlib">
+    <img src="https://anaconda.org/conda-forge/pvlib/badges/version.svg" />
     </a>
-    <a href="https://anaconda.org/conda-forge/pvlib-python">
-    <img src="https://anaconda.org/conda-forge/pvlib-python/badges/latest_release_date.svg" />
+    <a href="https://anaconda.org/conda-forge/pvlib">
+    <img src="https://anaconda.org/conda-forge/pvlib/badges/latest_release_date.svg" />
     </a>
 </tr>
 <tr>
@@ -50,33 +50,18 @@
     <a href="https://doi.org/10.5281/zenodo.593284">
     <img src="https://zenodo.org/badge/DOI/10.5281/zenodo.593284.svg" alt="zenodo reference">
     </a>
-    <a href="http://joss.theoj.org/papers/41187535cad22dd4b076c89b72f874b1">
-    <img src="http://joss.theoj.org/papers/41187535cad22dd4b076c89b72f874b1/status.svg" alt="JOSS reference" />
-    </a>
-  </td>
-</tr>
-<tr>
-  <td>Downloads</td>
-  <td>
-    <a href="https://pypi.org/project/pvlib/">
-    <img src="https://img.shields.io/pypi/dm/pvlib" alt="PyPI downloads" />
-    </a>
-    <a href="https://anaconda.org/conda-forge/pvlib-python">
-    <img src="https://anaconda.org/conda-forge/pvlib-python/badges/downloads.svg" alt="conda-forge downloads" />
+    <a style="border-width:0" href="https://doi.org/10.21105/joss.05994">
+    <img src="https://joss.theoj.org/papers/10.21105/joss.05994/status.svg" alt="DOI badge" >
     </a>
   </td>
 </tr>
 </table>
 
 
-pvlib python is a community supported tool that provides a set of
+pvlib python is a community developed toolbox that provides a set of
 functions and classes for simulating the performance of photovoltaic
-energy systems. pvlib python was originally ported from the PVLIB MATLAB
-toolbox developed at Sandia National Laboratories and it implements many
-of the models and methods developed at the Labs. More information on
-Sandia Labs PV performance modeling programs can be found at
-https://pvpmc.sandia.gov/. We collaborate with the PVLIB MATLAB project,
-but operate independently of it.
+energy systems and accomplishing related tasks.  The core mission of pvlib python is to provide open,
+reliable, interoperable, and benchmark implementations of PV system models.
 
 
 Documentation
@@ -103,17 +88,32 @@ The long-term success of pvlib-python requires substantial community support.
 Citing
 ======
 
-If you use pvlib-python in a published work, please cite:
+Many of the contributors to pvlib python work in institutions where
+citation metrics are used in performance or career evaluations. If you
+use pvlib python in a published work, please cite:
+
+**Recommended citation for the pvlib python project**
+
+  Anderson, K., Hansen, C., Holmgren, W., Jensen, A., Mikofski, M., and Driesse, A.
+  "pvlib python: 2023 project update."
+  Journal of Open Source Software, 8(92), 5994, (2023).
+  https://doi.org/10.21105/joss.05994
 
-  William F. Holmgren, Clifford W. Hansen, and Mark A. Mikofski.
+
+**Recommended citation for pvlib iotools**
+
+  Jensen, A., Anderson, K., Holmgren, W., Mikofski, M., Hansen, C., Boeman, L., Loonen, R.
+  "pvlib iotools —- Open-source Python functions for seamless access to solar irradiance data."
+  Solar Energy, 266, 112092, (2023).
+  https://doi.org/10.1016/j.solener.2023.112092
+
+**Historical citation for pvlib python**
+
+  Holmgren, W., Hansen, C., and Mikofski, M.
   "pvlib python: a python package for modeling solar energy systems."
   Journal of Open Source Software, 3(29), 884, (2018).
   https://doi.org/10.21105/joss.00884
 
-Please also cite the DOI corresponding to the specific version of
-pvlib-python that you used. pvlib-python DOIs are listed at
-[Zenodo.org](https://zenodo.org/search?page=1&size=20&q=conceptrecid:593284&all_versions&sort=-version)
-
 If you use pvlib-python in a commercial or publicly-available application, please
 consider displaying one of the "powered by pvlib" logos:
 
@@ -142,6 +142,20 @@ License
 BSD 3-clause.
 
 
+History and acknowledgement
+===========================
+
+pvlib python started out as a Python translation of the PVLIB MATLAB
+toolbox (developed by the [PVPMC](https://pvpmc.sandia.gov/) at
+Sandia National Laboratories) in 2013 and has grown substantially since then.
+Today it contains code contributions from over a hundred individuals worldwide
+and is maintained by a core group of PV modelers from a variety of institutions.
+
+pvlib has been supported directly and indirectly by DOE, NumFOCUS, and
+Google Summer of Code funding, university research projects,
+companies that allow their employees to contribute, and from personal time.
+
+
 NumFOCUS
 ========
 

benchmarks/asv.conf.json

@@ -117,7 +117,7 @@
             "build": "",
             "numpy": "1.16.5",
             "pandas": "0.25.0",
-            "scipy": "1.4.0",
+            "scipy": "1.5.0",
             // Note: these don't have a minimum in setup.py
             "h5py": "3.1.0",
             "ephem": "3.7.6.0",

ci/requirements-py3.10.yml

@@ -17,11 +17,11 @@ dependencies:
     - requests-mock
     - pytest-timeout
     - pytest-rerunfailures
-    - pytest-remotedata
+    - conda-forge::pytest-remotedata  # version in default channel is old
     - python=3.10
     - pytz
     - requests
-    - scipy >= 1.4.0
+    - scipy >= 1.5.0
     - statsmodels
     - pip:
         - nrel-pysam>=2.0

ci/requirements-py3.11.yml

@@ -17,11 +17,11 @@ dependencies:
     - requests-mock
     - pytest-timeout
     - pytest-rerunfailures
-    - pytest-remotedata
+    - conda-forge::pytest-remotedata  # version in default channel is old
     - python=3.11
     - pytz
     - requests
-    - scipy >= 1.4.0
+    - scipy >= 1.5.0
     - statsmodels
     - pip:
         - nrel-pysam>=2.0

ci/requirements-py3.12.yml

@@ -0,0 +1,28 @@
+name: test_env
+channels:
+    - defaults
+    - conda-forge
+dependencies:
+    - coveralls
+    - cython
+    - ephem
+    - h5py
+    # - numba  # not available for 3.12 as of 2023-12-12
+    - numpy >= 1.16.0
+    - pandas >= 0.25.0
+    - pip
+    - pytest
+    - pytest-cov
+    - pytest-mock
+    - requests-mock
+    - pytest-timeout
+    - pytest-rerunfailures
+    - conda-forge::pytest-remotedata  # version in default channel is old
+    - python=3.12
+    - pytz
+    - requests
+    - scipy >= 1.5.0
+    - statsmodels
+    # - pip:
+        # - nrel-pysam>=2.0  # not available for 3.12 as of 2023-12-12
+        # - solarfactors  # required shapely<2 isn't available for 3.12

ci/requirements-py3.7-min.yml

@@ -16,7 +16,7 @@ dependencies:
         - h5py==3.1.0
         - numpy==1.16.0
         - pandas==0.25.0
-        - scipy==1.4.0
+        - scipy==1.5.0
         - pytest-rerunfailures # conda version is >3.6
         - pytest-remotedata # conda package is 0.3.0, needs > 0.3.1
         - requests-mock

ci/requirements-py3.7.yml

@@ -17,11 +17,11 @@ dependencies:
     - requests-mock
     - pytest-timeout
     - pytest-rerunfailures
-    - pytest-remotedata
+    - conda-forge::pytest-remotedata  # version in default channel is old
     - python=3.7
     - pytz
     - requests
-    - scipy >= 1.4.0
+    - scipy >= 1.5.0
     - statsmodels
     - pip:
         - nrel-pysam>=2.0

ci/requirements-py3.8.yml

@@ -17,11 +17,11 @@ dependencies:
     - requests-mock
     - pytest-timeout
     - pytest-rerunfailures
-    - pytest-remotedata
+    - conda-forge::pytest-remotedata  # version in default channel is old
     - python=3.8
     - pytz
     - requests
-    - scipy >= 1.4.0
+    - scipy >= 1.5.0
     - statsmodels
     - pip:
         - nrel-pysam>=2.0

ci/requirements-py3.9.yml

@@ -17,11 +17,11 @@ dependencies:
     - requests-mock
     - pytest-timeout
     - pytest-rerunfailures
-    - pytest-remotedata
+    - conda-forge::pytest-remotedata  # version in default channel is old
     - python=3.9
     - pytz
     - requests
-    - scipy >= 1.4.0
+    - scipy >= 1.5.0
     - statsmodels
     - pip:
         - nrel-pysam>=2.0