Skip to content

Drop py3.6, add 3.10; switch CI from macos-10.15 to macos-latest #1507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/pytest-remote-data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ jobs:
strategy:
fail-fast: false # don't cancel other matrix jobs when one fails
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.7, 3.8, 3.9, "3.10"]
suffix: [''] # the alternative to "-min"
include:
- python-version: 3.6
- python-version: 3.7
suffix: -min

runs-on: ubuntu-latest
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
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.6 && matrix.suffix == ''
if: matrix.python-version == 3.7 && matrix.suffix == ''
uses: codecov/codecov-action@v2
with:
fail_ci_if_error: true
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,17 @@ jobs:
strategy:
fail-fast: false # don't cancel other matrix jobs when one fails
matrix:
# use macos-10.15 instead of macos-latest for py3.6 support
os: [ubuntu-latest, macos-10.15, windows-latest]
python-version: [3.6, 3.7, 3.8, 3.9]
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.6
python-version: 3.7
environment-type: conda
suffix: -min
exclude:
- os: macos-10.15
- os: macos-latest
environment-type: conda
- os: windows-latest
environment-type: bare
Expand Down Expand Up @@ -81,7 +80,7 @@ jobs:
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.6 && matrix.suffix == '' && matrix.os == 'ubuntu-latest' && matrix.environment-type == 'conda'
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
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/asv.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"include": [
// minimum supported versions
{
"python": "3.6",
"python": "3.7",
"numpy": "1.16.0",
"pandas": "0.25.0",
"scipy": "1.2.0",
Expand Down
13 changes: 6 additions & 7 deletions ci/requirements-py3.6.yml → ci/requirements-py3.10.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,26 @@ dependencies:
- cython
- ephem
- h5py
- netcdf4
# - netcdf4 # pulls in a different version of numpy with ImportError
- nose
- numba
# - numba # python 3.9 compat in early 2021
- numpy >= 1.16.0
- pandas >= 0.25.0
- pip
- pytest
- pytest-cov
- pytest-mock
- requests-mock
- pytest-timeout
- pytest-rerunfailures
- pytest-remotedata
- pytest-timeout
- python=3.6
- python=3.10
- pytz
- requests
- scipy >= 1.2.0
- shapely # pvfactors dependency
- siphon # conda-forge
# - siphon # conda-forge
- statsmodels
- pip:
- dataclasses
- nrel-pysam>=2.0
# - nrel-pysam>=2.0 # install error on windows
- pvfactors==1.4.1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
- pytest-cov
- pytest-mock
- pytest-timeout
- python=3.6
- python=3.7
- pytz
- requests
- pip:
Expand Down
2 changes: 2 additions & 0 deletions docs/sphinx/source/whatsnew/v0.9.2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Testing
~~~~~~~
* Switched CI testing provider from Azure to GitHub Actions (:pull:`1306`)
* Speed up CI setup using micromamba instead of conda (:pull:`1493`)
* Drop python 3.6 (reached end of life Dec 2021) and add 3.10 to test matrix (:pull:`1507`)


Documentation
Expand All @@ -47,6 +48,7 @@ Benchmarking

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

Contributors
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
'requests',
'scipy >= 1.2.0',
'h5py',
'dataclasses; python_version < "3.7"']
]

TESTS_REQUIRE = ['nose', 'pytest', 'pytest-cov', 'pytest-mock',
'requests-mock', 'pytest-timeout', 'pytest-rerunfailures',
Expand Down Expand Up @@ -75,7 +75,7 @@
'zip_safe': False,
'scripts': [],
'include_package_data': True,
'python_requires': '>=3.6'
'python_requires': '>=3.7'
}

PROJECT_URLS = {
Expand Down