updated fork

.coveragerc

@@ -1,2 +1,2 @@
 [run]
-omit = pvlib/_version.py
+omit = pvlib/version.py

.gitattributes

@@ -1,4 +1,2 @@
-pvlib/version.py export-subst
-
 # reduce the number of merge conflicts
 docs/sphinx/source/whatsnew/* merge=union

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,6 +7,6 @@
  - [ ] Adds description and name entries in the appropriate "what's new" file in [`docs/sphinx/source/whatsnew`](https://github.com/pvlib/pvlib-python/tree/master/docs/sphinx/source/whatsnew) for all changes. Includes link to the GitHub Issue with `` :issue:`num` `` or this Pull Request with `` :pull:`num` ``. Includes contributor name and/or GitHub username (link with `` :ghuser:`user` ``).
  - [ ] New code is fully documented. Includes [numpydoc](https://numpydoc.readthedocs.io/en/latest/format.html) compliant docstrings, examples, and comments where necessary.
  - [ ] Pull request is nearly complete and ready for detailed review.
- - [ ] Maintainer: Appropriate GitHub Labels and Milestone are assigned to the Pull Request and linked Issue.
+ - [ ] Maintainer: Appropriate GitHub Labels (including `remote-data`) and Milestone are assigned to the Pull Request and linked Issue.
 
 <!-- Brief description of the problem and proposed solution (if not already fully described in the issue linked to above): -->

.github/workflows/asv_check.yml

@@ -0,0 +1,34 @@
+name: asv
+
+# CI ASV CHECK is aimed to verify that the benchmarks execute without error.
+on: [pull_request, push]
+
+jobs:
+  quick:
+    runs-on: ubuntu-latest
+    defaults: 
+      run:
+        shell: bash -el {0}
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Install Python
+        uses: actions/setup-python@v3
+        with:
+          python-version: '3.9.7'
+
+      - name: Install asv
+        run: pip install asv==0.4.2
+
+      - name: Run asv benchmarks
+        run: |
+          cd benchmarks
+          asv machine --yes
+          asv run HEAD^! --quick --dry-run --show-stderr | sed "/failed$/ s/^/##[error]/" | tee benchmarks.log
+          if grep "failed" benchmarks.log > /dev/null ; then
+              exit 1
+          fi
+

.github/workflows/publish.yml

@@ -1,11 +1,12 @@
 name: Publish distributions to PyPI
 
-# if this workflow is modified to be a generic CI workflow then
-# add an if statement to the publish step so it only runs on tags.
 on:
+  pull_request:
   push:
+    branches:
+    - master
     tags:
-      - "v*"
+    - "v*"
 
 jobs:
   build-n-publish:
@@ -26,13 +27,15 @@ jobs:
     - name: Install build tools
       run: |
         python -m pip install --upgrade pip
-        python -m pip install --upgrade setuptools wheel
+        python -m pip install build
 
     - name: Build packages
-      run: python setup.py sdist bdist_wheel
+      run: python -m build
 
+    # only publish distribution to PyPI for tagged commits
     - name: Publish distribution to PyPI
-      uses: pypa/gh-action-pypi-publish@master
+      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

@@ -0,0 +1,111 @@
+# A secondary test job that only runs the iotools tests if explicitly requested
+# (for pull requests) or on a push to the master branch.
+# Because the iotools tests require GitHub secrets, we need to be careful about 
+# malicious PRs accessing the secrets and exposing them externally.
+#
+# We prevent this by only running this workflow when a maintainer has looked
+# over the PR's diff and verified that nothing malicious seems to be going on.
+# The maintainer then adds the "remote-data" label to the PR, which will then
+# trigger this workflow via the combination of the "on: ... types:"
+# and "if:" sections below.  The first restricts the workflow to only run when
+# a label is added to the PR and the second requires one of the PR's labels
+# is the "remote-data" label.  Technically this is slightly different from
+# triggering when the "remote-data" label is added, since it will also trigger
+# when "remote-data" is added, then later some other label is added.  Maybe
+# there's a better way to do this.
+#
+# But wait, you say!  Can't a malicious PR get around this by modifying
+# this workflow file and removing the label requirement?  I think the answer
+# is "no" as long as we trigger the workflow on "pull_request_target" instead
+# of the usual "pull_request".  The difference is what context the workflow
+# runs inside: "pull_request" runs in the context of the fork, where changes
+# to the workflow definition will take immediate effect, while "pull_request_target"
+# runs in the context of the main pvlib repository, where the original (non-fork)
+# workflow definition is used instead.  Of course by switching away from the fork's
+# context to keep our original workflow definitions, we're also keeping all the
+# original code, so the tests won't be run against the PR's new code.  To fix this
+# we explicitly check out the PR's code as the first step of the workflow.
+# This allows the job to run modified pvlib & pytest code, but only ever via
+# the original workflow file.
+# So long as a maintainer always verifies that the PR's code is not malicious prior to
+# adding the label and triggering this workflow, I think this should not present
+# a security risk.
+#
+# Note that this workflow can be triggered again by removing and re-adding the
+# "remote-data" label to the PR.
+#
+# Note also that "pull_request_target" is also the only way for the secrets
+# to be accessible in the first place.
+# 
+# Further reading:
+# - https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
+# - https://github.community/t/can-workflow-changes-be-used-with-pull-request-target/178626/7
+
+name: pytest-remote-data
+
+on:
+  pull_request_target:
+    types: [labeled]
+  push:
+    branches:
+    - master
+
+jobs:
+  test:
+
+    strategy:
+      fail-fast: false  # don't cancel other matrix jobs when one fails
+      matrix:
+        python-version: [3.7, 3.8, 3.9, "3.10"]
+        suffix: ['']  # the alternative to "-min"
+        include:
+          - python-version: 3.7
+            suffix: -min
+
+    runs-on: ubuntu-latest
+    if: (github.event_name == 'pull_request_target' && contains(github.event.pull_request.labels.*.name, 'remote-data')) || (github.event_name == 'push')
+
+    steps:
+      - uses: actions/checkout@v3
+        if: github.event_name == 'pull_request_target'
+        # pull_request_target runs in the context of the target branch (pvlib/master),
+        # but what we need is the hypothetical merge commit from the PR:
+        with:
+          ref: "refs/pull/${{ github.event.number }}/merge"
+
+      - uses: actions/checkout@v2
+        if: github.event_name == 'push'
+
+      - name: Set up conda environment
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          activate-environment: test_env
+          environment-file: ${{ env.REQUIREMENTS }}
+          python-version: ${{ matrix.python-version }}
+          auto-activate-base: false
+        env:
+          # build requirement filename.  First replacement is for the python
+          # version, second is to add "-min" if needed
+          REQUIREMENTS: ci/requirements-py${{ matrix.python-version }}${{ matrix.suffix }}.yml
+
+      - name: List installed package versions
+        shell: bash -l {0}  # necessary for conda env to be active
+        run: conda list
+
+      - name: Run tests
+        shell: bash -l {0}  # necessary for conda env to be active
+        env:
+          # copy GitHub Secrets into environment variables for the tests to access
+          NREL_API_KEY: ${{ secrets.NRELAPIKEY }}
+          SOLARANYWHERE_API_KEY: ${{ secrets.SOLARANYWHERE_API_KEY }}
+          BSRN_FTP_USERNAME: ${{ secrets.BSRN_FTP_USERNAME }}
+          BSRN_FTP_PASSWORD: ${{ secrets.BSRN_FTP_PASSWORD }}
+        run: pytest pvlib/tests/iotools pvlib/tests/test_forecast.py --cov=./ --cov-report=xml --remote-data
+
+      - name: Upload coverage to Codecov
+        if: matrix.python-version == 3.7 && matrix.suffix == ''
+        uses: codecov/codecov-action@v2
+        with:
+          fail_ci_if_error: true
+          verbose: true
+          flags: remote-data  # flags are configured in codecov.yml

.github/workflows/pytest.yml

@@ -0,0 +1,88 @@
+name: pytest
+
+on:
+  pull_request:
+  push:
+    branches:
+    - master
+
+jobs:
+  test:
+    strategy:
+      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"]
+        environment-type: [conda, bare]
+        suffix: ['']  # placeholder as an alternative to "-min"
+        include:
+          - os: ubuntu-latest
+            python-version: 3.7
+            environment-type: conda
+            suffix: -min
+        exclude:
+          - os: macos-latest
+            environment-type: conda
+          - os: windows-latest
+            environment-type: bare
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      # We check out only a limited depth and then pull tags to save time
+      - name: Checkout source
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 100
+
+      - name: Get tags
+        run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+
+      - name: Install Conda environment with Micromamba
+        if: matrix.environment-type == 'conda'
+        uses: mamba-org/provision-with-micromamba@v12
+        with:
+          environment-file: ${{ env.REQUIREMENTS }}
+          cache-downloads: true
+          extra-specs: |
+            python=${{ matrix.python-version }}
+        env:
+          # build requirement filename.  First replacement is for the python
+          # version, second is to add "-min" if needed
+          REQUIREMENTS: ci/requirements-py${{ matrix.python-version }}${{ matrix.suffix }}.yml
+
+      - name: List installed package versions (conda)
+        if: matrix.environment-type == 'conda'
+        shell: bash -l {0}  # necessary for conda env to be active
+        run: micromamba list
+
+      - name: Install bare Python ${{ matrix.python-version }}${{ matrix.suffix }}
+        if: matrix.environment-type == 'bare'
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install pvlib
+        if: matrix.environment-type == 'conda'
+        shell: bash -l {0}
+        run: python -m pip install --no-deps .
+
+      - name: Set up bare environment
+        if: matrix.environment-type == 'bare'
+        run: |
+          pip install .[test]
+          pip freeze
+
+      - name: Run tests
+        shell: bash -l {0}  # necessary for conda env to be active
+        run: |
+          # ignore iotools & forecast; those tests are run in a separate workflow
+          pytest pvlib --cov=./ --cov-report=xml --ignore=pvlib/tests/iotools --ignore=pvlib/tests/test_forecast.py
+
+      - name: Upload coverage to Codecov
+        if: matrix.python-version == 3.7 && matrix.suffix == '' && matrix.os == 'ubuntu-latest' && matrix.environment-type == 'conda'
+        uses: codecov/codecov-action@v2
+        with:
+          fail_ci_if_error: true
+          verbose: true
+          flags: core  # flags are configured in codecov.yml

.lgtm.yml

@@ -1,6 +1,3 @@
 path_classifiers:
-    generated:
-        - pvlib/_version.py
     library:
-        - versioneer.py
         - pvlib/_deprecation.py

.stickler.yml

@@ -5,4 +5,4 @@ linters:
         ignore: E201,E241,E226,W503,W504
 files:
     ignore:
-        - 'pvlib/_version.py'
+        - 'pvlib/version.py'

MANIFEST.in

@@ -1,20 +1,7 @@
-include MANIFEST.in
-include AUTHORS.md
-include LICENSE
-include README.md
-include setup.py
-
-# include most everything under pvlib by default
-# better to package too much than not enough
-graft pvlib
-
-# we included pvlib files needed to compile NREL SPA code in graft above,
-# now we exclude the NREL code itself to comply with their license
 global-exclude */spa.c
 global-exclude */spa.h
 prune pvlib/spa_c_files/build
 
-graft docs
 prune docs/sphinx/build
 prune docs/sphinx/source/generated
 # all doc figures created by doc build
@@ -31,5 +18,14 @@ global-exclude .git*
 global-exclude \#*
 global-exclude .ipynb_checkpoints
 
-include versioneer.py
-include pvlib/_version.py
+exclude .coveragerc
+exclude .lgtm.yml
+exclude .stickler.yml
+exclude codecov.yml
+exclude readthedocs.yml
+exclude CODE_OF_CONDUCT.md
+
+prune paper
+prune .github
+prune benchmarks
+prune ci

README.md

@@ -28,8 +28,11 @@
     <a href="http://pvlib-python.readthedocs.org/en/stable/">
     <img src="https://readthedocs.org/projects/pvlib-python/badge/?version=stable" alt="documentation build status" />
     </a>
-    <a href="https://dev.azure.com/solararbiter/pvlib%20python/_build/latest?definitionId=4&branchName=master">
-      <img src="https://dev.azure.com/solararbiter/pvlib%20python/_apis/build/status/pvlib.pvlib-python?branchName=master" alt="Azure Pipelines build status" />
+    <a href="https://github.com/pvlib/pvlib-python/actions/workflows/pytest.yml?query=branch%3Amaster">
+      <img src="https://github.com/pvlib/pvlib-python/actions/workflows/pytest.yml/badge.svg?branch=master" alt="GitHub Actions Testing Status" />
+    </a>
+    <a href="https://codecov.io/gh/pvlib/pvlib-python">
+    <img src="https://codecov.io/gh/pvlib/pvlib-python/branch/master/graph/badge.svg" alt="codecov coverage" />
     </a>
   </td>
 </tr>
@@ -44,17 +47,6 @@
     </a>
   </td>
 </tr>
-<tr>
-  <td>Coverage</td>
-  <td>
-    <a href="https://coveralls.io/r/pvlib/pvlib-python">
-    <img src="https://img.shields.io/coveralls/pvlib/pvlib-python.svg" alt="coveralls coverage" />
-    </a>
-    <a href="https://codecov.io/gh/pvlib/pvlib-python">
-    <img src="https://codecov.io/gh/pvlib/pvlib-python/branch/master/graph/badge.svg" alt="codecov coverage" />
-    </a>
-  </td>
-</tr>
 <tr>
   <td>Benchmarks</td>
   <td>