Merge pull request #99 from hakonanes/fix-rtd-build

Move doc source one directory up
pyxem · Dec 21, 2019 · 61208a2 · 61208a2
2 parents bb26a8b + 6a2837c
commit 61208a2
Show file tree

Hide file tree

Showing 43 changed files with 3 additions and 2 deletions.
diff --git a/doc/Makefile b/doc/Makefile
@@ -5,7 +5,7 @@
 # from the environment for the first two.
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
-SOURCEDIR     = source
+SOURCEDIR     = .
 BUILDDIR      = build
 
 # Put it first so that "make" without argument is like "make help".

diff --git a/...image/background_correction/adapthist.jpg → ...image/background_correction/adapthist.jpg b/...image/background_correction/adapthist.jpg → ...image/background_correction/adapthist.jpg
diff --git a/...kground_correction/dynamic_correction.jpg → ...kground_correction/dynamic_correction.jpg b/...kground_correction/dynamic_correction.jpg → ...kground_correction/dynamic_correction.jpg
diff --git a/...ckground_correction/pattern_adapthist.jpg → ...ckground_correction/pattern_adapthist.jpg b/...ckground_correction/pattern_adapthist.jpg → ...ckground_correction/pattern_adapthist.jpg
diff --git a/...d_correction/pattern_adapthist_uint16.jpg → ...d_correction/pattern_adapthist_uint16.jpg b/...d_correction/pattern_adapthist_uint16.jpg → ...d_correction/pattern_adapthist_uint16.jpg
diff --git a/...ion/pattern_adapthist_uint16_rescaled.jpg → ...ion/pattern_adapthist_uint16_rescaled.jpg b/...ion/pattern_adapthist_uint16_rescaled.jpg → ...ion/pattern_adapthist_uint16_rescaled.jpg
diff --git a/...background_correction/pattern_dynamic.jpg → ...background_correction/pattern_dynamic.jpg b/...background_correction/pattern_dynamic.jpg → ...background_correction/pattern_dynamic.jpg
diff --git a/...age/background_correction/pattern_raw.jpg → ...age/background_correction/pattern_raw.jpg b/...age/background_correction/pattern_raw.jpg → ...age/background_correction/pattern_raw.jpg
diff --git a/.../background_correction/pattern_static.jpg → .../background_correction/pattern_static.jpg b/.../background_correction/pattern_static.jpg → .../background_correction/pattern_static.jpg
diff --git a/...ckground_correction/static_correction.jpg → ...ckground_correction/static_correction.jpg b/...ckground_correction/static_correction.jpg → ...ckground_correction/static_correction.jpg
diff --git a/...scan_pattern_size/change_pattern_size.jpg → ...scan_pattern_size/change_pattern_size.jpg b/...scan_pattern_size/change_pattern_size.jpg → ...scan_pattern_size/change_pattern_size.jpg
diff --git a/...nge_scan_pattern_size/pattern_cropped.jpg → ...nge_scan_pattern_size/pattern_cropped.jpg b/...nge_scan_pattern_size/pattern_cropped.jpg → ...nge_scan_pattern_size/pattern_cropped.jpg
diff --git a/...ource/_static/image/concatenate_images.sh → doc/_static/image/concatenate_images.sh b/...ource/_static/image/concatenate_images.sh → doc/_static/image/concatenate_images.sh
diff --git a/.../virtual_backscatter_electron_imaging.gif → .../virtual_backscatter_electron_imaging.gif b/.../virtual_backscatter_electron_imaging.gif → .../virtual_backscatter_electron_imaging.gif
diff --git a/.../visualizing_patterns/orientation_map.jpg → .../visualizing_patterns/orientation_map.jpg b/.../visualizing_patterns/orientation_map.jpg → .../visualizing_patterns/orientation_map.jpg
diff --git a/...ng_patterns/orientation_map_navigator.jpg → ...ng_patterns/orientation_map_navigator.jpg b/...ng_patterns/orientation_map_navigator.jpg → ...ng_patterns/orientation_map_navigator.jpg
diff --git a/...g_patterns/orientation_similarity_map.png → ...g_patterns/orientation_similarity_map.png b/...g_patterns/orientation_similarity_map.png → ...g_patterns/orientation_similarity_map.png
diff --git a/.../orientation_similarity_map_navigator.jpg → .../orientation_similarity_map_navigator.jpg b/.../orientation_similarity_map_navigator.jpg → .../orientation_similarity_map_navigator.jpg
diff --git a/...ic/image/visualizing_patterns/pattern.jpg → ...ic/image/visualizing_patterns/pattern.jpg b/...ic/image/visualizing_patterns/pattern.jpg → ...ic/image/visualizing_patterns/pattern.jpg
diff --git a/...mage/visualizing_patterns/pattern_roi.jpg → ...mage/visualizing_patterns/pattern_roi.jpg b/...mage/visualizing_patterns/pattern_roi.jpg → ...mage/visualizing_patterns/pattern_roi.jpg
diff --git a/...ualizing_patterns/plot_multiple_scans.gif → ...ualizing_patterns/plot_multiple_scans.gif b/...ualizing_patterns/plot_multiple_scans.gif → ...ualizing_patterns/plot_multiple_scans.gif
diff --git a/...sualizing_patterns/roi_vbse_navigator.jpg → ...sualizing_patterns/roi_vbse_navigator.jpg b/...sualizing_patterns/roi_vbse_navigator.jpg → ...sualizing_patterns/roi_vbse_navigator.jpg
diff --git a/...isualizing_patterns/simulated_pattern.jpg → ...isualizing_patterns/simulated_pattern.jpg b/...isualizing_patterns/simulated_pattern.jpg → ...isualizing_patterns/simulated_pattern.jpg
diff --git a/...sualizing_patterns/standard_navigator.jpg → ...sualizing_patterns/standard_navigator.jpg b/...sualizing_patterns/standard_navigator.jpg → ...sualizing_patterns/standard_navigator.jpg
diff --git a/...e/visualizing_patterns/vbse_navigator.jpg → ...e/visualizing_patterns/vbse_navigator.jpg b/...e/visualizing_patterns/vbse_navigator.jpg → ...e/visualizing_patterns/vbse_navigator.jpg
diff --git a/...zing_patterns/vbse_navigator_rescaled.jpg → ...zing_patterns/vbse_navigator_rescaled.jpg b/...zing_patterns/vbse_navigator_rescaled.jpg → ...zing_patterns/vbse_navigator_rescaled.jpg
diff --git a/doc/source/_templates/layoutt.html → doc/_templates/layoutt.html b/doc/source/_templates/layoutt.html → doc/_templates/layoutt.html
diff --git a/doc/source/background_correction.rst → doc/background_correction.rst b/doc/source/background_correction.rst → doc/background_correction.rst
diff --git a/doc/source/change_scan_pattern_size.rst → doc/change_scan_pattern_size.rst b/doc/source/change_scan_pattern_size.rst → doc/change_scan_pattern_size.rst
diff --git a/doc/source/changelog.rst → doc/changelog.rst b/doc/source/changelog.rst → doc/changelog.rst
diff --git a/doc/source/cite.rst → doc/cite.rst b/doc/source/cite.rst → doc/cite.rst
diff --git a/doc/source/conf.py → doc/conf.py b/doc/source/conf.py → doc/conf.py
@@ -20,6 +20,8 @@
 author = release.author
 release = release.version
 
+master_doc = 'index'
+
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
@@ -62,7 +64,6 @@
 # relative to this directory. They are copied after the builtin static files, so
 # a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static', ]
-
 pygments_style = 'sphinx'
 
 # Logo

diff --git a/doc/source/develop.rst → doc/develop.rst b/doc/source/develop.rst → doc/develop.rst
diff --git a/doc/source/index.rst → doc/index.rst b/doc/source/index.rst → doc/index.rst
diff --git a/doc/source/install.rst → doc/install.rst b/doc/source/install.rst → doc/install.rst
diff --git a/doc/source/load_save_patterns.rst → doc/load_save_patterns.rst b/doc/source/load_save_patterns.rst → doc/load_save_patterns.rst
diff --git a/doc/source/metadata.rst → doc/metadata.rst b/doc/source/metadata.rst → doc/metadata.rst
diff --git a/doc/source/multivariate_analysis.rst → doc/multivariate_analysis.rst b/doc/source/multivariate_analysis.rst → doc/multivariate_analysis.rst
diff --git a/doc/source/open_datasets.rst → doc/open_datasets.rst b/doc/source/open_datasets.rst → doc/open_datasets.rst
diff --git a/doc/source/reference.rst → doc/reference.rst b/doc/source/reference.rst → doc/reference.rst
diff --git a/doc/source/related_projects.rst → doc/related_projects.rst b/doc/source/related_projects.rst → doc/related_projects.rst
diff --git a/.../virtual_backscatter_electron_imaging.rst → doc/virtual_backscatter_electron_imaging.rst b/.../virtual_backscatter_electron_imaging.rst → doc/virtual_backscatter_electron_imaging.rst
diff --git a/doc/source/visualizing_patterns.rst → doc/visualizing_patterns.rst b/doc/source/visualizing_patterns.rst → doc/visualizing_patterns.rst