From 7cc2ab81efd19dce49664c53c467d18caf5e6e78 Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Tue, 10 Oct 2023 11:40:23 -0400 Subject: [PATCH 1/6] Create requirements-py3.12.yml --- ci/requirements-py3.12.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 ci/requirements-py3.12.yml diff --git a/ci/requirements-py3.12.yml b/ci/requirements-py3.12.yml new file mode 100644 index 0000000000..949d7ab13a --- /dev/null +++ b/ci/requirements-py3.12.yml @@ -0,0 +1,28 @@ +name: test_env +channels: + - defaults + - conda-forge +dependencies: + - coveralls + - cython + - ephem + - h5py + # - numba # not available for 3.12 as of 2023-10-10 + - numpy >= 1.16.0 + - pandas >= 0.25.0 + - pip + - pytest + - pytest-cov + - pytest-mock + - requests-mock + - pytest-timeout + - pytest-rerunfailures + - pytest-remotedata + - python=3.12 + - pytz + - requests + - scipy >= 1.4.0 + - statsmodels + - pip: + # - nrel-pysam>=2.0 # not available for 3.12 as of 2023-10-10 + - solarfactors From 6fce36a9186ee60f94b670bc99b1150763465ace Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Tue, 10 Oct 2023 11:41:07 -0400 Subject: [PATCH 2/6] add 3.12 to GH Actions test workflows --- .github/workflows/pytest-remote-data.yml | 2 +- .github/workflows/pytest.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pytest-remote-data.yml b/.github/workflows/pytest-remote-data.yml index 7e32486918..0603f632da 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.7, 3.8, 3.9, "3.10", "3.11"] + python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"] suffix: [''] # the alternative to "-min" include: - python-version: 3.7 diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 5185734e72..0b618d9f92 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.7, 3.8, 3.9, "3.10", "3.11"] + python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"] environment-type: [conda, bare] suffix: [''] # placeholder as an alternative to "-min" include: From 05e69597763e60400038648a29a059bc90057f9b Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Tue, 10 Oct 2023 11:44:28 -0400 Subject: [PATCH 3/6] whatsnew --- docs/sphinx/source/whatsnew/v0.10.3.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sphinx/source/whatsnew/v0.10.3.rst b/docs/sphinx/source/whatsnew/v0.10.3.rst index 30b9f576b0..c66ef8d00e 100644 --- a/docs/sphinx/source/whatsnew/v0.10.3.rst +++ b/docs/sphinx/source/whatsnew/v0.10.3.rst @@ -18,7 +18,7 @@ Bug fixes Testing ~~~~~~~ * Replace use of deprecated ``pkg_resources``. (:issue:`1881`, :pull:`1882`) - +* Added Python 3.12 to test suite. (:pull:`1886`) Documentation ~~~~~~~~~~~~~ From ad11ee04428bf8c3417ea8397c5d95efa378aece Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Tue, 10 Oct 2023 11:57:17 -0400 Subject: [PATCH 4/6] nix solarfactors --- ci/requirements-py3.12.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements-py3.12.yml b/ci/requirements-py3.12.yml index 949d7ab13a..232f95f434 100644 --- a/ci/requirements-py3.12.yml +++ b/ci/requirements-py3.12.yml @@ -25,4 +25,4 @@ dependencies: - statsmodels - pip: # - nrel-pysam>=2.0 # not available for 3.12 as of 2023-10-10 - - solarfactors + # - solarfactors # required shapely<2 isn't available for 3.12 From ce186c90960f7645fdc6e562cf0a1e6e349c32da Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Tue, 10 Oct 2023 12:08:56 -0400 Subject: [PATCH 5/6] fix yaml syntax --- ci/requirements-py3.12.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements-py3.12.yml b/ci/requirements-py3.12.yml index 232f95f434..a83798b47e 100644 --- a/ci/requirements-py3.12.yml +++ b/ci/requirements-py3.12.yml @@ -23,6 +23,6 @@ dependencies: - requests - scipy >= 1.4.0 - statsmodels - - pip: + # - pip: # - nrel-pysam>=2.0 # not available for 3.12 as of 2023-10-10 # - solarfactors # required shapely<2 isn't available for 3.12 From 6cc599d3402782a7944a2d8f473549239f8c1258 Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Tue, 12 Dec 2023 11:16:11 -0500 Subject: [PATCH 6/6] increase min scipy to 1.5; update comments --- ci/requirements-py3.12.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/requirements-py3.12.yml b/ci/requirements-py3.12.yml index a83798b47e..69632b3ac1 100644 --- a/ci/requirements-py3.12.yml +++ b/ci/requirements-py3.12.yml @@ -7,7 +7,7 @@ dependencies: - cython - ephem - h5py - # - numba # not available for 3.12 as of 2023-10-10 + # - numba # not available for 3.12 as of 2023-12-12 - numpy >= 1.16.0 - pandas >= 0.25.0 - pip @@ -21,8 +21,8 @@ dependencies: - python=3.12 - pytz - requests - - scipy >= 1.4.0 + - scipy >= 1.5.0 - statsmodels # - pip: - # - nrel-pysam>=2.0 # not available for 3.12 as of 2023-10-10 + # - nrel-pysam>=2.0 # not available for 3.12 as of 2023-12-12 # - solarfactors # required shapely<2 isn't available for 3.12