From 85174f73e51fd819dd7f0954bf266c9cabaa0d2e Mon Sep 17 00:00:00 2001 From: zssherman Date: Wed, 1 Jan 2020 11:23:32 -0500 Subject: [PATCH 1/3] PY: Removing Python 2.7 support from CI and documentation. --- .travis.yml | 4 ---- INSTALL.rst | 2 +- README.rst | 4 ++-- appveyor.yml | 5 ++--- continuous_integration/environment-2.7.yml | 15 --------------- 5 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 continuous_integration/environment-2.7.yml diff --git a/.travis.yml b/.travis.yml index f51185275e..6117e0f5bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,10 +13,6 @@ env: matrix: include: - - python: 2.7 - env: - - PYTHON_VERSION="2.7" - - PYTEST_ARGS="-v --cov pyart --ignore=pyart/util" - python: 3.6 env: - PYTHON_VERSION="3.6" diff --git a/INSTALL.rst b/INSTALL.rst index e5451ab54d..923365daaa 100644 --- a/INSTALL.rst +++ b/INSTALL.rst @@ -7,7 +7,7 @@ Required Dependencies Py-ART requires the following software. -* Python__ 2.7.x, 3.6.x or 3.7.x +* Python__ 3.6.x, 3.7.x or 3.8x __ http://www.python.org diff --git a/README.rst b/README.rst index 9f879f85ed..9921fb6089 100644 --- a/README.rst +++ b/README.rst @@ -89,7 +89,7 @@ environment based on the `environment.yml Date: Thu, 2 Jan 2020 15:31:19 -0500 Subject: [PATCH 2/3] FIX: A rework of appveyor with attempt to fix failing CI. --- appveyor.yml | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e1cfe9e01c..a74bf51cdc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,10 +1,10 @@ +image: Visual Studio 2019 environment: CONDA_PATH: "C:\\Miniconda" matrix: - PYTHON_VERSION: "3.7" - - PYTHON_VERSION: "3.8" platform: @@ -12,9 +12,11 @@ platform: install: # Use the pre-installed Miniconda for the desired arch + - ps: if($env:PYTHON_VERSION -eq '3.7') + { $env:CONDA_PATH="$($env:CONDA_PATH)37" } - ps: if($env:PLATFORM -eq 'x64') { $env:CONDA_PATH="$($env:CONDA_PATH)-x64" } - - ps: $env:path="$($env:CONDA_PATH);$($env:CONDA_PATH)\Scripts;$($env:CONDA_PATH)\Library\bin;C:\cygwin\bin;$($env:PATH)" + - ps: $env:path="$($env:CONDA_PATH);$($env:CONDA_PATH)\Scripts;$($env:CONDA_PATH)\Library\bin;$($env:PATH)" # Debugging #- "SET PATH" #- "python --version" @@ -23,27 +25,27 @@ install: #- "conda list" # Create and activate a conda environment with the desired Python version - - "conda update --yes --quiet conda" - - "conda config --set changeps1 no" - - "conda config --add channels conda-forge" - - "conda config --add channels conda-forge" - - "conda create --yes --quiet -n matrix_env python=%PYTHON_VERSION%" - - "activate matrix_env" + - cmd: conda update --yes --quiet conda + - cmd: conda config --set changeps1 no + - cmd: conda config --add channels conda-forge + - cmd: conda config --add channels conda-forge + - cmd: conda create --yes --quiet -n matrix_env python=%PYTHON_VERSION% pip + - cmd: activate matrix_env # Install Py-ART dependecies - - "conda install -y -q numpy scipy matplotlib netcdf4 pytest pytest-cov cython cartopy xarray" + - cmd: conda install -y -q numpy scipy matplotlib netcdf4 pytest pytest-cov cython cartopy xarray # Check that we have the expected version and architecture for Python # in the conda environment - - "python --version" - - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" - - "conda list" + - cmd: python --version + - cmd: python -c "import struct; print(struct.calcsize('P') * 8)" + - cmd: conda list # build Py-ART - - "pip install -e ." + - cmd: pip install -e . build: false test_script: # run the unit tests - - "pytest -v --cov pyart" + - cmd: pytest -v --cov pyart From fd33a4a56685bf176ef70f46317bf852fe1a0378 Mon Sep 17 00:00:00 2001 From: zssherman Date: Thu, 2 Jan 2020 15:51:09 -0500 Subject: [PATCH 3/3] FIX: Installing all together in env. --- appveyor.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a74bf51cdc..e6f1ba9af3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,11 +29,10 @@ install: - cmd: conda config --set changeps1 no - cmd: conda config --add channels conda-forge - cmd: conda config --add channels conda-forge - - cmd: conda create --yes --quiet -n matrix_env python=%PYTHON_VERSION% pip - - cmd: activate matrix_env # Install Py-ART dependecies - - cmd: conda install -y -q numpy scipy matplotlib netcdf4 pytest pytest-cov cython cartopy xarray + - cmd: conda create -y -q -n matrix_env python=%PYTHON_VERSON% numpy scipy matplotlib netcdf4 pytest pytest-cov cython cartopy xarray + - cmd: activate matrix_env # Check that we have the expected version and architecture for Python # in the conda environment