From 585fbc00edb3e53881dc4dc897a143903c4831b0 Mon Sep 17 00:00:00 2001 From: Zachary Sherman Date: Mon, 24 Jul 2017 15:07:38 -0500 Subject: [PATCH 01/12] CI: Adding dependencies environment for Travis-CI. The dependencies in environment.yml will be downloaded in order to run the nosetests for pull requests. --- continuous_integration/environment.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 continuous_integration/environment.yml diff --git a/continuous_integration/environment.yml b/continuous_integration/environment.yml new file mode 100644 index 0000000..64d2257 --- /dev/null +++ b/continuous_integration/environment.yml @@ -0,0 +1,11 @@ +name: test_env +channels: + - conda-forge + - defaults +dependencies: + - python=3.6 + - arm-pyart + - nose + - numpy + - pandas + - scipy From 398d2a1a9068c79aa61a908a2f78e7f59bdfd958 Mon Sep 17 00:00:00 2001 From: Zachary Sherman Date: Mon, 24 Jul 2017 15:41:32 -0500 Subject: [PATCH 02/12] FIX: arm-pyart was suppose to be arm_pyart. --- continuous_integration/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/continuous_integration/environment.yml b/continuous_integration/environment.yml index 64d2257..f76f09f 100644 --- a/continuous_integration/environment.yml +++ b/continuous_integration/environment.yml @@ -4,7 +4,7 @@ channels: - defaults dependencies: - python=3.6 - - arm-pyart + - arm_pyart - nose - numpy - pandas From 4c9584668ef9459537b6b077a7fcd8b59e9631c1 Mon Sep 17 00:00:00 2001 From: Zachary Sherman Date: Mon, 24 Jul 2017 15:42:41 -0500 Subject: [PATCH 03/12] CI: Adding install script for TINT. install.sh installs miniconda and creates an environment with TINT dependencies and nose for nosetests. The install.sh script is based on the one created by Jonathan Helmus for arm_pyart. .travis.yml is pretty basic because TINT does not have COVERALLS or gh-pages yet. These will be added in the future. --- continuous_integration/install.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 continuous_integration/install.sh diff --git a/continuous_integration/install.sh b/continuous_integration/install.sh new file mode 100644 index 0000000..9427d1e --- /dev/null +++ b/continuous_integration/install.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# Based on install.sh from arm-pyart. +# https://github.com/ARM-DOE/pyart/blob/master/continuous_integration/install.sh + +# Install Miniconda +wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh \ + -O miniconda.sh +chmod +x miniconda.sh +./miniconda.sh -b +export PATH=/home/travis/miniconda3/bin:$PATH +conda config --set always_yes yes +conda config --set show_channel_urls true +conda update -q conda + +## Create a testenv with the correct Python version +conda env create -f continuous_integration/environment.yml +source activate test_env + +python setup.py build_ext --inplace From 34461ddf78790a86dc0f58b4ec6da0642bd0f4b9 Mon Sep 17 00:00:00 2001 From: Zachary Sherman Date: Mon, 24 Jul 2017 15:45:17 -0500 Subject: [PATCH 04/12] CI: Adding .travis.yml The .travis.yml contains the programming language, install script, and nosetests. Basic at the moment, gh-pages and possible COVERALLS will be added later. --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..6a48666 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,7 @@ +sudo: false # Use container-based infrastructure. +language: python + +# Create a test environment and install dependencies. +install: source continuous_integration/install.sh +# Command to run tests. +script: nosetests -v From 157a77cf4859836a8fc4d3297f29e410a2f42d28 Mon Sep 17 00:00:00 2001 From: Zachary Sherman Date: Fri, 4 Aug 2017 10:33:39 -0500 Subject: [PATCH 05/12] CI: Changed nosetests to pytest. Pytest is growing and seems to have a active community. Nose hasn't been touched in a year or so. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6a48666..d4401d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ language: python # Create a test environment and install dependencies. install: source continuous_integration/install.sh # Command to run tests. -script: nosetests -v +script: pytest From 260ecf7e9d3725dc6cf4a652d77f4deef507e2b3 Mon Sep 17 00:00:00 2001 From: Zachary Sherman Date: Fri, 4 Aug 2017 10:35:30 -0500 Subject: [PATCH 06/12] CI: Changed nose to pytest. --- continuous_integration/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/continuous_integration/environment.yml b/continuous_integration/environment.yml index f76f09f..facf92c 100644 --- a/continuous_integration/environment.yml +++ b/continuous_integration/environment.yml @@ -5,7 +5,7 @@ channels: dependencies: - python=3.6 - arm_pyart - - nose + - pytest - numpy - pandas - scipy From e0ff45cad6d4511cadbf3744c826c1d98d02e40c Mon Sep 17 00:00:00 2001 From: Zachary Sherman Date: Mon, 25 Sep 2017 10:14:26 -0500 Subject: [PATCH 07/12] DEL: Renaming environment.yml to environment-3.6.yml. Adding different python environments. --- continuous_integration/environment.yml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 continuous_integration/environment.yml diff --git a/continuous_integration/environment.yml b/continuous_integration/environment.yml deleted file mode 100644 index facf92c..0000000 --- a/continuous_integration/environment.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: test_env -channels: - - conda-forge - - defaults -dependencies: - - python=3.6 - - arm_pyart - - pytest - - numpy - - pandas - - scipy From fcc64e3bec97ce4b1fee0387b33210e51df9012e Mon Sep 17 00:00:00 2001 From: Zachary Sherman Date: Mon, 25 Sep 2017 10:15:44 -0500 Subject: [PATCH 08/12] ENH: Changed install of environment.yml to include python version. --- continuous_integration/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/continuous_integration/install.sh b/continuous_integration/install.sh index 9427d1e..f11e964 100644 --- a/continuous_integration/install.sh +++ b/continuous_integration/install.sh @@ -13,7 +13,7 @@ conda config --set show_channel_urls true conda update -q conda ## Create a testenv with the correct Python version -conda env create -f continuous_integration/environment.yml +conda env create -f continuous_integration/environment-$PYTHON_VERSION.yml source activate test_env python setup.py build_ext --inplace From af762714755a813b3c2a6c7caf557184600dffb1 Mon Sep 17 00:00:00 2001 From: Zachary Sherman Date: Mon, 25 Sep 2017 10:16:26 -0500 Subject: [PATCH 09/12] ENH: Added pythons 2.7 and 3.5 to be tested also. --- .travis.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.travis.yml b/.travis.yml index d4401d7..00e1e0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,18 @@ sudo: false # Use container-based infrastructure. language: python +matrix: + include: + - python: 2.7 + env: + - PYTHON_VERSION="2.7" + - python: 3.5 + env: + - PYTHON_VERSION="3.5" + - python: 3.6 + env: + - PYTHON_VERSION="3.6" + # Create a test environment and install dependencies. install: source continuous_integration/install.sh # Command to run tests. From a07d26e3621201519641630ed2e4447b04698ae6 Mon Sep 17 00:00:00 2001 From: Zachary Sherman Date: Mon, 25 Sep 2017 10:17:04 -0500 Subject: [PATCH 10/12] ADD: Adding test environment for python 2.7. --- continuous_integration/environment-2.7.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 continuous_integration/environment-2.7.yml diff --git a/continuous_integration/environment-2.7.yml b/continuous_integration/environment-2.7.yml new file mode 100644 index 0000000..8f27bb8 --- /dev/null +++ b/continuous_integration/environment-2.7.yml @@ -0,0 +1,11 @@ +name: test_env +channels: + - conda-forge + - defaults +dependencies: + - python=2.7 + - arm_pyart + - pytest + - numpy + - pandas + - scipy From ab62f2616bed685d0d16098dcff5d9d539babd86 Mon Sep 17 00:00:00 2001 From: Zachary Sherman Date: Mon, 25 Sep 2017 10:17:50 -0500 Subject: [PATCH 11/12] ADD: Adding test environment for python 3.5. --- continuous_integration/environment-3.5.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 continuous_integration/environment-3.5.yml diff --git a/continuous_integration/environment-3.5.yml b/continuous_integration/environment-3.5.yml new file mode 100644 index 0000000..015d1c5 --- /dev/null +++ b/continuous_integration/environment-3.5.yml @@ -0,0 +1,11 @@ +name: test_env +channels: + - conda-forge + - defaults +dependencies: + - python=3.5 + - arm_pyart + - pytest + - numpy + - pandas + - scipy From 488e8a9140f34de22142c9431f84a864cb4efa8f Mon Sep 17 00:00:00 2001 From: Zachary Sherman Date: Mon, 25 Sep 2017 10:18:16 -0500 Subject: [PATCH 12/12] ADD: Adding test environment for python 3.6. --- continuous_integration/environment-3.6.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 continuous_integration/environment-3.6.yml diff --git a/continuous_integration/environment-3.6.yml b/continuous_integration/environment-3.6.yml new file mode 100644 index 0000000..facf92c --- /dev/null +++ b/continuous_integration/environment-3.6.yml @@ -0,0 +1,11 @@ +name: test_env +channels: + - conda-forge + - defaults +dependencies: + - python=3.6 + - arm_pyart + - pytest + - numpy + - pandas + - scipy