Skip to content

Commit

Permalink
Merge pull request #428 from NREL/add-new-python-versions-to-testing-…
Browse files Browse the repository at this point in the history
…matrix

Add python 3.11 and 3.12 versions to testing matrix
  • Loading branch information
mdeceglie authored Oct 14, 2024
2 parents c37ca59 + a92032c commit 841cbec
Show file tree
Hide file tree
Showing 35 changed files with 6,416 additions and 6,456 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/flake8.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8]
python-version: [3.12]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0 # fetch all branches, needed so we can diff against the target branch
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install flake8
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/nbval.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.12"
- name: Install notebook environment
run: |
python -m pip install --upgrade pip wheel
Expand All @@ -36,7 +36,7 @@ jobs:
mkdir docs/artifacts
jupyter nbconvert --to html --execute --ExecutePreprocessor.timeout=600 --allow-errors --output artifacts/${{ matrix.notebook-file }}.html docs/${{ matrix.notebook-file }}
- name: Upload artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: executed_notebooks
name: executed_notebook_${{ matrix.notebook-file }}
path: docs/artifacts
17 changes: 8 additions & 9 deletions .github/workflows/pytest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,27 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10"]
python-version: ["3.9", "3.10", "3.11", "3.12"]
env: [
'-r requirements.txt .[test]',
'-r requirements-min.txt .[test]',
'--upgrade --upgrade-strategy=eager .[test]'
]
exclude:
- python-version: 3.8
- python-version: "3.9"
env: "-r requirements.txt .[test]"
- python-version: "3.10"
env: '-r requirements-min.txt .[test]'
- python-version: 3.9
- python-version: "3.11"
env: '-r requirements-min.txt .[test]'
- python-version: "3.10"
- python-version: "3.12"
env: '-r requirements-min.txt .[test]'
# required numpy is not available on python 3.7, so exclude:
- python-version: 3.7
env: '-r requirements.txt .[test]'
fail-fast: false

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install ${{ matrix.env }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/requirements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.12"
- name: Install notebook environment
run: |
python -m pip install --upgrade pip wheel
Expand Down
4 changes: 2 additions & 2 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
version: 2

build:
os: "ubuntu-22.04"
os: "ubuntu-24.04"
tools:
python: "3.7"
python: "3.12"

python:
install:
Expand Down
5,433 changes: 2,697 additions & 2,736 deletions docs/TrendAnalysis_example_pvdaq4.ipynb

Large diffs are not rendered by default.

890 changes: 0 additions & 890 deletions docs/degradation_and_soiling_example.ipynb

This file was deleted.

4,302 changes: 2,224 additions & 2,078 deletions docs/degradation_and_soiling_example_pvdaq_4.ipynb

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions docs/nbval_sanitization_rules.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,11 @@
[regex1]
regex: .*: UserWarning:
replace: NBVAL-FILEPATH: UserWarning:

[regex2]
regex: \d{1,2}/\d{1,2}/\d{2,4}
replace: DATE-STAMP

[regex3]
regex: \d{2}:\d{2}:\d{2}
replace: TIME-STAMP
86 changes: 43 additions & 43 deletions docs/notebook_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
appnope==0.1.0
argon2-cffi==21.2.0
appnope==0.1.4
argon2-cffi==23.1.0
argon2-cffi-bindings==21.2.0
backcall==0.1.0
beautifulsoup4==4.11.1
bleach==3.3.0
cffi==1.15.0
colorama==0.4.4
decorator==4.3.0
backcall==0.2.0
beautifulsoup4==4.12.3
bleach==6.1.0
cffi==1.17.0
colorama==0.4.6
decorator==5.1.1
defusedxml==0.7.1
entrypoints==0.2.3
html5lib==1.0.1
ipykernel==6.29.4
ipython==8.23.0
entrypoints==0.4
html5lib==1.1
ipykernel==6.29.5
ipython==8.26.0
ipython-genutils==0.2.0
ipywidgets==7.3.0
jedi==0.16.0
Jinja2==3.1.3
jsonschema==4.18.0
ipywidgets==8.1.3
jedi==0.19.1
Jinja2==3.1.4
jsonschema==4.23.0
jupyter==1.0.0
jupyter-client==8.6.1
jupyter-client==8.6.2
jupyter-console==6.6.3
jupyter-core==5.7.2
jupyterlab-pygments==0.3.0
lxml==4.9.1
MarkupSafe==2.0.0
mistune==2.0.3
nbclient==0.6.3
nbconvert==7.0.0
nbformat==5.3.0
nest-asyncio==1.5.5
notebook==6.4.12
numexpr==2.10.0
lxml==5.3.0
MarkupSafe==2.1.5
mistune==3.0.2
nbclient==0.10.0
nbconvert==7.16.4
nbformat==5.10.4
nest-asyncio==1.6.0
notebook==7.2.1
numexpr==2.10.1
pandocfilters==1.5.1
parso==0.5.2
pexpect==4.6.0
parso==0.8.4
pexpect==4.9.0
pickleshare==0.7.5
prometheus-client==0.9
prompt-toolkit==3.0.43
ptyprocess==0.6.0
pycparser==2.20
Pygments==2.15.0
pyzmq==26.0.2
qtconsole==4.3.1
Send2Trash==1.8.2
prometheus-client==0.20.0
prompt-toolkit==3.0.47
ptyprocess==0.7.0
pycparser==2.22
Pygments==2.18.0
pyzmq==26.1.1
qtconsole==5.5.2
Send2Trash==1.8.3
simplegeneric==0.8.1
soupsieve==2.3.2.post1
terminado==0.8.3
testpath==0.3.1
tinycss2==1.1.1
tornado==6.3.3
soupsieve==2.6
terminado==0.18.1
testpath==0.6.0
tinycss2==1.3.0
tornado==6.4.1
traitlets==5.14.3
wcwidth==0.1.7
wcwidth==0.2.13
webencodings==0.5.1
widgetsnbextension==3.3.0
widgetsnbextension==4.0.11
1 change: 0 additions & 1 deletion docs/sphinx/source/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ Normalization
normalize_with_expected_power
normalize_with_pvwatts
pvwatts_dc_power
sapm_dc_power
delta_index
check_series_frequency

Expand Down
Loading

0 comments on commit 841cbec

Please sign in to comment.