From 16d2fe8cc3e268b10dab1c96d09509e977af85a2 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Wed, 31 May 2017 11:42:06 +0200 Subject: [PATCH 1/4] DOC: change doc build to python 3.6 --- .travis.yml | 4 ++-- ci/{requirements-3.5_DOC.build => requirements-3.6_DOC.build} | 2 +- ci/{requirements-3.5_DOC.run => requirements-3.6_DOC.run} | 0 ci/{requirements-3.5_DOC.sh => requirements-3.6_DOC.sh} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename ci/{requirements-3.5_DOC.build => requirements-3.6_DOC.build} (73%) rename ci/{requirements-3.5_DOC.run => requirements-3.6_DOC.run} (100%) rename ci/{requirements-3.5_DOC.sh => requirements-3.6_DOC.sh} (100%) diff --git a/.travis.yml b/.travis.yml index 8b6700e11d2c5..a3103ec5d1bbb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,7 +74,7 @@ matrix: # In allow_failures - os: linux env: - - JOB="3.5_DOC" DOC=true + - JOB="3.6_DOC" DOC=true allow_failures: - os: linux env: @@ -87,7 +87,7 @@ matrix: - JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" - os: linux env: - - JOB="3.5_DOC" DOC=true + - JOB="3.6_DOC" DOC=true before_install: - echo "before_install" diff --git a/ci/requirements-3.5_DOC.build b/ci/requirements-3.6_DOC.build similarity index 73% rename from ci/requirements-3.5_DOC.build rename to ci/requirements-3.6_DOC.build index 73aeb3192242f..bdcfe28105866 100644 --- a/ci/requirements-3.5_DOC.build +++ b/ci/requirements-3.6_DOC.build @@ -1,4 +1,4 @@ -python=3.5* +python=3.6* python-dateutil pytz numpy diff --git a/ci/requirements-3.5_DOC.run b/ci/requirements-3.6_DOC.run similarity index 100% rename from ci/requirements-3.5_DOC.run rename to ci/requirements-3.6_DOC.run diff --git a/ci/requirements-3.5_DOC.sh b/ci/requirements-3.6_DOC.sh similarity index 100% rename from ci/requirements-3.5_DOC.sh rename to ci/requirements-3.6_DOC.sh From 11abbd766f1cb2b712e1f3c68a9e4ac45b92bad8 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Wed, 31 May 2017 13:14:05 +0200 Subject: [PATCH 2/4] Remove pinning of pyqt to 4.x --- ci/requirements-3.6_DOC.run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements-3.6_DOC.run b/ci/requirements-3.6_DOC.run index 9647ab53ab835..2f9b11839d000 100644 --- a/ci/requirements-3.6_DOC.run +++ b/ci/requirements-3.6_DOC.run @@ -21,4 +21,4 @@ numexpr bottleneck statsmodels xarray -pyqt=4.11.4 +pyqt From 655d22d799ee9c2d7dc18b752308161fdb2e3cdf Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Wed, 31 May 2017 14:03:28 +0200 Subject: [PATCH 3/4] Remove pinning of openpyxl --- ci/requirements-3.6_DOC.run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements-3.6_DOC.run b/ci/requirements-3.6_DOC.run index 2f9b11839d000..df8087f62ef16 100644 --- a/ci/requirements-3.6_DOC.run +++ b/ci/requirements-3.6_DOC.run @@ -12,7 +12,7 @@ lxml beautifulsoup4 html5lib pytables -openpyxl=1.8.5 +openpyxl xlrd xlwt xlsxwriter From 5ef0b8079f481fe1dc90cd257b647819ba7a537c Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Thu, 1 Jun 2017 22:14:02 +0200 Subject: [PATCH 4/4] Add xsel to doc build for clipboard --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index a3103ec5d1bbb..5dc4256a268ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,6 +75,10 @@ matrix: - os: linux env: - JOB="3.6_DOC" DOC=true + addons: + apt: + packages: + - xsel allow_failures: - os: linux env: