From f09b79416d7c6476fe48696c4cadacaa6e46c912 Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Mon, 14 Dec 2020 18:25:18 -0700 Subject: [PATCH 1/4] add python 3.9 to build matrix --- ci/azure/conda_linux.yml | 2 ++ ci/azure/conda_windows.yml | 2 ++ ci/azure/posix.yml | 2 ++ ci/requirements-py39.yml | 31 +++++++++++++++++++++++++++++++ 4 files changed, 37 insertions(+) create mode 100644 ci/requirements-py39.yml diff --git a/ci/azure/conda_linux.yml b/ci/azure/conda_linux.yml index 4fef14754b..583ac71226 100644 --- a/ci/azure/conda_linux.yml +++ b/ci/azure/conda_linux.yml @@ -18,6 +18,8 @@ jobs: python.version: '37' Python38: python.version: '38' + Python39: + python.version: '39' steps: - bash: echo "##vso[task.prependpath]/usr/share/miniconda/bin" diff --git a/ci/azure/conda_windows.yml b/ci/azure/conda_windows.yml index 3c27f385e0..4b8cf61911 100644 --- a/ci/azure/conda_windows.yml +++ b/ci/azure/conda_windows.yml @@ -14,6 +14,8 @@ jobs: python.version: '37' Python38-windows: python.version: '38' + Python39-windows: + python.version: '39' steps: - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts" diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 806cd27e77..cbcdf5694d 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -14,6 +14,8 @@ jobs: python.version: '3.7' Python38: python.version: '3.8' + Python39: + python.version: '3.9' steps: - task: UsePythonVersion@0 diff --git a/ci/requirements-py39.yml b/ci/requirements-py39.yml new file mode 100644 index 0000000000..6db508fd53 --- /dev/null +++ b/ci/requirements-py39.yml @@ -0,0 +1,31 @@ +name: test_env +channels: + - defaults + - conda-forge +dependencies: + - coveralls + - cython + - ephem + - netcdf4 + - nose + - numba + - numpy >= 1.12.0 + - pandas >= 0.22.0 + - pip + - pytables # tables when using pip+PyPI + - pytest + - pytest-cov + - pytest-mock + - pytest-timeout + - pytest-rerunfailures + - pytest-remotedata + - python=3.8 + - pytz + - requests + - scipy >= 1.2.0 + - shapely # pvfactors dependency + - siphon # conda-forge + - statsmodels + - pip: + - nrel-pysam>=2.0 + - pvfactors==1.4.1 From 77d6298b53f621f35bf06da296bd7f236a353673 Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Mon, 14 Dec 2020 20:03:41 -0700 Subject: [PATCH 2/4] dependency hell --- ci/requirements-py39.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/requirements-py39.yml b/ci/requirements-py39.yml index 6db508fd53..2bc468dd20 100644 --- a/ci/requirements-py39.yml +++ b/ci/requirements-py39.yml @@ -6,9 +6,9 @@ dependencies: - coveralls - cython - ephem - - netcdf4 + # - netcdf4 - nose - - numba + # - numba - numpy >= 1.12.0 - pandas >= 0.22.0 - pip @@ -19,12 +19,12 @@ dependencies: - pytest-timeout - pytest-rerunfailures - pytest-remotedata - - python=3.8 + - python=3.9 - pytz - requests - scipy >= 1.2.0 - shapely # pvfactors dependency - - siphon # conda-forge + # - siphon # conda-forge - statsmodels - pip: - nrel-pysam>=2.0 From d2345a47bdfe6dfdefa53418f3b16e0da6090488 Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Mon, 14 Dec 2020 20:05:19 -0700 Subject: [PATCH 3/4] whatsnew --- docs/sphinx/source/whatsnew/v0.8.1.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/sphinx/source/whatsnew/v0.8.1.rst b/docs/sphinx/source/whatsnew/v0.8.1.rst index c5fd0540fe..0c1b588276 100644 --- a/docs/sphinx/source/whatsnew/v0.8.1.rst +++ b/docs/sphinx/source/whatsnew/v0.8.1.rst @@ -41,6 +41,7 @@ Testing ~~~~~~~ * Add airspeed velocity performance testing configuration and a few benchmarks. (:issue:`419`, :pull:`1049`, :pull:`1059`) +* Add Python 3.9 CI configurations. (:issue:`1102`, :pull:`1112`) Documentation ~~~~~~~~~~~~~ From d2dc864bcfae3e6d0260bf717dba0a2727d957b0 Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Tue, 15 Dec 2020 12:41:54 -0700 Subject: [PATCH 4/4] no nrel-pysam. a few comments --- ci/requirements-py39.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/requirements-py39.yml b/ci/requirements-py39.yml index 2bc468dd20..35a3fa1952 100644 --- a/ci/requirements-py39.yml +++ b/ci/requirements-py39.yml @@ -6,9 +6,9 @@ dependencies: - coveralls - cython - ephem - # - netcdf4 + # - netcdf4 # pulls in a different version of numpy with ImportError - nose - # - numba + # - numba # python 3.9 compat in early 2021 - numpy >= 1.12.0 - pandas >= 0.22.0 - pip @@ -27,5 +27,5 @@ dependencies: # - siphon # conda-forge - statsmodels - pip: - - nrel-pysam>=2.0 + # - nrel-pysam>=2.0 # install error on windows - pvfactors==1.4.1