Skip to content

Commit

Permalink
Merge branch 'main' into mismatch_mppt
Browse files Browse the repository at this point in the history
  • Loading branch information
markcampanelli committed Jan 11, 2025
2 parents e308f87 + 9fb2eb3 commit e83e8ec
Show file tree
Hide file tree
Showing 150 changed files with 45,186 additions and 39,903 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- Thank you for your contribution! The following items must be addressed before the code can be merged. Please don't hesitate to ask for help if you're unsure of how to accomplish any of the items. Feel free to remove checklist items that are not relevant to your change. -->

- [ ] Closes #xxxx
- [ ] I am familiar with the [contributing guidelines](https://pvlib-python.readthedocs.io/en/latest/contributing.html)
- [ ] I am familiar with the [contributing guidelines](https://pvlib-python.readthedocs.io/en/latest/contributing/index.html)
- [ ] Tests added
- [ ] Updates entries in [`docs/sphinx/source/reference`](https://github.com/pvlib/pvlib-python/blob/main/docs/sphinx/source/reference) for API changes.
- [ ] Adds description and name entries in the appropriate "what's new" file in [`docs/sphinx/source/whatsnew`](https://github.com/pvlib/pvlib-python/tree/main/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` ``).
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/asv_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
shell: bash -el {0}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Install Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.9'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/flake8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout source
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install Python 3.11
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.11'
- name: Install Flake8 5.0.4 linter
Expand Down
18 changes: 15 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ jobs:
runs-on: ubuntu-latest
steps:
# fetch all commits and tags so versioneer works
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: 3.9

- name: Install build tools
run: |
Expand All @@ -33,9 +33,21 @@ jobs:
- name: Build packages
run: python -m build

- name: List distribution file sizes
run: du -h dist/*

- name: Check metadata verification
run: python -m twine check --strict dist/*

- name: Ensure that the wheel installs successfully
run: |
mkdir ./tmp
pip install $(find dist -type f -name "*.whl") --target=./tmp
- name: List installed file sizes
run: du -h pvlib
working-directory: ./tmp

# only publish distribution to PyPI for tagged commits
- name: Publish distribution to PyPI
if: startsWith(github.ref, 'refs/tags/v')
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/pytest-remote-data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,28 +56,28 @@ jobs:
strategy:
fail-fast: false # don't cancel other matrix jobs when one fails
matrix:
python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
python-version: [3.9, "3.10", "3.11", "3.12"]
suffix: [''] # the alternative to "-min"
include:
- python-version: 3.8
- python-version: 3.9
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
- uses: actions/checkout@v4
if: github.event_name == 'pull_request_target'
# pull_request_target runs in the context of the target branch (pvlib/main),
# but what we need is the hypothetical merge commit from the PR:
with:
ref: "refs/pull/${{ github.event.number }}/merge"

- uses: actions/checkout@v2
- uses: actions/checkout@v4
if: github.event_name == 'push'

- name: Set up conda environment
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
activate-environment: test_env
environment-file: ${{ env.REQUIREMENTS }}
Expand All @@ -103,7 +103,7 @@ jobs:
run: pytest pvlib/tests/iotools --cov=./ --cov-report=xml --remote-data

- name: Upload coverage to Codecov
if: matrix.python-version == 3.8 && matrix.suffix == ''
if: matrix.python-version == 3.9 && matrix.suffix == ''
uses: codecov/codecov-action@v4
with:
fail_ci_if_error: true
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.8, 3.9, "3.10", "3.11", "3.12"]
python-version: [3.9, "3.10", "3.11", "3.12"]
environment-type: [conda, bare]
suffix: [''] # placeholder as an alternative to "-min"
include:
- os: ubuntu-latest
python-version: 3.8
python-version: 3.9
environment-type: conda
suffix: -min
exclude:
Expand All @@ -31,7 +31,7 @@ jobs:
steps:
# We check out only a limited depth and then pull tags to save time
- name: Checkout source
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 100

Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:

- name: Install bare Python ${{ matrix.python-version }}${{ matrix.suffix }}
if: matrix.environment-type == 'bare'
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -82,7 +82,7 @@ jobs:
pytest pvlib --cov=./ --cov-report=xml --ignore=pvlib/tests/iotools
- name: Upload coverage to Codecov
if: matrix.python-version == 3.8 && matrix.suffix == '' && matrix.os == 'ubuntu-latest' && matrix.environment-type == 'conda'
if: matrix.python-version == 3.9 && matrix.suffix == '' && matrix.os == 'ubuntu-latest' && matrix.environment-type == 'conda'
uses: codecov/codecov-action@v4
with:
fail_ci_if_error: true
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/top-ranked-issues.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Update Top Ranked Issues

on:
schedule:
# Runs every day at 00:00 AM UTC
- cron: '0 0 * * *'

jobs:
run-script:
runs-on: ubuntu-latest

# Run only if the repository is pvlib/pvlib-python
if: ${{ github.repository == 'pvlib/pvlib-python' }}

env:
GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}

steps:
- name: Check out the repository
uses: actions/checkout@v4 # This ensures the repository code is available

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.12"

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install PyGithub
- name: Run update_top_ranking_issues.py
run: |
python ./scripts/update_top_ranking_issues.py
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ docs/sphinx/source/reference/generated
docs/sphinx/source/reference/*/generated
docs/sphinx/source/savefig
docs/sphinx/source/gallery
docs/sphinx/source/sg_execution_times.rst

# Installer logs
pip-log.txt
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Contributing
============

We need your help to make pvlib-python a great tool!
Please see the [Contributing page](http://pvlib-python.readthedocs.io/en/stable/contributing.html) for more on how you can contribute.
Please see the [Contributing page](https://pvlib-python.readthedocs.io/en/stable/contributing/index.html) for more on how you can contribute.
The long-term success of pvlib-python requires substantial community support.


Expand Down
10 changes: 5 additions & 5 deletions benchmarks/asv.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,19 +113,19 @@
"include": [
// minimum supported versions
{
"python": "3.8",
"python": "3.9",
"build": "",
"numpy": "1.17.5",
"numpy": "1.19.5",
"pandas": "1.3.0",
"scipy": "1.6.0",
// Note: these don't have a minimum in setup.py
"h5py": "3.1.0",
"ephem": "3.7.7.0", // first version to support py 3.8
"numba": "0.47.0", // first version to support py 3.8
"ephem": "4.0.0.1", // first version to support py 3.9
"numba": "0.53.0", // first version to support py 3.9
},
// latest versions available
{
"python": "3.8",
"python": "3.9",
"build": "",
"numpy": "",
"pandas": "",
Expand Down
28 changes: 0 additions & 28 deletions ci/requirements-py3.8.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@ dependencies:
- pytest-cov
- pytest-mock
- pytest-timeout
- python=3.8
- python=3.9
- pytz
- requests
- pip:
- dataclasses
- h5py==2.10.0 # chosen for compatibility with numpy 1.17.3 and py3.8
- numpy==1.17.3
- pandas==1.3.0
- h5py==3.0.0
- numpy==1.19.3
- pandas==1.3.0 # min version of pvlib
- scipy==1.6.0
- pytest-rerunfailures # conda version is >3.6
- pytest-remotedata # conda package is 0.3.0, needs > 0.3.1
Expand Down
2 changes: 2 additions & 0 deletions docs/examples/agrivoltaics/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Agrivoltaic Systems Modelling
-----------------------------
Loading

0 comments on commit e83e8ec

Please sign in to comment.