From 52afdcf605273c3aeec0720f521ed8f875ddab49 Mon Sep 17 00:00:00 2001 From: "Adam R. Jensen" <39184289+AdamRJensen@users.noreply.github.com> Date: Wed, 25 Sep 2024 17:56:18 +0200 Subject: [PATCH] Remove Python version 3.8 (#2213) * Remove python version 3.8 * Add py3.9-min * Update min numpy in pyproject.toml * Update asv.conf.json * Update v0.11.1.rst * Update versions in asv.conf.json * Bumping numpy version in asv.conf.json * Update v0.11.1.rst * Update codecov python version * Remove dataclassees in requirements-py3.9-min.yml Co-authored-by: Kevin Anderson --------- Co-authored-by: Kevin Anderson --- .github/workflows/publish.yml | 2 +- .github/workflows/pytest-remote-data.yml | 6 ++-- .github/workflows/pytest.yml | 6 ++-- benchmarks/asv.conf.json | 10 +++---- ci/requirements-py3.8.yml | 28 ------------------- ...3.8-min.yml => requirements-py3.9-min.yml} | 9 +++--- docs/sphinx/source/whatsnew/v0.11.1.rst | 6 ++-- pyproject.toml | 4 +-- 8 files changed, 22 insertions(+), 49 deletions(-) delete mode 100644 ci/requirements-py3.8.yml rename ci/{requirements-py3.8-min.yml => requirements-py3.9-min.yml} (68%) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a23dfedc4f..e0e34b3dff 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -22,7 +22,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: 3.8 + python-version: 3.9 - name: Install build tools run: | diff --git a/.github/workflows/pytest-remote-data.yml b/.github/workflows/pytest-remote-data.yml index a894db7c7d..205cdb8c73 100644 --- a/.github/workflows/pytest-remote-data.yml +++ b/.github/workflows/pytest-remote-data.yml @@ -56,10 +56,10 @@ 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 @@ -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 diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 80f10f0b16..ac3da9ff98 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -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: @@ -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 diff --git a/benchmarks/asv.conf.json b/benchmarks/asv.conf.json index 1ca23419a9..62a21bf505 100644 --- a/benchmarks/asv.conf.json +++ b/benchmarks/asv.conf.json @@ -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": "", diff --git a/ci/requirements-py3.8.yml b/ci/requirements-py3.8.yml deleted file mode 100644 index 19c3b8f2f3..0000000000 --- a/ci/requirements-py3.8.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: test_env -channels: - - defaults - - conda-forge -dependencies: - - coveralls - - cython - - ephem - - h5py - - numba - - numpy >= 1.17.3 - - pandas >= 1.3.0 - - pip - - pytest - - pytest-cov - - pytest-mock - - requests-mock - - pytest-timeout - - pytest-rerunfailures - - conda-forge::pytest-remotedata # version in default channel is old - - python=3.8 - - pytz - - requests - - scipy >= 1.6.0 - - statsmodels - - pip: - - nrel-pysam>=2.0 - - solarfactors diff --git a/ci/requirements-py3.8-min.yml b/ci/requirements-py3.9-min.yml similarity index 68% rename from ci/requirements-py3.8-min.yml rename to ci/requirements-py3.9-min.yml index ef230b1627..d17df337fd 100644 --- a/ci/requirements-py3.8-min.yml +++ b/ci/requirements-py3.9-min.yml @@ -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 diff --git a/docs/sphinx/source/whatsnew/v0.11.1.rst b/docs/sphinx/source/whatsnew/v0.11.1.rst index 4e68b2c920..a7d6a60eb8 100644 --- a/docs/sphinx/source/whatsnew/v0.11.1.rst +++ b/docs/sphinx/source/whatsnew/v0.11.1.rst @@ -79,7 +79,8 @@ Documentation Requirements ~~~~~~~~~~~~ - +* Python 3.9 or greater. (:pull:`2213`) +* Minimum numpy version increased to v1.19.3. (:pull:`2213`) Contributors ~~~~~~~~~~~~ @@ -98,4 +99,5 @@ Contributors * Marcos R. Escudero (:ghuser:`marc-resc`) * Bernat Nicolau (:ghuser:`BernatNicolau`) * Eduardo Sarquis (:ghuser:`EduardoSarquis`) -* Andrew B Godbehere (:ghuser:`agodbehere`) \ No newline at end of file +* Adam R. Jensen (:ghuser:`AdamRJensen`) +* Andrew B Godbehere (:ghuser:`agodbehere`) diff --git a/pyproject.toml b/pyproject.toml index 16b39c3b64..f8283a42eb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,9 +9,9 @@ description = "A set of functions and classes for simulating the performance of authors = [ { name = "pvlib python Developers", email = "pvlib-admin@googlegroups.com" }, ] -requires-python = ">=3.8" +requires-python = ">=3.9" dependencies = [ - 'numpy >= 1.17.3', + 'numpy >= 1.19.3', 'pandas >= 1.3.0', 'pytz', 'requests',