Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Try fixing docs #57

Merged
merged 4 commits into from
May 17, 2023
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/requirements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- python
- pip

- sphinx
- sphinx<7.0
- sphinx_rtd_theme

- tree
Expand Down
6 changes: 4 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
# ones.
extensions = [
'sphinx.ext.mathjax',
'sphinx.ext.autosummary',
]

# Add any paths that contain templates here, relative to this directory.
Expand All @@ -72,12 +73,13 @@
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None
language = "en"

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This pattern also affects html_static_path and html_extra_path .
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
exclude_patterns = ['_build', 'Thumbs.db',
'.DS_Store', 'generated/example-repository/*']

# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'
Expand Down
21 changes: 10 additions & 11 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,16 @@ based on MDAnalysis.
Starting repositories can be created from this template so you can focus on what's important: the science!

**Features**

* Python-centric skeletal structure with initial module files
* Pre-configured ``setup.py`` for installation and packaging
* Pre-configured Window, Linux, and OSX continuous integration on GitHub Actions
* Choice of dependency locations through ``conda-forge``, default ``conda``, or ``pip``
* Basic testing structure with `PyTest <https://docs.pytest.org/en/latest/>`_
* Automatic ``git`` initialization + tag
* GitHub Hooks
* Automatic package version control with `Versioneer <https://github.com/warner/python-versioneer>`_
* Sample data inclusion with packaging instructions
* Basic documentation structure powered by `Sphinx <http://www.sphinx-doc.org/en/master/>`_
* Python-centric skeletal structure with initial module files
* Pre-configured ``setup.py`` for installation and packaging
* Pre-configured Window, Linux, and OSX continuous integration on GitHub Actions
* Choice of dependency locations through ``conda-forge``, default ``conda``, or ``pip``
* Basic testing structure with `PyTest <https://docs.pytest.org/en/latest/>`_
* Automatic ``git`` initialization + tag
* GitHub Hooks
* Automatic package version control with `Versioneer <https://github.com/warner/python-versioneer>`_
* Sample data inclusion with packaging instructions
* Basic documentation structure powered by `Sphinx <http://www.sphinx-doc.org/en/master/>`_


.. toctree::
Expand Down
12 changes: 8 additions & 4 deletions docs/source/usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ Usage
Getting up and running requires a short process.

You will need the following:
* Python 3.8+
* The `cookiecutter`_ tool installed
* A GitHub account
* Python 3.8+
* The `cookiecutter`_ tool installed
* A GitHub account


1. Use the cookiecutter to create a new project
Expand Down Expand Up @@ -35,7 +35,7 @@ Please see :ref:`options-label` for more details.
The generated repository should be an initialised git repository.
We now need to connect it to GitHub:

#. `Create a new repository on GitHub`_ .
#. `Create a new repository on GitHub <https://docs.github.com/en/get-started/quickstart/create-a-repo>`_ .
Do not initialize the repo with a README, license, or any other files.
#. Push the local repository to GitHub.
GitHub should provide instructions for doing so, but in short:
Expand Down Expand Up @@ -123,3 +123,7 @@ To keep things clean and simple, we advise a few tips:
as well as collaborate with other people.
See `GitHub's documentation on PRs <https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests>`_
for more information.


.. _ReadTheDocs: https://docs.readthedocs.io/en/stable/index.html
.. _cookiecutter: https://cookiecutter.readthedocs.io/en/stable/
2 changes: 1 addition & 1 deletion {{cookiecutter.repo_name}}/docs/requirements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies:
- python
- pip

- sphinx
- sphinx<7.0
{% if cookiecutter.dependency_source == 'Prefer default anaconda channel with pip fallback' %}
# Pip-only installs
- pip:
Expand Down
2 changes: 1 addition & 1 deletion {{cookiecutter.repo_name}}/docs/source/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ API Documentation
.. autosummary::
:toctree: autosummary

{{cookiecutter.repo_name}}.canvas
{{cookiecutter.package_name}}.canvas
2 changes: 1 addition & 1 deletion {{cookiecutter.repo_name}}/docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None
language = "en"

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
Expand Down