Commit Graph

58 Commits

Author SHA1 Message Date
emmanuelle 8b2dbd56e5 Minor fixes and improvements: PEP8, appearance, etc.
Removed a clumsy workaround (about paths)

Fixed links to image files to fix sphinx warning.

Removed non-ascii character

Another non ascii character

And another non-ascii character... (to be squashed later on)

Corrected some typos in the docstrings of sphinx-gallery files

These corrections have also been submitted as a patch to the original
sphinx-gallery project (#121)

Corrected the appearance of two examples of the gallery

Tweaked CSS for larger images

Added sphinx-gallery's license and a README.txt about the origin of
this directory.

Edited gabor_from_astronaut example for nicer popup

PEP 8 + minor fixes

Removed commented lines of code
2016-06-06 17:30:44 +02:00
emmanuelle d998e7e534 Links to API in examples 2016-05-17 23:21:45 +02:00
emmanuelle 41715501d4 Remove documentation links in examples (they crash) 2016-05-10 22:33:23 +02:00
emmanuelle 2ddf2ef01d Removed spurious import in conf.py 2016-05-10 21:49:15 +02:00
emmanuelle 844858f01b Build gallery with sphinx-gallery
Modified comments in some gallery examples for compatibility with
sphinx-gallery parsing. Also modified some links in the narrative doc
since image file names have changed.
2016-05-10 21:49:15 +02:00
emmanuelle ef9bcfb778 A first pass to let the gallery build using sphinx-gallery. 2016-05-10 21:49:15 +02:00
Vighnesh Birodkar a406e270b1 Improved drawing in plot_rag_draw.py example (#1872)
Improved drawing in draw_rag example; changed draw_rag to show_rag, made it return ScalarMappable to draw colorbars; added magma colormap
2016-04-24 09:28:24 +03:00
Shaun Singh 35b35c5139 Fix broken Sphinx 2016-03-30 17:02:19 -07:00
François Boulogne 811f13c1d6 MAINT: use with to close the file
MAINT: use with to close the file
2015-09-21 22:21:57 -04:00
François Boulogne 341039fec7 DOC: favicon path relative to source/ 2015-09-17 05:22:01 -04:00
François Boulogne b1c1bdf564 DOC: activate favicon in config 2015-09-16 21:42:33 -04:00
John Wiggins 4fe753fd45 Use the current python version for the python intersphinx reference 2015-09-13 12:53:54 +02:00
Josh Warner (Mac) 8d33d3d072 DOC: Fix intersphinx mapping w/fallbacks 2015-08-08 12:29:05 -05:00
Josh Warner (Mac) 60e15373a4 DOC: Link to GitHub source in documentation 2015-08-02 16:41:39 -05:00
Steven Silvester adac822ee9 Fix setup to allow installing from PyPI
≈
Fix setup to allow installing from PyPi
Another attempt at fixing the setuptools problem

Fix pip incantation

Fix typo

Try updating setuptools too

Try upgrading pip and setuptools after venv install

Rule out install_requires as the source of the problem

Try just requiring the ones that can be built from source

Use explicit install_requires and move version checks to after setup runs

Clean up installation for PyPI compatiblity

Dead end commit

Fix travis to match new installation procedure

Put build_versions check after install

Fix travis syntax

Switch to lower-case cython in version check

Another attempt

Another fix

Fix syntax error

Make header executable

Build inplace on py27

Fix finding of source code version in sphinx

Fix travis syntax

Import setuptools after install

Fix the version check in sphinx

Work around setuptools bug in 2.7

Fix handling of Cython requirement and update release notes

Switch to one Appveyor build and update build method

Add cython back to install_requires

Remove debug lines

Another try for appveyor install

Another attempt at setuptools and Appveyor

Do not let intermittent apt-get failures crash the build

Fix typo

Another appveyor attempt

More fixes for setuptools and Appveyor

Yet another setuptools/appveyor attempt

Put requirements.txt back in order

Fix typo

Fix readlines function call

Try not using a venv for python 2.7

Fix syntax

Try the provided venv for py27

Remove --user

Remove debug info

Another try for python27 fix

Try again

Do not use install_requires with numpy/scipy

Try just avoiding scipy

Try removing scipy (numpy was before)

Avoid both scipy and numpy

Fix qt install on 27

Fix qt install on 27 agin

Revert the scripts to their previous condition

Revert file permission changes

Undo changes to requirements.txt
2015-03-29 15:36:11 -05:00
Steven Silvester be7154f23d Skip build on 3.2
Skip doc build on 3.2

Skip doc build on 3.2

Use block literal

Fix html make target

Revert change to threshold_isodata

Fix skimage.novice and thresholding warnings

Fix feature.__init__ __all__

Fix generic.py link

Doc reference fixes

Fix missing class member warnings

Add parallelization to the user guide toc

Remove unused automodule directives

Fix sub_dirs in gallery_index

Remove unused file and fix reference to api/api

Add missing links to user guide

Use pre-output links to images

Recover from Juan's doc 'upgrades'
2015-02-07 16:40:37 -06:00
Johannes Schönberger 5e67572ac7 Do not set paper size to allow manual setting through make 2013-03-13 12:16:58 +01:00
Johannes Schönberger 1d9fb145f6 Avoid duplicate python module index 2013-03-13 12:09:39 +01:00
Johannes Schönberger d68515f0d8 Copy some useful latex settings from NumPy 2013-03-13 12:03:44 +01:00
Johannes Schönberger 3f31b48fe1 Use plot_directive from matplotlib.sphinxext if available 2013-03-13 11:10:03 +01:00
Johannes Schönberger 97d7f88b04 Explicitly set latex font size and paper size 2013-03-13 11:08:02 +01:00
Johannes Schönberger 16863535eb Re-enable plots in doc strings and generate PDF images for them 2013-03-13 10:59:26 +01:00
Johannes Schönberger a1ad4ca34b Change latex doc settings 2013-03-12 09:39:00 +01:00
Johannes Schönberger b82764583a Increase list-depth for nested quotes etc. 2013-03-12 09:36:33 +01:00
Paul Ivanov b4b090271d complete singularization of scikit-image
I've updated references in the code and documentation to the new name.
2012-10-08 16:29:55 -07:00
Johannes Schönberger d690212d1c Rename scikits-image to scikit-image 2012-10-02 19:02:37 +02:00
Johannes Schönberger 127907f5bf Add new doc theme 2012-10-02 18:46:54 +02:00
Tony S Yu 12c35908c9 DOC: Separate config sections in conf.py 2012-09-02 12:32:14 -04:00
Tony S Yu bd0d47a183 DOC: Turn off numpydoc flag to silence warnings 2012-09-02 12:23:17 -04:00
Stefan van der Walt ecd4fb714a DOC: Add intersphinx so we can refer to numpy, scipy, sklearn docs. 2012-08-24 05:26:03 -07:00
Tony S Yu ca25314310 Remove gen_rst 2012-05-15 22:47:30 -04:00
Tony S Yu db2f7dde6b DOC: Set rcparams for better default plots. 2012-05-15 22:45:06 -04:00
Tony S Yu 5a89ef61a6 DOC: Replace use of gen_rst with plot2rst extension. 2012-05-15 00:52:30 -04:00
Tony S Yu 01d86e3317 DOC: Remove Sphinx extension for inheritence trees. 2012-05-09 18:56:46 -04:00
Stefan van der Walt 18b76a661d DOC: Link logo to main webpage. Add navigation side bar. 2012-02-08 13:02:41 -08:00
Tony S Yu 7cc84b5688 DOC: Add sidebar section listing package versions. 2012-02-07 21:32:43 -05:00
Stefan van der Walt 8bd4637fc0 DOC: Fix team name in license and docs. 2011-11-30 17:52:35 -08:00
Nelle Varoquaux 1704ab31a9 skimage/version.py should be ignored. Doc has been updated with new module
name ``sklearn``
2011-10-18 21:14:21 +02:00
emmanuelle 6d67bba941 Renaming: scikits.image -> skimage 2011-10-18 21:12:27 +02:00
Stefan van der Walt f3b8aec67f Merge pull request #24 from tonysyu/doc_tweaks
DOC: Clean up build and restyle tables.
2011-09-24 14:52:56 -07:00
Tony S Yu 92eec1242b DOC: fix copyright 2011-09-24 00:23:43 -04:00
Tony S Yu 70b39b8090 DOC: make index.html the master doc
The scikits.image logo links to the master doc, which was previously set to contents.html (essentially blank). Use index.html instead.
2011-09-24 00:15:15 -04:00
Emmanuelle Gouillart cce3d7bcc5 Example generation from scripts, taken from scikit learn
(ext/gen_rst.py)
2011-09-23 23:53:47 +02:00
Stefan van der Walt 0fd5330c18 Add logo to generated documentation. 2011-09-16 23:13:56 -07:00
Tony S Yu cba0ec6484 Remove index.html template and use markup in index.txt instead.
Using reStructuredText to build the front page is a bit easier to maintain.
2011-07-18 01:08:24 -04:00
Stefan van der Walt 16e5456def DOC: Retheme docs, credit IPython authors. 2011-07-16 18:02:20 -05:00
Stefan van der Walt c2b948b6e0 DOC: Setup plot_directive. 2011-07-16 11:10:10 -05:00
Stefan van der Walt ec70fdad48 docs: Add project title to header. 2009-12-03 09:56:12 +02:00
Stefan van der Walt a47a60f8ae Clean up output of plotting directive:
- Do not generate PDFs.
 - Do not copy image to plots dir (Sphinx copies to _images already).
2009-10-14 08:51:25 +02:00
Stefan van der Walt d9c206b625 Set plot directory prefix. 2009-10-14 07:08:13 +02:00