From 222b9696852b88d9bbc51126e2993dfb8d76cda3 Mon Sep 17 00:00:00 2001 From: "Adam R. Jensen" <39184289+AdamRJensen@users.noreply.github.com> Date: Fri, 11 Oct 2024 20:26:23 +0200 Subject: [PATCH 1/8] Add py3.13.yml test configuration --- .github/workflows/pytest.yml | 2 +- ci/requirements-py3.13.yml | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 ci/requirements-py3.13.yml diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 1f2810ad0f..a91af26d79 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false # don't cancel other matrix jobs when one fails matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: [3.9, "3.10", "3.11", "3.12"] + python-version: [3.9, "3.10", "3.11", "3.12", "3.13"] environment-type: [conda, bare] suffix: [''] # placeholder as an alternative to "-min" include: diff --git a/ci/requirements-py3.13.yml b/ci/requirements-py3.13.yml new file mode 100644 index 0000000000..f3d8fc2d0c --- /dev/null +++ b/ci/requirements-py3.13.yml @@ -0,0 +1,28 @@ +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.12 + - pytz + - requests + - scipy >= 1.6.0 + - statsmodels + - pip: + - nrel-pysam>=2.0 + # - solarfactors # required shapely<2 isn't available for 3.12 From fe9262619e95ab5f71e3eea7d6f3dfd1d17980ce Mon Sep 17 00:00:00 2001 From: "Adam R. Jensen" <39184289+AdamRJensen@users.noreply.github.com> Date: Mon, 14 Oct 2024 02:01:33 +0200 Subject: [PATCH 2/8] Update ci/requirements-py3.13.yml Co-authored-by: Echedey Luis <80125792+echedey-ls@users.noreply.github.com> --- ci/requirements-py3.13.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements-py3.13.yml b/ci/requirements-py3.13.yml index f3d8fc2d0c..a084d8262f 100644 --- a/ci/requirements-py3.13.yml +++ b/ci/requirements-py3.13.yml @@ -18,7 +18,7 @@ dependencies: - pytest-timeout - pytest-rerunfailures - conda-forge::pytest-remotedata # version in default channel is old - - python=3.12 + - python=3.13 - pytz - requests - scipy >= 1.6.0 From 8cb64520e4294522ebcfdd04675afe3126c223ce Mon Sep 17 00:00:00 2001 From: "Adam R. Jensen" <39184289+AdamRJensen@users.noreply.github.com> Date: Mon, 14 Oct 2024 02:01:43 +0200 Subject: [PATCH 3/8] Update ci/requirements-py3.13.yml Co-authored-by: Echedey Luis <80125792+echedey-ls@users.noreply.github.com> --- ci/requirements-py3.13.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements-py3.13.yml b/ci/requirements-py3.13.yml index a084d8262f..7f3a47fef4 100644 --- a/ci/requirements-py3.13.yml +++ b/ci/requirements-py3.13.yml @@ -25,4 +25,4 @@ dependencies: - statsmodels - pip: - nrel-pysam>=2.0 - # - solarfactors # required shapely<2 isn't available for 3.12 + # - solarfactors # required shapely<2 isn't available for Python>=3.12 From d8a3945ac21d185e8b9e6424b95139a464918a13 Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Mon, 23 Dec 2024 12:31:08 -0500 Subject: [PATCH 4/8] leave out numba --- ci/requirements-py3.13.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements-py3.13.yml b/ci/requirements-py3.13.yml index 7f3a47fef4..fcfba29ace 100644 --- a/ci/requirements-py3.13.yml +++ b/ci/requirements-py3.13.yml @@ -7,7 +7,7 @@ dependencies: - cython - ephem - h5py - - numba + # - numba # not available for py3.13 as of Dec 2024 - numpy >= 1.17.3 - pandas >= 1.3.0 - pip From a83c06377c834aa28ff4601549f0c9fe7bb3176b Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Mon, 23 Dec 2024 12:34:12 -0500 Subject: [PATCH 5/8] and pysam --- ci/requirements-py3.13.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements-py3.13.yml b/ci/requirements-py3.13.yml index fcfba29ace..c412bebc64 100644 --- a/ci/requirements-py3.13.yml +++ b/ci/requirements-py3.13.yml @@ -24,5 +24,5 @@ dependencies: - scipy >= 1.6.0 - statsmodels - pip: - - nrel-pysam>=2.0 + # - nrel-pysam>=2.0 # not available for py3.13 as of Dec 2024 # - solarfactors # required shapely<2 isn't available for Python>=3.12 From 3291098241aa99f71e77c94b63a7037b70904edf Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Mon, 23 Dec 2024 12:38:12 -0500 Subject: [PATCH 6/8] fix yaml syntax issue --- ci/requirements-py3.13.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements-py3.13.yml b/ci/requirements-py3.13.yml index c412bebc64..17508bfe87 100644 --- a/ci/requirements-py3.13.yml +++ b/ci/requirements-py3.13.yml @@ -23,6 +23,6 @@ dependencies: - requests - scipy >= 1.6.0 - statsmodels - - pip: + # - pip: # - nrel-pysam>=2.0 # not available for py3.13 as of Dec 2024 # - solarfactors # required shapely<2 isn't available for Python>=3.12 From e5b4f2c9ff6dee5f0c12fb6908c162bf94916fb2 Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Mon, 23 Dec 2024 12:47:34 -0500 Subject: [PATCH 7/8] add 3.13 to remote-data tests also --- .github/workflows/pytest-remote-data.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pytest-remote-data.yml b/.github/workflows/pytest-remote-data.yml index f74fd38ad8..64c30a0097 100644 --- a/.github/workflows/pytest-remote-data.yml +++ b/.github/workflows/pytest-remote-data.yml @@ -56,7 +56,7 @@ jobs: strategy: fail-fast: false # don't cancel other matrix jobs when one fails matrix: - python-version: [3.9, "3.10", "3.11", "3.12"] + python-version: [3.9, "3.10", "3.11", "3.12", "3.13"] suffix: [''] # the alternative to "-min" include: - python-version: 3.9 From 050ed01c4c71b3c3cf18c453d734bf5e3f5f46a8 Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Mon, 23 Dec 2024 12:48:28 -0500 Subject: [PATCH 8/8] whatsnew --- docs/sphinx/source/whatsnew/v0.11.3.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/sphinx/source/whatsnew/v0.11.3.rst b/docs/sphinx/source/whatsnew/v0.11.3.rst index 238ec1e9a6..7411e37b99 100644 --- a/docs/sphinx/source/whatsnew/v0.11.3.rst +++ b/docs/sphinx/source/whatsnew/v0.11.3.rst @@ -18,6 +18,7 @@ Documentation Testing ~~~~~~~ +* Added Python 3.12 to test suite. (:pull:`2258`) Requirements