Merge remote-tracking branch 'upstream/main' into pr/2491

Author: kandersolar

.github/workflows/publish.yml

@@ -1,4 +1,4 @@
-name: Publish distributions to PyPI
+name: Package build
 
 on:
   pull_request:
@@ -9,8 +9,8 @@ on:
     - "v*"
 
 jobs:
-  build-n-publish:
-    name: Build and publish distributions to PyPI
+  build:
+    name: Build wheel and sdist
     if: github.repository == 'pvlib/pvlib-python'
     runs-on: ubuntu-latest
     steps:
@@ -23,7 +23,7 @@ jobs:
       uses: actions/setup-python@v5
       with:
         # Python version should be the minimum supported version
-        python-version: "3.9"
+        python-version: "3.10"
 
     - name: Install build tools
       run: |
@@ -49,10 +49,28 @@ jobs:
       run: du -h pvlib
       working-directory: ./tmp
 
+    - name: Store the distribution packages
+      uses: actions/upload-artifact@v4
+      with:
+        name: python-package-distributions
+        path: dist/
+
+  publish:
+    name: Release dist files to PyPI
     # only publish distribution to PyPI for tagged commits
+    if: startsWith(github.ref, 'refs/tags/v')
+    needs:
+    - build
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write  # for PyPI trusted publishing
+
+    steps:
+    - name: Download all dist files
+      uses: actions/download-artifact@v4
+      with:
+        name: python-package-distributions
+        path: dist/
+
     - name: Publish distribution to PyPI
-      if: startsWith(github.ref, 'refs/tags/v')
       uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        user: __token__
-        password: ${{ secrets.pypi_password }}

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

@@ -56,10 +56,10 @@ jobs:
     strategy:
       fail-fast: false  # don't cancel other matrix jobs when one fails
       matrix:
-        python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
         suffix: ['']  # the alternative to "-min"
         include:
-          - python-version: 3.9
+          - python-version: "3.10"
             suffix: -min
 
     runs-on: ubuntu-latest
@@ -100,10 +100,13 @@ jobs:
           SOLARANYWHERE_API_KEY: ${{ secrets.SOLARANYWHERE_API_KEY }}
           BSRN_FTP_USERNAME: ${{ secrets.BSRN_FTP_USERNAME }}
           BSRN_FTP_PASSWORD: ${{ secrets.BSRN_FTP_PASSWORD }}
+          ECMWF_API_KEY: ${{ secrets.ECMWF_API_KEY }}
+          EARTHDATA_USERNAME: ${{ secrets.EARTHDATA_USERNAME }}
+          EARTHDATA_PASSWORD: ${{ secrets.EARTHDATA_PASSWORD }}
         run: pytest tests/iotools --cov=./ --cov-report=xml --remote-data
 
       - name: Upload coverage to Codecov
-        if: matrix.python-version == 3.9 && matrix.suffix == ''
+        if: matrix.python-version == '3.10' && matrix.suffix == ''
         uses: codecov/codecov-action@v4
         with:
           fail_ci_if_error: true

.github/workflows/pytest.yml

@@ -12,12 +12,12 @@ jobs:
       fail-fast: false  # don't cancel other matrix jobs when one fails
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
         environment-type: [conda, bare]
         suffix: ['']  # placeholder as an alternative to "-min"
         include:
           - os: ubuntu-latest
-            python-version: 3.9
+            python-version: "3.10"
             environment-type: conda
             suffix: -min
         exclude:
@@ -40,10 +40,11 @@ jobs:
 
       - name: Install Conda environment with Micromamba
         if: matrix.environment-type == 'conda'
-        uses: mamba-org/setup-micromamba@v1
+        uses: mamba-org/setup-micromamba@v2
         with:
           environment-file: ${{ env.REQUIREMENTS }}
-          cache-downloads: true
+          cache-downloads: false
+          cache-environment: false
           create-args: >-
             python=${{ matrix.python-version }}
           condarc: |
@@ -82,7 +83,7 @@ jobs:
           pytest tests --cov=./ --cov-report=xml --ignore=tests/iotools
 
       - name: Upload coverage to Codecov
-        if: matrix.python-version == 3.9 && matrix.suffix == '' && matrix.os == 'ubuntu-latest' && matrix.environment-type == 'conda'
+        if: matrix.python-version == '3.10' && matrix.suffix == '' && matrix.os == 'ubuntu-latest' && matrix.environment-type == 'conda'
         uses: codecov/codecov-action@v4
         with:
           fail_ci_if_error: true

.github/workflows/top-ranked-issues.yml

@@ -31,4 +31,4 @@ jobs:
 
       - name: Run update_top_ranking_issues.py
         run: |
-          python ./scripts/update_top_ranking_issues.py
+          python .github/workflows/update_top_ranking_issues.py

scripts/update_top_ranking_issues.py …b/workflows/update_top_ranking_issues.pyscripts/update_top_ranking_issues.py renamed to .github/workflows/update_top_ranking_issues.py scripts/update_top_ranking_issues.py renamed to .github/workflows/update_top_ranking_issues.py

@@ -74,7 +74,11 @@ Installation
 ============
 
 pvlib-python releases may be installed using the ``pip`` and ``conda`` tools.
-Please see the [Installation page](https://pvlib-python.readthedocs.io/en/stable/user_guide/installation.html) of the documentation for complete instructions.
+```bash
+pip install pvlib
+conda install -c conda-forge pvlib
+```
+Please see the [Installation page](https://pvlib-python.readthedocs.io/en/stable/user_guide/getting_started/installation.html) of the documentation for complete instructions.
 
 
 Contributing

README.md

@@ -113,19 +113,19 @@
     "include": [
         // minimum supported versions
         {
-            "python": "3.9",
+            "python": "3.10",
             "build": "",
-            "numpy": "1.19.5",
-            "pandas": "1.3.0",
-            "scipy": "1.6.0",
+            "numpy": "1.21.5",
+            "pandas": "1.4.1",  // first anaconda version to support py 3.10
+            "scipy": "1.7.2",
             // Note: these don't have a minimum in setup.py
-            "h5py": "3.1.0",
-            "ephem": "4.0.0.1",  // first version to support py 3.9
-            "numba": "0.53.0",  // first version to support py 3.9
+            "h5py": "3.6.0",  // first version to support py 3.10
+            "ephem": "4.1.1",  // first version to support py 3.10
+            "numba": "0.55.0",  // first version to support py 3.10
         },
         // latest versions available
         {
-            "python": "3.9",
+            "python": "3.10",
             "build": "",
             "numpy": "",
             "pandas": "",

benchmarks/asv.conf.json

@@ -8,14 +8,14 @@ dependencies:
     - pytest-cov
     - pytest-mock
     - pytest-timeout
-    - python=3.9
+    - python=3.10
     - pytz
     - requests
     - pip:
-        - h5py==3.0.0
-        - numpy==1.19.3
-        - pandas==1.3.0  # min version of pvlib
-        - scipy==1.6.0
+        - h5py==3.6.0
+        - numpy==1.21.2
+        - pandas==1.3.3  # min version of pvlib
+        - scipy==1.7.2
         - pytest-rerunfailures # conda version is >3.6
         - pytest-remotedata # conda package is 0.3.0, needs > 0.3.1
         - requests-mock

ci/requirements-py3.9-min.yml ci/requirements-py3.10-min.ymlci/requirements-py3.9-min.yml renamed to ci/requirements-py3.10-min.yml

@@ -8,8 +8,8 @@ dependencies:
     - ephem
     - h5py
     - numba
-    - numpy >= 1.17.3
-    - pandas >= 1.3.0
+    - numpy >= 1.21.2
+    - pandas >= 1.3.3
     - pip
     - pytest
     - pytest-cov
@@ -21,7 +21,7 @@ dependencies:
     - python=3.10
     - pytz
     - requests
-    - scipy >= 1.6.0
+    - scipy >= 1.7.2
     - statsmodels
     - pip:
         - nrel-pysam>=2.0

ci/requirements-py3.10.yml

@@ -8,8 +8,8 @@ dependencies:
     - ephem
     - h5py
     - numba
-    - numpy >= 1.17.3
-    - pandas >= 1.3.0
+    - numpy >= 1.21.2
+    - pandas >= 1.3.3
     - pip
     - pytest
     - pytest-cov
@@ -21,7 +21,7 @@ dependencies:
     - python=3.11
     - pytz
     - requests
-    - scipy >= 1.6.0
+    - scipy >= 1.7.2
     - statsmodels
     - pip:
         - nrel-pysam>=2.0