Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ benchmarks/results/*
src/ect/embed_graph.py
src/ect/embed_cw.py

.vscode
docs_local

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
Expand Down
1,924 changes: 0 additions & 1,924 deletions Extra_Notebooks/CodingFiguresFern.ipynb

This file was deleted.

386 changes: 0 additions & 386 deletions Extra_Notebooks/Matisse_ECT.ipynb

This file was deleted.

79 changes: 0 additions & 79 deletions Extra_Notebooks/Mesh.ipynb

This file was deleted.

1,891 changes: 0 additions & 1,891 deletions Extra_Notebooks/Playing_with_Spirals.ipynb

This file was deleted.

361 changes: 0 additions & 361 deletions Extra_Notebooks/tutorial_cw.ipynb

This file was deleted.

560 changes: 0 additions & 560 deletions Extra_Notebooks/tutorial_graph.ipynb

This file was deleted.

6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ html:
mkdir docs
sphinx-build -b html doc_source docs

html-local:
# Running sphinx-build to build html files in a local docs folder
rm -rf docs_local
mkdir docs_local
sphinx-build -b html doc_source docs_local

benchmark:
python benchmarks/run_benchmarks.py

Expand Down
6 changes: 4 additions & 2 deletions doc_source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#
# Add the src directory to sys.path so Sphinx can find ect.embed_complex
import os
import sys
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'src')))
sys.path.insert(0, os.path.abspath('.'))
sys.path.insert(0, os.path.join(os.path.dirname(__file__),'..'))
sys.path.insert(0, os.path.join(os.path.dirname(__file__),'..', 'ect' ))
Expand Down Expand Up @@ -76,7 +78,7 @@
'canonical_url': '',
'analytics_id': 'UA-XXXXXXX-1', # Provided by Google in your dashboard
'logo_only': False,
'display_version': True,
# 'display_version': True, # Removed because it is unsupported
'prev_next_buttons_location': 'bottom',
'style_external_links': True,
'style_nav_header_background': '#cececf',
Expand All @@ -100,4 +102,4 @@
# Add any paths that contain custom static files (such as style sheets) here,
# 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']
# html_static_path = ['_static']
8 changes: 4 additions & 4 deletions doc_source/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ The `ect` package uses the Sphinx documentation system for generating documentat
- First, include docstrings in the code which will be autogenerated into the documentation. When in doubt, write too much.
- Second, write documentation in the `doc_source` directory using the reStructuredText format. This package also supports writing files in markdown, although there are some issues when dealing with autogenerated content so it's a bit of a mix at the moment. Note that when the documentation is generated, everything in the `docs` folder is deleted and overwritten, so do not do your work in there, it will be lost!

Assuming everything is set up correctly (see the installation instructions in the main documentation), you can generate the documentation by running the following command from the top level folder::
Assuming everything is set up correctly (see the installation instructions in the main documentation), you can generate the documentation on your local machine by running the following command from the top level folder::

make html
make html-local

This will generate the documentation in the ``docs`` directory. You can view the documentation by opening the ``docs/index.html`` file in your browser.
This will generate the documentation in the ``docs_local`` directory. You can view the documentation by opening the ``docs_local/index.html`` file in your browser. Do not push anything in the ``docs_local`` folder to the repository, it is only for local viewing; the ``docs`` folder is generated automatically when changes in ``doc_source`` are pushed to the ``main`` branch.

An example of a docstring for a function is given below. Note the use of indentation since rst is picky about it::

Expand Down Expand Up @@ -89,7 +89,7 @@ If you would like to fix an issue and you are a contributor to the project, plea

- Note that in order for the `pip install` command to work, the version number in the `pyproject.toml` file must be updated.
- You should also make sure to update the version number to match in the ``doc_source/conf.py`` file. This will ensure that the documentation is updated with the correct version number.
- Be sure to run ``make all`` before committing to ensure that the code is cleaned, the documentation is up to date, and the tests all pass.
- Be sure to run ``make all`` before committing to ensure that the code is cleaned, the documentation compiles properly, and the tests all pass.

If you are not a contributor, you will need to fork the code and create a pull request from your fork.
Note that all pull requests need to be approved by Liz Munch before they can be merged.
2 changes: 1 addition & 1 deletion doc_source/embed_complex.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ K.add_cell(["A", "B", "C"], dim=2)
```{eval-rst}
.. automodule:: ect.embed_complex
:members:
:show-inheritance:
:undoc-members:
:no-index:
```
163 changes: 25 additions & 138 deletions doc_source/notebooks/Tutorial-EmbeddedComplex.ipynb

Large diffs are not rendered by default.

179 changes: 0 additions & 179 deletions doc_source/notebooks/Tutorial-ExactECT.ipynb

This file was deleted.

1 change: 0 additions & 1 deletion doc_source/tutorials.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ Tutorials
:caption: Contents:

notebooks/Tutorial-EmbeddedComplex
notebooks/Tutorial-ExactECT
notebooks/Matisse/example_matisse

4 changes: 0 additions & 4 deletions docs/.buildinfo

This file was deleted.

Binary file removed docs/.doctrees/citing.doctree
Binary file not shown.
Binary file removed docs/.doctrees/contributing.doctree
Binary file not shown.
Binary file removed docs/.doctrees/directions.doctree
Binary file not shown.
Binary file removed docs/.doctrees/ect_on_graphs.doctree
Binary file not shown.
Binary file removed docs/.doctrees/embed_complex.doctree
Binary file not shown.
Binary file removed docs/.doctrees/environment.pickle
Binary file not shown.
Binary file removed docs/.doctrees/index.doctree
Binary file not shown.
Binary file removed docs/.doctrees/installation.doctree
Binary file not shown.
Binary file removed docs/.doctrees/license.doctree
Binary file not shown.
Binary file removed docs/.doctrees/modules.doctree
Binary file not shown.
362 changes: 0 additions & 362 deletions docs/.doctrees/nbsphinx/notebooks/Matisse/example_matisse.ipynb

This file was deleted.

624 changes: 0 additions & 624 deletions docs/.doctrees/nbsphinx/notebooks/Tutorial-EmbeddedComplex.ipynb

This file was deleted.

215 changes: 0 additions & 215 deletions docs/.doctrees/nbsphinx/notebooks/Tutorial-ExactECT.ipynb

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed docs/.doctrees/notebooks/Tutorial-ExactECT.doctree
Binary file not shown.
Binary file removed docs/.doctrees/tutorials.doctree
Binary file not shown.
Binary file removed docs/.doctrees/validation.doctree
Binary file not shown.
Empty file removed docs/.nojekyll
Empty file.
Binary file removed docs/_images/matisse.jpg
Binary file not shown.
Binary file removed docs/_images/matisse_numbered.jpg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed docs/_images/notebooks_Tutorial-ExactECT_4_0.png
Diff not rendered.
Loading
Loading