From 8e0195c9b02cfdc5162f7622b008c17454ae42d4 Mon Sep 17 00:00:00 2001 From: Brigitta Sipocz Date: Fri, 15 Apr 2016 14:21:09 +0100 Subject: [PATCH 1/5] Limiting setuptools version --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7679ed3c..1d2e3061 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,8 @@ env: matrix: include: + - os: linux + env: PYTHON_VERSION=2.7 SETUPTOOLS_VERSION='<20' DEBUG=True - os: linux env: PYTHON_VERSION=2.7 SETUPTOOLS_VERSION=dev CONDA_DEPENDENCIES="pytest sphinx cython numpy mercurial mock" From 4d7c2fbeaacb92593b7a241c62b161f2ec57fbf9 Mon Sep 17 00:00:00 2001 From: Brigitta Sipocz Date: Fri, 15 Apr 2016 14:49:27 +0100 Subject: [PATCH 2/5] Limit sphinx version due to #224 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1d2e3061..831b0c34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ env: - PYTHON_VERSION=3.5 global: - SETUPTOOLS_VERSION=stable + - SPHINX_VERSION='<1.4' - CONDA_DEPENDENCIES="pytest sphinx cython numpy" - PIP_DEPENDENCIES="coveralls pytest-cov" From 0bea5c796108d5da9cd38245693c27e5ef328f73 Mon Sep 17 00:00:00 2001 From: Brigitta Sipocz Date: Fri, 15 Apr 2016 14:47:10 +0100 Subject: [PATCH 3/5] Dev setuptools moved to github from bitbucket --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 831b0c34..1692b8eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ env: global: - SETUPTOOLS_VERSION=stable - SPHINX_VERSION='<1.4' - - CONDA_DEPENDENCIES="pytest sphinx cython numpy" + - CONDA_DEPENDENCIES="setuptools pytest sphinx cython numpy" - PIP_DEPENDENCIES="coveralls pytest-cov" matrix: @@ -25,8 +25,8 @@ matrix: - os: linux env: PYTHON_VERSION=2.7 SETUPTOOLS_VERSION='<20' DEBUG=True - os: linux - env: PYTHON_VERSION=2.7 SETUPTOOLS_VERSION=dev - CONDA_DEPENDENCIES="pytest sphinx cython numpy mercurial mock" + env: PYTHON_VERSION=2.7 SETUPTOOLS_VERSION=dev DEBUG=True + CONDA_DEPENDENCIES='pytest sphinx cython numpy' before_install: @@ -42,7 +42,7 @@ install: # pip tries to remove the previous version of setuptools before the # installation is complete, which causes issues. Instead, we just install # setuptools manually. - - if [[ $SETUPTOOLS_VERSION == dev ]]; then hg clone https://bitbucket.org/pypa/setuptools; cd setuptools; python setup.py install; cd ..; fi + - if [[ $SETUPTOOLS_VERSION == dev ]]; then git clone http://github.com/pypa/setuptools.git; cd setuptools; python setup.py install; cd ..; fi before_script: # Some of the tests use git commands that require a user to be configured From a3fc47e89bf6d010c1fbf9d4bb814824778848a5 Mon Sep 17 00:00:00 2001 From: Brigitta Sipocz Date: Fri, 15 Apr 2016 15:40:02 +0100 Subject: [PATCH 4/5] Limiting the setuptools version for all builds --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1692b8eb..11c8bd37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,15 +15,13 @@ env: - PYTHON_VERSION=3.4 - PYTHON_VERSION=3.5 global: - - SETUPTOOLS_VERSION=stable + - SETUPTOOLS_VERSION='<20' - SPHINX_VERSION='<1.4' - CONDA_DEPENDENCIES="setuptools pytest sphinx cython numpy" - PIP_DEPENDENCIES="coveralls pytest-cov" matrix: include: - - os: linux - env: PYTHON_VERSION=2.7 SETUPTOOLS_VERSION='<20' DEBUG=True - os: linux env: PYTHON_VERSION=2.7 SETUPTOOLS_VERSION=dev DEBUG=True CONDA_DEPENDENCIES='pytest sphinx cython numpy' From 8324648af2fd26e7988f66a6a75e4747097a39f0 Mon Sep 17 00:00:00 2001 From: Brigitta Sipocz Date: Fri, 15 Apr 2016 15:44:48 +0100 Subject: [PATCH 5/5] Adding setuptools stable and dev builds to the allowed failures until #222 is fixed --- .travis.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.travis.yml b/.travis.yml index 11c8bd37..85982189 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,23 @@ env: matrix: include: + - os: linux + env: PYTHON_VERSION=2.7 SPHINX_VERSION=1.4 + - os: linux + env: PYTHON_VERSION=2.7 SETUPTOOLS_VERSION=20 + - os: linux + env: PYTHON_VERSION=2.7 SETUPTOOLS_VERSION=dev DEBUG=True + CONDA_DEPENDENCIES='pytest sphinx cython numpy' + + allow_failures: + # Remove this once https://github.com/astropy/astropy-helpers/issues/224 + # is solved and remove the version limitation + - os: linux + env: PYTHON_VERSION=2.7 SPHINX_VERSION=1.4 + # Remove these once https://github.com/astropy/astropy-helpers/issues/222 + # is solved, and set back the default version to 'stable' + - os: linux + env: PYTHON_VERSION=2.7 SETUPTOOLS_VERSION=20 - os: linux env: PYTHON_VERSION=2.7 SETUPTOOLS_VERSION=dev DEBUG=True CONDA_DEPENDENCIES='pytest sphinx cython numpy'