From 028494a5563ec5d07448ff06c4156565deae4223 Mon Sep 17 00:00:00 2001 From: Brigitta Sipocz Date: Thu, 17 Dec 2015 22:58:49 +0100 Subject: [PATCH 1/4] Adding tests against LTS astropy --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 96923bcf5a..e2d2ab059f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,11 +45,15 @@ matrix: - python: 2.7 env: SETUP_CMD='build_sphinx -w' - # Try Astropy development version + # Try Astropy development and LTS version - python: 2.7 env: ASTROPY_VERSION=development SETUP_CMD='test' - python: 3.4 env: ASTROPY_VERSION=development SETUP_CMD='test' + - python: 2.7 + env: ASTROPY_VERSION=lts SETUP_CMD='test' + - python: 3.4 + env: ASTROPY_VERSION=lts SETUP_CMD='test' # Try with optional dependencies disabled - python: 2.7 From df81734669f51f477d666b45e9cef121df182d93 Mon Sep 17 00:00:00 2001 From: Brigitta Sipocz Date: Thu, 17 Dec 2015 23:01:17 +0100 Subject: [PATCH 2/4] Updating default py version to 3.5 and np to 1.10 --- .travis.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e2d2ab059f..643572f1bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ python: - 2.7 - 3.3 - 3.4 + - 3.5 env: global: @@ -23,7 +24,7 @@ env: # overidden underneath. They are defined here in order to save having # to repeat them for all configurations. - MAIN_CMD='python setup.py' - - NUMPY_VERSION=1.9 + - NUMPY_VERSION=1.10 - ASTROPY_VERSION=stable - CONDA_DEPENDENCIES='requests beautiful-soup matplotlib html5lib' - PIP_DEPENDENCIES='keyring aplpy pyregion' @@ -48,11 +49,11 @@ matrix: # Try Astropy development and LTS version - python: 2.7 env: ASTROPY_VERSION=development SETUP_CMD='test' - - python: 3.4 + - python: 3.5 env: ASTROPY_VERSION=development SETUP_CMD='test' - python: 2.7 env: ASTROPY_VERSION=lts SETUP_CMD='test' - - python: 3.4 + - python: 3.5 env: ASTROPY_VERSION=lts SETUP_CMD='test' # Try with optional dependencies disabled @@ -60,12 +61,14 @@ matrix: env: SETUP_CMD='test' CONDA_DEPENDENCIES='requests beautiful-soup html5lib' PIP_DEPENDENCIES='keyring' - - python: 3.4 + - python: 3.5 env: SETUP_CMD='test' CONDA_DEPENDENCIES='requests beautiful-soup html5lib' PIP_DEPENDENCIES='keyring' # Try older numpy versions + - python: 2.7 + env: NUMPY_VERSION=1.9 SETUP_CMD='test' - python: 2.7 env: NUMPY_VERSION=1.8 SETUP_CMD='test' - python: 2.7 From 26039a6b1babbc681745b485e40b6928eab2210e Mon Sep 17 00:00:00 2001 From: Brigitta Sipocz Date: Thu, 17 Dec 2015 23:46:16 +0100 Subject: [PATCH 3/4] Workaroudn for python 3.5 as beautilful-soup is not yet in conda for 3.5 --- .travis.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 643572f1bf..7edb38473a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,6 @@ python: - 2.7 - 3.3 - 3.4 - - 3.5 env: global: @@ -37,6 +36,14 @@ env: matrix: include: + # Test for py 3.5 (move this up to the main matrix once beautiful-soup is in conda) + - python: 3.5 + env: SETUP_CMD='egg_info' + - python: 3.5 + env: SETUP_CMD='test' + CONDA_DEPENDENCIES='requests matplotlib html5lib' + PIP_DEPENDENCIES='keyring aplpy pyregion beautifulsoup4' + # Do a coverage test in Python 2. - python: 2.7 env: SETUP_CMD='test --coverage' @@ -51,10 +58,14 @@ matrix: env: ASTROPY_VERSION=development SETUP_CMD='test' - python: 3.5 env: ASTROPY_VERSION=development SETUP_CMD='test' + CONDA_DEPENDENCIES='requests matplotlib html5lib' + PIP_DEPENDENCIES='keyring aplpy pyregion beautifulsoup4' - python: 2.7 env: ASTROPY_VERSION=lts SETUP_CMD='test' - python: 3.5 env: ASTROPY_VERSION=lts SETUP_CMD='test' + CONDA_DEPENDENCIES='requests matplotlib html5lib' + PIP_DEPENDENCIES='keyring aplpy pyregion beautifulsoup4' # Try with optional dependencies disabled - python: 2.7 @@ -63,8 +74,8 @@ matrix: PIP_DEPENDENCIES='keyring' - python: 3.5 env: SETUP_CMD='test' - CONDA_DEPENDENCIES='requests beautiful-soup html5lib' - PIP_DEPENDENCIES='keyring' + CONDA_DEPENDENCIES='requests html5lib' + PIP_DEPENDENCIES='keyring beautifulsoup4' # Try older numpy versions - python: 2.7 From 00d5488dc98732bb3c6532766d539380cd805eb1 Mon Sep 17 00:00:00 2001 From: Brigitta Sipocz Date: Thu, 17 Dec 2015 23:49:42 +0100 Subject: [PATCH 4/4] Workaround for python 3.3 as np 1.10 is not available for it in conda, and it's not in astropy-ci-extras, either --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7edb38473a..0b1de54be4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ addons: python: - 2.7 - - 3.3 - 3.4 env: @@ -53,6 +52,13 @@ matrix: - python: 2.7 env: SETUP_CMD='build_sphinx -w' + # Python 3.3 doesn't have numpy 1.10 in conda, revoke this commit once + # it's available in the astropy-ci-extras channel + - python: 3.3 + env: SETUP_CMD='egg_info' + - python: 3.3 + env: SETUP_CMD='test' NUMPY_VERSION=1.9 + # Try Astropy development and LTS version - python: 2.7 env: ASTROPY_VERSION=development SETUP_CMD='test'