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 diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 31d4c117c5..f342811119 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: @@ -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 @@ -58,7 +59,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-py3.10.yml b/ci/requirements-py3.10.yml index c6f95fcbc8..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 - - pvfactors==1.4.1 + - nrel-pysam>=2.0 + - pvfactors==1.5.2 diff --git a/ci/requirements-py3.11.yml b/ci/requirements-py3.11.yml new file mode 100644 index 0000000000..ee4e7a9608 --- /dev/null +++ b/ci/requirements-py3.11.yml @@ -0,0 +1,29 @@ +name: test_env +channels: + - defaults + - conda-forge +dependencies: + - coveralls + - cython + - ephem + - h5py + - netcdf4 + # - numba # https://github.com/numba/numba/issues/8304 + - 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 + - statsmodels + - pip: + # - nrel-pysam>=2.0 + - pvfactors==1.5.2 diff --git a/ci/requirements-py3.7.yml b/ci/requirements-py3.7.yml index 442e5d1adc..f29373a9b6 100644 --- a/ci/requirements-py3.7.yml +++ b/ci/requirements-py3.7.yml @@ -23,9 +23,8 @@ dependencies: - pytz - requests - scipy >= 1.4.0 - - shapely # pvfactors dependency - siphon # conda-forge - 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..b16454523a 100644 --- a/ci/requirements-py3.8.yml +++ b/ci/requirements-py3.8.yml @@ -23,9 +23,8 @@ dependencies: - pytz - requests - scipy >= 1.4.0 - - shapely # pvfactors dependency - siphon # conda-forge - 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..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 - - pvfactors==1.4.1 + - nrel-pysam>=2.0 + - pvfactors==1.5.2 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