8000 Drop py3.6, add 3.10; switch CI from macos-10.15 to macos-latest (#1507) · MoGregory/pvlib-python@65e6fb3 · GitHub
[go: up one dir, main page]
Skip to content

Commit 65e6fb3

Browse files
kandersolarkandersolar
authored
Drop py3.6, add 3.10; switch CI from macos-10.15 to macos-latest (pvlib#1507)
* drop py3.6 * bump CI from macos-10.15 to macos-latest * add testing on py3.10 * remove dataclasses requirement * whatsnew
1 parent c9bbdbb commit 65e6fb3

File tree

7 files changed

+20
-20
lines changed

7 files changed

+20
-20
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ jobs:
5656
strategy:
5757
fail-fast: false # don't cancel other matrix jobs when one fails
5858
matrix:
59-
python-version: [3.6, 3.7, 3.8, 3.9]
59+
python-version: [3.7, 3.8, 3.9, "3.10"]
6060
suffix: [''] # the alternative to "-min"
6161
include:
62-
- python-version: 3.6
62+
- python-version: 3.7
6363
suffix: -min
6464

6565
runs-on: ubuntu-latest
@@ -102,7 +102,7 @@ jobs:
102102
run: pytest pvlib/tests/iotools pvlib/tests/test_forecast.py --cov=./ --cov-report=xml --remote-data
103103

104104
- name: Upload coverage to Codecov
105-
if: matrix.python-version == 3.6 && matrix.suffix == ''
105+
if: matrix.python-version == 3.7 && matrix.suffix == ''
106106
uses: codecov/codecov-action@v2
107107
with:
108108
fail_ci_if_error: true

‎.github/workflows/pytest.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,17 @@ jobs:
1111
strategy:
1212
fail-fast: false # don't cancel other matrix jobs when one fails
1313
matrix:
14-
# use macos-10.15 instead of macos-latest for py3.6 support
15-
os: [ubuntu-latest, macos-10.15, windows-latest]
16-
python-version: [3.6, 3.7, 3.8, 3.9]
14+
os: [ubuntu-latest, macos-latest, windows-latest]
15+
python-version: [3.7, 3.8, 3.9, "3.10"]
1716
environment-type: [conda, bare]
1817
suffix: [''] # placeholder as an alternative to "-min"
1918
include:
2019
- os: ubuntu-latest
21-
python-version: 3.6
20+
python-version: 3.7
2221
environment-type: conda
2322
suffix: -min
2423
exclude:
25-
- os: macos-10.15
24+
- os: macos-latest
2625
environment-type: conda
2726
- os: windows-latest
2827
environment-type: bare
@@ -81,7 +80,7 @@ jobs:
8180
pytest pvlib --cov=./ --cov-report=xml --ignore=pvlib/tests/iotools --ignore=pvlib/tests/test_forecast.py
8281
8382
- name: Upload coverage to Codecov
84-
if: matrix.python-version == 3.6 && matrix.suffix == '' && matrix.os == 'ubuntu-latest' && matrix.environment-type == 'conda'
83+
if: matrix.python-version == 3.7 && matrix.suffix == '' && matrix.os == 'ubuntu-latest' && matrix.environment-type == 'conda'
8584
uses: codecov/codecov-action@v2
8685
with:
8786
fail_ci_if_error: true

‎benchmarks/asv.conf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
"include": [
115115
// minimum supported versions
116116
{
117-
"python": "3.6",
117+
"python": "3.7",
118118
"numpy": "1.16.0",
119119
"pandas": "0.25.0",
120120
"scipy": "1.2.0",

‎ci/requirements-py3.6.yml renamed to ‎ci/requirements-py3.10.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,26 @@ dependencies:
77
- cython
88
- ephem
99
- h5py
10-
- netcdf4
10+
# - netcdf4 # pulls in a different version of numpy with ImportError
1111
- nose
12-
- numba
12+
# - numba # python 3.9 compat in early 2021
1313
- numpy >= 1.16.0
1414
- pandas >= 0.25.0
1515
- pip
1616
- pytest
1717
- pytest-cov
1818
- pytest-mock
1919
- requests-mock
20+
- pytest-timeout
2021
- pytest-rerunfailures
2122
- pytest-remotedata
22-
- pytest-timeout
23-
- python=3.6
23+
- python=3.10
2424
- pytz
2525
- requests
2626
- scipy >= 1.2.0
2727
- shapely # pvfactors dependency
28-
- siphon # conda-forge
28+
# - siphon # conda-forge
2929
- statsmodels
3030
- pip:
31-
- dataclasses
32-
- nrel-pysam>=2.0
31+
# - nrel-pysam>=2.0 # install error on windows
3332
- pvfactors==1.4.1

‎ci/requirements-py3.6-min.yml renamed to ‎ci/requirements-py3.7-min.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies:
99
- pytest-cov
1010
- pytest-mock
1111
- pytest-timeout
12-
- python=3.6
12+
- python=3.7
1313
- pytz
1414
- requests
1515
- pip:

‎docs/sphinx/source/whatsnew/v0.9.2.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ Testing
3333
~~~~~~~
3434
* Switched CI testing provider from Azure to GitHub Actions (:pull:`1306`)
3535
* Speed up CI setup using micromamba instead of conda (:pull:`1493`)
36+
* Drop python 3.6 (reached end of life Dec 2021) and add 3.10 to test matrix (:pull:`1507`)
3637

3738

3839
Documentation
@@ -50,6 +51,7 @@ Benchmarking
5051

5152
Requirements
5253
~~~~~~~~~~~~
54+
* Python 3.7 or greater. (:pull:`1507`)
5355
* Minimum pandas version increased to v0.25.0, released July 18, 2019. (:pull:`1448`)
5456

5557
Contributors

‎setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
'requests',
4545
'scipy >= 1.2.0',
4646
'h5py',
47-
'dataclasses; python_version < "3.7"']
47+
]
4848

4949
TESTS_REQUIRE = ['nose', 'pytest', 'pytest-cov', 'pytest-mock',
5050
'requests-mock', 'pytest-timeout', 'pytest-rerunfailures',
@@ -75,7 +75,7 @@
7575
'zip_safe': False,
7676
'scripts': [],
7777
'include_package_data': True,
78-
'python_requires': '>=3.6'
78+
'python_requires': '>=3.7'
7979
}
8080

8181
PROJECT_URLS = {

0 commit comments

Comments
 (0)
0