From 17f57bb066589722d16e827fdd7ebf77e8c7c351 Mon Sep 17 00:00:00 2001 From: Robert David Grant Date: Mon, 28 Sep 2015 18:27:31 -0500 Subject: [PATCH 1/4] Fix naming in branding directory. --- .../{DistArray Logo.svg => DistArray-LOGO.svg} | 0 .../logos/{png's => pngs}/DistArray-LOGO-large.png | Bin .../logos/{png's => pngs}/DistArray-LOGO-mid.png | Bin .../logos/{png's => pngs}/DistArray-LOGO-small.png | Bin .../{png's => pngs}/DistArray-LOGO-smallest.png | Bin 5 files changed, 0 insertions(+), 0 deletions(-) rename branding/logos/{DistArray Logo.svg => DistArray-LOGO.svg} (100%) rename branding/logos/{png's => pngs}/DistArray-LOGO-large.png (100%) rename branding/logos/{png's => pngs}/DistArray-LOGO-mid.png (100%) rename branding/logos/{png's => pngs}/DistArray-LOGO-small.png (100%) rename branding/logos/{png's => pngs}/DistArray-LOGO-smallest.png (100%) diff --git a/branding/logos/DistArray Logo.svg b/branding/logos/DistArray-LOGO.svg similarity index 100% rename from branding/logos/DistArray Logo.svg rename to branding/logos/DistArray-LOGO.svg diff --git a/branding/logos/png's/DistArray-LOGO-large.png b/branding/logos/pngs/DistArray-LOGO-large.png similarity index 100% rename from branding/logos/png's/DistArray-LOGO-large.png rename to branding/logos/pngs/DistArray-LOGO-large.png diff --git a/branding/logos/png's/DistArray-LOGO-mid.png b/branding/logos/pngs/DistArray-LOGO-mid.png similarity index 100% rename from branding/logos/png's/DistArray-LOGO-mid.png rename to branding/logos/pngs/DistArray-LOGO-mid.png diff --git a/branding/logos/png's/DistArray-LOGO-small.png b/branding/logos/pngs/DistArray-LOGO-small.png similarity index 100% rename from branding/logos/png's/DistArray-LOGO-small.png rename to branding/logos/pngs/DistArray-LOGO-small.png diff --git a/branding/logos/png's/DistArray-LOGO-smallest.png b/branding/logos/pngs/DistArray-LOGO-smallest.png similarity index 100% rename from branding/logos/png's/DistArray-LOGO-smallest.png rename to branding/logos/pngs/DistArray-LOGO-smallest.png From bfe90509a90b8880d844af56a361a69ac88a180d Mon Sep 17 00:00:00 2001 From: Robert David Grant Date: Mon, 28 Sep 2015 18:27:58 -0500 Subject: [PATCH 2/4] Remove sphinxcontrib-napoleons from requirements It isn't needed with Sphinx 1.3. --- docs/sphinx/requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/sphinx/requirements.txt b/docs/sphinx/requirements.txt index ff7ab812..a79e07cc 100644 --- a/docs/sphinx/requirements.txt +++ b/docs/sphinx/requirements.txt @@ -1,4 +1,3 @@ mock sphinx -sphinxcontrib-napoleon sphinxcontrib-programoutput From e2f3dc11502cdf49ed08a56b093b8dae0129e0e4 Mon Sep 17 00:00:00 2001 From: Robert David Grant Date: Mon, 28 Sep 2015 18:28:47 -0500 Subject: [PATCH 3/4] Fix path to logo in conf.py. --- docs/sphinx/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sphinx/source/conf.py b/docs/sphinx/source/conf.py index 57040aac..e643518d 100644 --- a/docs/sphinx/source/conf.py +++ b/docs/sphinx/source/conf.py @@ -137,7 +137,7 @@ # The name of an image file (relative to this directory) to place at the top # of the sidebar. -html_logo = "../../../docs/www/output/images/distarray-logo.png" +html_logo = "../../../branding/logos/pngs/DistArray-LOGO-smallest.png" # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 From 57701d8b5435f7b2f73d08ad590581f8d62f7194 Mon Sep 17 00:00:00 2001 From: Robert David Grant Date: Mon, 28 Sep 2015 18:29:02 -0500 Subject: [PATCH 4/4] Add viewcode to extensions, for fun. --- docs/sphinx/source/conf.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/sphinx/source/conf.py b/docs/sphinx/source/conf.py index e643518d..a58253f4 100644 --- a/docs/sphinx/source/conf.py +++ b/docs/sphinx/source/conf.py @@ -50,8 +50,11 @@ # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.autodoc', 'sphinx.ext.mathjax', - 'sphinx.ext.autosummary', 'sphinx.ext.napoleon', +extensions = ['sphinx.ext.autodoc', + 'sphinx.ext.mathjax', + 'sphinx.ext.autosummary', + 'sphinx.ext.napoleon', + 'sphinx.ext.viewcode', 'sphinxcontrib.programoutput'] # Add any paths that contain templates here, relative to this directory.