Skip to content

Commit b11c9e2

Browse files
add python 3.11 to ci (#1582)
* add python 3.11 to ci * remove extra -, py action v1 to v4 * update micromamba action, channel-priority: flexible * pvfactors 1.5.2 * whatsnew * 3.11 requirements clean up * ci/requirements* clean up * no pysam in 3.11 * run 3.11 in pytest-remote-data too Co-authored-by: Kevin Anderson <[email protected]>
1 parent 19ffcca commit b11c9e2

File tree

8 files changed

+45
-20
lines changed

8 files changed

+45
-20
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
strategy:
5757
fail-fast: false # don't cancel other matrix jobs when one fails
5858
matrix:
59-
python-version: [3.7, 3.8, 3.9, "3.10"]
59+
python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
6060
suffix: [''] # the alternative to "-min"
6161
include:
6262
- python-version: 3.7

.github/workflows/pytest.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fail-fast: false # don't cancel other matrix jobs when one fails
1313
matrix:
1414
os: [ubuntu-latest, macos-latest, windows-latest]
15-
python-version: [3.7, 3.8, 3.9, "3.10"]
15+
python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
1616
environment-type: [conda, bare]
1717
suffix: [''] # placeholder as an alternative to "-min"
1818
include:
@@ -40,12 +40,13 @@ jobs:
4040

4141
- name: Install Conda environment with Micromamba
4242
if: matrix.environment-type == 'conda'
43-
uses: mamba-org/provision-with-micromamba@v12
43+
uses: mamba-org/provision-with-micromamba@v14
4444
with:
4545
environment-file: ${{ env.REQUIREMENTS }}
4646
cache-downloads: true
4747
extra-specs: |
4848
python=${{ matrix.python-version }}
49+
channel-priority: flexible
4950
env:
5051
# build requirement filename. First replacement is for the python
5152
# version, second is to add "-min" if needed
@@ -58,7 +59,7 @@ jobs:
5859

5960
- name: Install bare Python ${{ matrix.python-version }}${{ matrix.suffix }}
6061
if: matrix.environment-type == 'bare'
61-
uses: actions/setup-python@v1
62+
uses: actions/setup-python@v4
6263
with:
6364
python-version: ${{ matrix.python-version }}
6465

ci/requirements-py3.10.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ dependencies:
77
- cython
88
- ephem
99
- h5py
10-
# - netcdf4 # pulls in a different version of numpy with ImportError
11-
# - numba # python 3.9 compat in early 2021
10+
- netcdf4
11+
- numba
1212
- numpy >= 1.16.0
1313
- pandas >= 0.25.0
1414
- pip
@@ -23,9 +23,7 @@ dependencies:
2323
- pytz
2424
- requests
2525
- scipy >= 1.4.0
26-
- shapely # pvfactors dependency
27-
# - siphon # conda-forge
2826
- statsmodels
2927
- pip:
30-
# - nrel-pysam>=2.0 # install error on windows
31-
- pvfactors==1.4.1
28+
- nrel-pysam>=2.0
29+
- pvfactors==1.5.2

ci/requirements-py3.11.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: test_env
2+
channels:
3+
- defaults
4+
- conda-forge
5+
dependencies:
6+
- coveralls
7+
- cython
8+
- ephem
9+
- h5py
10+
- netcdf4
11+
# - numba # https://github.com/numba/numba/issues/8304
12+
- numpy >= 1.16.0
13+
- pandas >= 0.25.0
14+
- pip
15+
- pytest
16+
- pytest-cov
17+
- pytest-mock
18+
- requests-mock
19+
- pytest-timeout
20+
- pytest-rerunfailures
21+
- pytest-remotedata
22+
- python=3.11
23+
- pytz
24+
- requests
25+
- scipy >= 1.2.0
26+
- statsmodels
27+
- pip:
28+
# - nrel-pysam>=2.0
29+
- pvfactors==1.5.2

ci/requirements-py3.7.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ dependencies:
2323
- pytz
2424
- requests
2525
- scipy >= 1.4.0
26-
- shapely # pvfactors dependency
2726
- siphon # conda-forge
2827
- statsmodels
2928
- pip:
3029
- nrel-pysam>=2.0
31-
- pvfactors==1.4.1
30+
- pvfactors==1.5.2

ci/requirements-py3.8.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ dependencies:
2323
- pytz
2424
- requests
2525
- scipy >= 1.4.0
26-
- shapely # pvfactors dependency
2726
- siphon # conda-forge
2827
- statsmodels
2928
- pip:
3029
- nrel-pysam>=2.0
31-
- pvfactors==1.4.1
30+
- pvfactors==1.5.2

ci/requirements-py3.9.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ dependencies:
77
- cython
88
- ephem
99
- h5py
10-
# - netcdf4 # pulls in a different version of numpy with ImportError
11-
# - numba # python 3.9 compat in early 2021
10+
- netcdf4
11+
- numba
1212
- numpy >= 1.16.0
1313
- pandas >= 0.25.0
1414
- pip
@@ -23,9 +23,7 @@ dependencies:
2323
- pytz
2424
- requests
2525
- scipy >= 1.4.0
26-
- shapely # pvfactors dependency
27-
# - siphon # conda-forge
2826
- statsmodels
2927
- pip:
30-
# - nrel-pysam>=2.0 # install error on windows
31-
- pvfactors==1.4.1
28+
- nrel-pysam>=2.0
29+
- pvfactors==1.5.2

docs/sphinx/source/whatsnew/v0.9.5.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Bug fixes
2424

2525
Testing
2626
~~~~~~~
27+
* Added Python 3.11 to test suite. (:pull:`1582`)
2728

2829

2930
Documentation

0 commit comments

Comments
 (0)