Skip to content

Commit

Permalink
Merge pull request #889 from zssherman/remove_27_ci
Browse files Browse the repository at this point in the history
PY: Removing Python 2.7 support from CI and documentation.
  • Loading branch information
zssherman authored Jan 2, 2020
2 parents f13a8d7 + fd33a4a commit 3e955b0
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 38 deletions.
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ environment based on the `environment.yml <https://github.com/ARM-DOE/pyart/blob

Or for a basic environment and downloading optional dependencies as needed::

conda create -n pyart_env -c conda-forge python=3.7 arm_pyart
conda create -n pyart_env -c conda-forge python=3.8 arm_pyart

Basic command in a terminal or command prompt to install the latest version of
Py-ART::
Expand Down Expand Up @@ -160,7 +160,7 @@ Other related open source software for working with weather radar data:
Dependencies
============

Py-ART is tested to work under Python 2.7, 3.6 and 3.7.
Py-ART is tested to work under Python 3.6, 3.7 and 3.8

The required dependencies to install Py-ART in addition to Python are:

Expand Down
32 changes: 16 additions & 16 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
image: Visual Studio 2019
environment:

CONDA_PATH: "C:\\Miniconda"

matrix:
- PYTHON_VERSION: "2.7"

- PYTHON_VERSION: "3.7"
- PYTHON_VERSION: "3.8"

platform:
- x64

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"
Expand All @@ -23,28 +25,26 @@ 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

# Install Py-ART dependecies
- "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
- "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
- "if \"%PYTHON_VERSION%\"==\"2.7\" (pytest -v --cov pyart --ignore pyart/util)"
- "if \"%PYTHON_VERSION%\"==\"3.8\" (pytest -v --cov pyart)"
- cmd: pytest -v --cov pyart
15 changes: 0 additions & 15 deletions continuous_integration/environment-2.7.yml

This file was deleted.

0 comments on commit 3e955b0

Please sign in to comment.