From 8e90e6887f94349e3a52a26745133900f399816a Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Tue, 1 Nov 2022 20:43:17 -0700 Subject: [PATCH 1/9] add python 3.11 to ci --- .github/workflows/pytest.yml | 2 +- ci/requirements-py-3.11.yml | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 ci/requirements-py-3.11.yml diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 79e345baff..80f373a22b 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"] + python-version: [3.7, 3.8, 3.9, "3.10", "3.11"] environment-type: [conda, bare] suffix: [''] # placeholder as an alternative to "-min" include: diff --git a/ci/requirements-py-3.11.yml b/ci/requirements-py-3.11.yml new file mode 100644 index 0000000000..399f64792d --- /dev/null +++ b/ci/requirements-py-3.11.yml @@ -0,0 +1,32 @@ +name: test_env +channels: + - defaults + - conda-forge +dependencies: + - coveralls + # - cython + # - ephem + - h5py + # - netcdf4 # ??? + # - nose + # - numba # ??? + - numpy >= 1.16.0 + - pandas >= 0.25.0 + - pip + - pytest + - pytest-cov + - pytest-mock + - requests-mock + - pytest-timeout + - pytest-rerunfailures + - pytest-remotedata + - python=3.11 + - pytz + - requests + - scipy >= 1.2.0 + # - shapely # ??? pvfactors dependency + # - siphon # conda-forge + - statsmodels + - pip: + # - nrel-pysam>=2.0 # install error on windows + - pvfactors==1.4.1 From fa7060f6d2e0bc115503eb2b1e8d310aa49eac86 Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Wed, 2 Nov 2022 08:10:15 -0700 Subject: [PATCH 2/9] remove extra -, py action v1 to v4 --- .github/workflows/pytest.yml | 2 +- ci/{requirements-py-3.11.yml => requirements-py3.11.yml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename ci/{requirements-py-3.11.yml => requirements-py3.11.yml} (100%) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 80f373a22b..e977ab3d9a 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -58,7 +58,7 @@ jobs: - name: Install bare Python ${{ matrix.python-version }}${{ matrix.suffix }} if: matrix.environment-type == 'bare' - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} diff --git a/ci/requirements-py-3.11.yml b/ci/requirements-py3.11.yml similarity index 100% rename from ci/requirements-py-3.11.yml rename to ci/requirements-py3.11.yml From 493b0d66ec0602167cdc65e7d6468598a6bdb40e Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Wed, 2 Nov 2022 21:02:51 -0700 Subject: [PATCH 3/9] update micromamba action, channel-priority: flexible --- .github/workflows/pytest.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index e977ab3d9a..d955f98690 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -40,12 +40,13 @@ jobs: - name: Install Conda environment with Micromamba if: matrix.environment-type == 'conda' - uses: mamba-org/provision-with-micromamba@v12 + uses: mamba-org/provision-with-micromamba@v14 with: environment-file: ${{ env.REQUIREMENTS }} cache-downloads: true extra-specs: | python=${{ matrix.python-version }} + channel-priority: flexible env: # build requirement filename. First replacement is for the python # version, second is to add "-min" if needed From ffd077c8d4becea5deb4699eed46cc73ebbe6986 Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Mon, 23 Jan 2023 20:13:12 -0700 Subject: [PATCH 4/9] pvfactors 1.5.2 --- ci/requirements-py3.10.yml | 2 +- ci/requirements-py3.11.yml | 2 +- ci/requirements-py3.7.yml | 2 +- ci/requirements-py3.8.yml | 2 +- ci/requirements-py3.9.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/requirements-py3.10.yml b/ci/requirements-py3.10.yml index c6f95fcbc8..fa208f4d91 100644 --- a/ci/requirements-py3.10.yml +++ b/ci/requirements-py3.10.yml @@ -28,4 +28,4 @@ dependencies: - statsmodels - pip: # - nrel-pysam>=2.0 # install error on windows - - pvfactors==1.4.1 + - pvfactors==1.5.2 diff --git a/ci/requirements-py3.11.yml b/ci/requirements-py3.11.yml index 399f64792d..43616448cf 100644 --- a/ci/requirements-py3.11.yml +++ b/ci/requirements-py3.11.yml @@ -29,4 +29,4 @@ dependencies: - statsmodels - pip: # - nrel-pysam>=2.0 # install error on windows - - pvfactors==1.4.1 + - pvfactors==1.5.2 diff --git a/ci/requirements-py3.7.yml b/ci/requirements-py3.7.yml index 442e5d1adc..4c0f080aaf 100644 --- a/ci/requirements-py3.7.yml +++ b/ci/requirements-py3.7.yml @@ -28,4 +28,4 @@ dependencies: - statsmodels - pip: - nrel-pysam>=2.0 - - pvfactors==1.4.1 + - pvfactors==1.5.2 diff --git a/ci/requirements-py3.8.yml b/ci/requirements-py3.8.yml index 013a7e4684..db8f8113e2 100644 --- a/ci/requirements-py3.8.yml +++ b/ci/requirements-py3.8.yml @@ -28,4 +28,4 @@ dependencies: - statsmodels - pip: - nrel-pysam>=2.0 - - pvfactors==1.4.1 + - pvfactors==1.5.2 diff --git a/ci/requirements-py3.9.yml b/ci/requirements-py3.9.yml index b208a10c24..12ec4a0683 100644 --- a/ci/requirements-py3.9.yml +++ b/ci/requirements-py3.9.yml @@ -28,4 +28,4 @@ dependencies: - statsmodels - pip: # - nrel-pysam>=2.0 # install error on windows - - pvfactors==1.4.1 + - pvfactors==1.5.2 From ccad1db8d9e9d16a3dd8385a5877829125082a96 Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Mon, 23 Jan 2023 20:23:04 -0700 Subject: [PATCH 5/9] whatsnew --- docs/sphinx/source/whatsnew/v0.9.5.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/sphinx/source/whatsnew/v0.9.5.rst b/docs/sphinx/source/whatsnew/v0.9.5.rst index dd2ad9c189..35e37af485 100644 --- a/docs/sphinx/source/whatsnew/v0.9.5.rst +++ b/docs/sphinx/source/whatsnew/v0.9.5.rst @@ -24,6 +24,7 @@ Bug fixes Testing ~~~~~~~ +* Added Python 3.11 to test suite. (:pull:`1582`) Documentation From 695275c73b039f3d010cd29736c2503d5ed7342e Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Tue, 24 Jan 2023 08:51:31 -0700 Subject: [PATCH 6/9] 3.11 requirements clean up --- ci/requirements-py3.11.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/ci/requirements-py3.11.yml b/ci/requirements-py3.11.yml index 43616448cf..12dbba3394 100644 --- a/ci/requirements-py3.11.yml +++ b/ci/requirements-py3.11.yml @@ -4,12 +4,11 @@ channels: - conda-forge dependencies: - coveralls - # - cython - # - ephem + - cython + - ephem - h5py - # - netcdf4 # ??? - # - nose - # - numba # ??? + - netcdf4 + # - numba # https://github.com/numba/numba/issues/8304 - numpy >= 1.16.0 - pandas >= 0.25.0 - pip @@ -24,8 +23,6 @@ dependencies: - pytz - requests - scipy >= 1.2.0 - # - shapely # ??? pvfactors dependency - # - siphon # conda-forge - statsmodels - pip: # - nrel-pysam>=2.0 # install error on windows From 3078d7e5c275ad4d31d029611070ef9d77727b38 Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Tue, 24 Jan 2023 08:53:51 -0700 Subject: [PATCH 7/9] ci/requirements* clean up --- ci/requirements-py3.10.yml | 8 +++----- ci/requirements-py3.11.yml | 2 +- ci/requirements-py3.7.yml | 1 - ci/requirements-py3.8.yml | 1 - ci/requirements-py3.9.yml | 8 +++----- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/ci/requirements-py3.10.yml b/ci/requirements-py3.10.yml index fa208f4d91..8e83c8ab89 100644 --- a/ci/requirements-py3.10.yml +++ b/ci/requirements-py3.10.yml @@ -7,8 +7,8 @@ dependencies: - cython - ephem - h5py - # - netcdf4 # pulls in a different version of numpy with ImportError - # - numba # python 3.9 compat in early 2021 + - netcdf4 + - numba - numpy >= 1.16.0 - pandas >= 0.25.0 - pip @@ -23,9 +23,7 @@ dependencies: - pytz - requests - scipy >= 1.4.0 - - shapely # pvfactors dependency - # - siphon # conda-forge - statsmodels - pip: - # - nrel-pysam>=2.0 # install error on windows + - nrel-pysam>=2.0 - pvfactors==1.5.2 diff --git a/ci/requirements-py3.11.yml b/ci/requirements-py3.11.yml index 12dbba3394..79b8e46513 100644 --- a/ci/requirements-py3.11.yml +++ b/ci/requirements-py3.11.yml @@ -25,5 +25,5 @@ dependencies: - scipy >= 1.2.0 - statsmodels - pip: - # - nrel-pysam>=2.0 # install error on windows + - nrel-pysam>=2.0 - pvfactors==1.5.2 diff --git a/ci/requirements-py3.7.yml b/ci/requirements-py3.7.yml index 4c0f080aaf..f29373a9b6 100644 --- a/ci/requirements-py3.7.yml +++ b/ci/requirements-py3.7.yml @@ -23,7 +23,6 @@ dependencies: - pytz - requests - scipy >= 1.4.0 - - shapely # pvfactors dependency - siphon # conda-forge - statsmodels - pip: diff --git a/ci/requirements-py3.8.yml b/ci/requirements-py3.8.yml index db8f8113e2..b16454523a 100644 --- a/ci/requirements-py3.8.yml +++ b/ci/requirements-py3.8.yml @@ -23,7 +23,6 @@ dependencies: - pytz - requests - scipy >= 1.4.0 - - shapely # pvfactors dependency - siphon # conda-forge - statsmodels - pip: diff --git a/ci/requirements-py3.9.yml b/ci/requirements-py3.9.yml index 12ec4a0683..906351fd3e 100644 --- a/ci/requirements-py3.9.yml +++ b/ci/requirements-py3.9.yml @@ -7,8 +7,8 @@ dependencies: - cython - ephem - h5py - # - netcdf4 # pulls in a different version of numpy with ImportError - # - numba # python 3.9 compat in early 2021 + - netcdf4 + - numba - numpy >= 1.16.0 - pandas >= 0.25.0 - pip @@ -23,9 +23,7 @@ dependencies: - pytz - requests - scipy >= 1.4.0 - - shapely # pvfactors dependency - # - siphon # conda-forge - statsmodels - pip: - # - nrel-pysam>=2.0 # install error on windows + - nrel-pysam>=2.0 - pvfactors==1.5.2 From 163f5c55b38c76e7be19e7ffb2bcf95b3c566671 Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Tue, 24 Jan 2023 09:26:41 -0700 Subject: [PATCH 8/9] no pysam in 3.11 --- ci/requirements-py3.11.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements-py3.11.yml b/ci/requirements-py3.11.yml index 79b8e46513..ee4e7a9608 100644 --- a/ci/requirements-py3.11.yml +++ b/ci/requirements-py3.11.yml @@ -25,5 +25,5 @@ dependencies: - scipy >= 1.2.0 - statsmodels - pip: - - nrel-pysam>=2.0 + # - nrel-pysam>=2.0 - pvfactors==1.5.2 From efa91238ade75baff1935cdfd5da3ce93dda7448 Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Tue, 24 Jan 2023 12:16:11 -0500 Subject: [PATCH 9/9] run 3.11 in pytest-remote-data too --- .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 06adfb1807..ee3ffd3d95 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"] + python-version: [3.7, 3.8, 3.9, "3.10", "3.11"] suffix: [''] # the alternative to "-min" include: - python-version: 3.7