From da3da0bc29c876179e9c3a5bb7f26b7f2d5f6e03 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 14 Sep 2015 21:35:43 -0500 Subject: [PATCH 01/10] Add api docs and gallery on Windows build and build docs on Appveyor --- appveyor.yml | 4 ++++ doc/make.bat | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 95ac4994..439930fe 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -61,6 +61,10 @@ test_script: # Run unit tests with nose - "python -c \"import nose; nose.main()\" -v -s skimage" + # Build the docs + - pip install sphinx + - cd doc && make + artifacts: # Archive the generated wheel package in the ci.appveyor.com build report. - path: dist\* diff --git a/doc/make.bat b/doc/make.bat index a59efe01..68cf7efc 100644 --- a/doc/make.bat +++ b/doc/make.bat @@ -5,6 +5,9 @@ REM Command file for Sphinx documentation if "%SPHINXBUILD%" == "" ( set SPHINXBUILD=sphinx-build ) +if "%PYTHON%" == "" ( + set PYTHON=python +) set BUILDDIR=_build set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% source if NOT "%PAPER%" == "" ( @@ -41,6 +44,9 @@ if "%1" == "clean" ( ) if "%1" == "html" ( + mkdir source/api + %PYTHON% tools/build_modref_templates.py + cd source && %PYTHON% random_gallery.py %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html echo. echo.Build finished. The HTML pages are in %BUILDDIR%/html. @@ -152,4 +158,4 @@ results in %BUILDDIR%/doctest/output.txt. goto end ) -:end \ No newline at end of file +:end From d2c4ccba59ffc032228566699b04cc1769bd56da Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 15 Sep 2015 07:32:33 -0500 Subject: [PATCH 02/10] Build from the right directory and add api to latex command --- appveyor.yml | 9 ++++----- doc/make.bat | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 439930fe..b0bfc513 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -46,11 +46,14 @@ install: - "pip install --pre --no-index --find-links dist/ scikit-image" - # Not a .NET project, we build scikit-image in the install step instead build: false test_script: + # Build the docs + - pip install sphinx + - cd doc && make + # Change to a non-source folder to make sure we run the tests on the # installed library. - "cd C:\\" @@ -61,10 +64,6 @@ test_script: # Run unit tests with nose - "python -c \"import nose; nose.main()\" -v -s skimage" - # Build the docs - - pip install sphinx - - cd doc && make - artifacts: # Archive the generated wheel package in the ci.appveyor.com build report. - path: dist\* diff --git a/doc/make.bat b/doc/make.bat index 68cf7efc..e7c61181 100644 --- a/doc/make.bat +++ b/doc/make.bat @@ -115,6 +115,8 @@ if "%1" == "epub" ( ) if "%1" == "latex" ( + mkdir source/api + %PYTHON% tools/build_modref_templates.py %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex echo. echo.Build finished; the LaTeX files are in %BUILDDIR%/latex. From 634737ca22eb37e8cfd4fe27ed135547432590cf Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 15 Sep 2015 07:58:25 -0500 Subject: [PATCH 03/10] Add the make target --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index b0bfc513..655d4ec8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -52,7 +52,7 @@ build: false test_script: # Build the docs - pip install sphinx - - cd doc && make + - cd doc && make html # Change to a non-source folder to make sure we run the tests on the # installed library. From f20e2c3c1a96009d37b13f1cb1ef8df8511787b8 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 15 Sep 2015 08:45:03 -0500 Subject: [PATCH 04/10] Fix PYTHON executable and html script --- appveyor.yml | 2 +- doc/make.bat | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 655d4ec8..6f9f9170 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -52,7 +52,7 @@ build: false test_script: # Build the docs - pip install sphinx - - cd doc && make html + - SET PYTHON=%PYTHON%\\python.exe && cd doc && make html # Change to a non-source folder to make sure we run the tests on the # installed library. diff --git a/doc/make.bat b/doc/make.bat index e7c61181..b37f82fa 100644 --- a/doc/make.bat +++ b/doc/make.bat @@ -47,6 +47,7 @@ if "%1" == "html" ( mkdir source/api %PYTHON% tools/build_modref_templates.py cd source && %PYTHON% random_gallery.py + cd .. %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html echo. echo.Build finished. The HTML pages are in %BUILDDIR%/html. From b9101202fbf381acb17af9306b34d017611df4b3 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 16 Sep 2015 08:02:15 -0500 Subject: [PATCH 05/10] Add a 64bit python 3.4 build --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 6f9f9170..c47608b8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,9 +22,9 @@ environment: # PYTHON_VERSION: "3.4.2" # PYTHON_ARCH: "32" - #- PYTHON: "C:\\Python24_64" - # PYTHON_VERSION: "3.4.2" - # PYTHON_ARCH: "64" + - PYTHON: "C:\\Python34_64" + PYTHON_VERSION: "3.4.2" + PYTHON_ARCH: "64" install: # Install Python (from the official .msi of http://python.org) and pip when From d8e4774d8fff9ae237f2aa21917da56c228a5059 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 16 Sep 2015 08:20:42 -0500 Subject: [PATCH 06/10] Use the latest pip on appveyor --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index c47608b8..24114b3a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -37,6 +37,7 @@ install: - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" # Install the build and runtime dependencies of the project. + - "%CMD_IN_ENV pip install -U pip" - "%CMD_IN_ENV% pip install -v --trusted-host 28daf2247a33ed269873-7b1aad3fab3cc330e1fd9d109892382a.r6.cf2.rackcdn.com %WHEELHOUSE% -r tools/appveyor/requirements.txt" - "%CMD_IN_ENV% pip install -v -r requirements.txt" - "%CMD_IN_ENV% python setup.py bdist_wheel bdist_wininst" From 30af111e42c4cf73cb990f1d4ac5d86395ebe9e0 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 16 Sep 2015 09:00:32 -0500 Subject: [PATCH 07/10] Fix pip upgrade --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 24114b3a..294d37bb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -37,7 +37,7 @@ install: - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" # Install the build and runtime dependencies of the project. - - "%CMD_IN_ENV pip install -U pip" + - "%CMD_IN_ENV% pip install -U pip" - "%CMD_IN_ENV% pip install -v --trusted-host 28daf2247a33ed269873-7b1aad3fab3cc330e1fd9d109892382a.r6.cf2.rackcdn.com %WHEELHOUSE% -r tools/appveyor/requirements.txt" - "%CMD_IN_ENV% pip install -v -r requirements.txt" - "%CMD_IN_ENV% python setup.py bdist_wheel bdist_wininst" From 5f729fa03a5c5f5da4084edaa0e6cefb374a4701 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 16 Sep 2015 09:29:18 -0500 Subject: [PATCH 08/10] Try a 64bit 2.7 build --- appveyor.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 294d37bb..25a3246a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,17 +14,17 @@ environment: PYTHON_ARCH: "32" # disable other builds until they can be run in parallel - #- PYTHON: "C:\\Python27_64" - # PYTHON_VERSION: "2.7" - # PYTHON_ARCH: "64" + - PYTHON: "C:\\Python27_64" + PYTHON_VERSION: "2.7" + PYTHON_ARCH: "64" #- PYTHON: "C:\\Python34_32" # PYTHON_VERSION: "3.4.2" # PYTHON_ARCH: "32" - - PYTHON: "C:\\Python34_64" - PYTHON_VERSION: "3.4.2" - PYTHON_ARCH: "64" + #- PYTHON: "C:\\Python34_64" + # PYTHON_VERSION: "3.4.2" + # PYTHON_ARCH: "64" install: # Install Python (from the official .msi of http://python.org) and pip when @@ -37,7 +37,6 @@ install: - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" # Install the build and runtime dependencies of the project. - - "%CMD_IN_ENV% pip install -U pip" - "%CMD_IN_ENV% pip install -v --trusted-host 28daf2247a33ed269873-7b1aad3fab3cc330e1fd9d109892382a.r6.cf2.rackcdn.com %WHEELHOUSE% -r tools/appveyor/requirements.txt" - "%CMD_IN_ENV% pip install -v -r requirements.txt" - "%CMD_IN_ENV% python setup.py bdist_wheel bdist_wininst" From ade828636a074a74f835732e1aa512e24cd8dea6 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 16 Sep 2015 09:30:12 -0500 Subject: [PATCH 09/10] Fix yml format --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 25a3246a..a1fd2571 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,9 +14,9 @@ environment: PYTHON_ARCH: "32" # disable other builds until they can be run in parallel - - PYTHON: "C:\\Python27_64" - PYTHON_VERSION: "2.7" - PYTHON_ARCH: "64" + - PYTHON: "C:\\Python27_64" + PYTHON_VERSION: "2.7" + PYTHON_ARCH: "64" #- PYTHON: "C:\\Python34_32" # PYTHON_VERSION: "3.4.2" From f2b15dec473b4d31463d942a5f01f10d97bbb196 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 16 Sep 2015 10:36:05 -0500 Subject: [PATCH 10/10] Revert to single build --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a1fd2571..35fc96b2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,9 +14,9 @@ environment: PYTHON_ARCH: "32" # disable other builds until they can be run in parallel - - PYTHON: "C:\\Python27_64" - PYTHON_VERSION: "2.7" - PYTHON_ARCH: "64" + #- PYTHON: "C:\\Python27_64" + # PYTHON_VERSION: "2.7" + # PYTHON_ARCH: "64" #- PYTHON: "C:\\Python34_32" # PYTHON_VERSION: "3.4.2"