Skip to content

Commit

Permalink
Merge pull request #65 from nexB/add-docs-contrib
Browse files Browse the repository at this point in the history
Add documentation contribute page
  • Loading branch information
AyanSinhaMahapatra authored Mar 30, 2022
2 parents 2841270 + 5556e71 commit f3d1fcd
Show file tree
Hide file tree
Showing 4 changed files with 319 additions and 17 deletions.
314 changes: 314 additions & 0 deletions docs/source/contribute/contrib_doc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,314 @@
.. _contrib_doc_dev:

Contributing to the Documentation
=================================

.. _contrib_doc_setup_local:

Setup Local Build
-----------------

To get started, create or identify a working directory on your local machine.

Open that directory and execute the following command in a terminal session::

git clone https://github.com/nexB/skeleton.git

That will create an ``/skeleton`` directory in your working directory.
Now you can install the dependencies in a virtualenv::

cd skeleton
./configure --docs

.. note::

In case of windows, run ``configure --docs`` instead of this.

Now, this will install the following prerequisites:

- Sphinx
- sphinx_rtd_theme (the format theme used by ReadTheDocs)
- docs8 (style linter)

These requirements are already present in setup.cfg and `./configure --docs` installs them.

Now you can build the HTML documents locally::

source venv/bin/activate
cd docs
make html

Assuming that your Sphinx installation was successful, Sphinx should build a local instance of the
documentation .html files::

open build/html/index.html

.. note::

In case this command did not work, for example on Ubuntu 18.04 you may get a message like “Couldn’t
get a file descriptor referring to the console”, try:

::

see build/html/index.html

You now have a local build of the AboutCode documents.

.. _contrib_doc_share_improvements:

Share Document Improvements
---------------------------

Ensure that you have the latest files::

git pull
git status

Before commiting changes run Continious Integration Scripts locally to run tests. Refer
:ref:`doc_ci` for instructions on the same.

Follow standard git procedures to upload your new and modified files. The following commands are
examples::

git status
git add source/index.rst
git add source/how-to-scan.rst
git status
git commit -m "New how-to document that explains how to scan"
git status
git push
git status

The Scancode-Toolkit webhook with ReadTheDocs should rebuild the documentation after your
Pull Request is Merged.

Refer the `Pro Git Book <https://git-scm.com/book/en/v2/>`_ available online for Git tutorials
covering more complex topics on Branching, Merging, Rebasing etc.

.. _doc_ci:

Continuous Integration
----------------------

The documentations are checked on every new commit through Travis-CI, so that common errors are
avoided and documentation standards are enforced. Travis-CI presently checks for these 3 aspects
of the documentation :

1. Successful Builds (By using ``sphinx-build``)
2. No Broken Links (By Using ``link-check``)
3. Linting Errors (By Using ``Doc8``)

So run these scripts at your local system before creating a Pull Request::

cd docs
./scripts/sphinx_build_link_check.sh
./scripts/doc8_style_check.sh

If you don't have permission to run the scripts, run::

chmod u+x ./scripts/doc8_style_check.sh

.. _doc_style_docs8:

Style Checks Using ``Doc8``
---------------------------

How To Run Style Tests
^^^^^^^^^^^^^^^^^^^^^^

In the project root, run the following commands::

$ cd docs
$ ./scripts/doc8_style_check.sh

A sample output is::

Scanning...
Validating...
docs/source/misc/licence_policy_plugin.rst:37: D002 Trailing whitespace
docs/source/misc/faq.rst:45: D003 Tabulation used for indentation
docs/source/misc/faq.rst:9: D001 Line too long
docs/source/misc/support.rst:6: D005 No newline at end of file
========
Total files scanned = 34
Total files ignored = 0
Total accumulated errors = 326
Detailed error counts:
- CheckCarriageReturn = 0
- CheckIndentationNoTab = 75
- CheckMaxLineLength = 190
- CheckNewlineEndOfFile = 13
- CheckTrailingWhitespace = 47
- CheckValidity = 1

Now fix the errors and run again till there isn't any style error in the documentation.

What is Checked?
^^^^^^^^^^^^^^^^

PyCQA is an Organization for code quality tools (and plugins) for the Python programming language.
Doc8 is a sub-project of the same Organization. Refer this `README <https://github.com/PyCQA/doc8/blob/master/README.rst>`_ for more details.

What is checked:

- invalid rst format - D000
- lines should not be longer than 100 characters - D001

- RST exception: line with no whitespace except in the beginning
- RST exception: lines with http or https URLs
- RST exception: literal blocks
- RST exception: rst target directives

- no trailing whitespace - D002
- no tabulation for indentation - D003
- no carriage returns (use UNIX newlines) - D004
- no newline at end of file - D005

.. _doc_interspinx:

Interspinx
----------

ScanCode toolkit documentation uses `Intersphinx <http://www.sphinx-doc.org/en/master/usage/extensions/intersphinx.html>`_
to link to other Sphinx Documentations, to maintain links to other Aboutcode Projects.

To link sections in the same documentation, standart reST labels are used. Refer
`Cross-Referencing <http://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html#ref-role>`_ for more information.

For example::

.. _my-reference-label:

Section to cross-reference
--------------------------

This is the text of the section.

It refers to the section itself, see :ref:`my-reference-label`.

Now, using Intersphinx, you can create these labels in one Sphinx Documentation and then referance
these labels from another Sphinx Documentation, hosted in different locations.

You just have to add the following in the ``conf.py`` file for your Sphinx Documentation, where you
want to add the links::

extensions = [
'sphinx.ext.intersphinx'
]

intersphinx_mapping = {'aboutcode': ('https://aboutcode.readthedocs.io/en/latest/', None)}

To show all Intersphinx links and their targets of an Intersphinx mapping file, run::

python -msphinx.ext.intersphinx https://aboutcode.readthedocs.io/en/latest/objects.inv

.. WARNING::

``python -msphinx.ext.intersphinx https://aboutcode.readthedocs.io/objects.inv`` will give
error.

This enables you to create links to the ``aboutcode`` Documentation in your own Documentation,
where you modified the configuration file. Links can be added like this::

For more details refer :ref:`aboutcode:doc_style_guide`.

You can also not use the ``aboutcode`` label assigned to all links from aboutcode.readthedocs.io,
if you don't have a label having the same name in your Sphinx Documentation. Example::

For more details refer :ref:`doc_style_guide`.

If you have a label in your documentation which is also present in the documentation linked by
Intersphinx, and you link to that label, it will create a link to the local label.

For more information, refer this tutorial named
`Using Intersphinx <https://my-favorite-documentation-test.readthedocs.io/en/latest/using_intersphinx.html>`_.

.. _doc_style_conv:

Style Conventions for the Documentaion
--------------------------------------

1. Headings

(`Refer <http://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html#sections>`_)
Normally, there are no heading levels assigned to certain characters as the structure is
determined from the succession of headings. However, this convention is used in Python’s Style
Guide for documenting which you may follow:

# with overline, for parts

* with overline, for chapters

=, for sections

-, for subsections

^, for sub-subsections

", for paragraphs

2. Heading Underlines

Do not use underlines that are longer/shorter than the title headline itself. As in:

::

Correct :

Extra Style Checks
------------------

Incorrect :

Extra Style Checks
------------------------

.. note::

Underlines shorter than the Title text generates Errors on sphinx-build.


3. Internal Links

Using ``:ref:`` is advised over standard reStructuredText links to sections (like
```Section title`_``) because it works across files, when section headings are changed, will
raise warnings if incorrect, and works for all builders that support cross-references.
However, external links are created by using the standard ```Section title`_`` method.

4. Eliminate Redundancy

If a section/file has to be repeated somewhere else, do not write the exact same section/file
twice. Use ``.. include: ../README.rst`` instead. Here, ``../`` refers to the documentation
root, so file location can be used accordingly. This enables us to link documents from other
upstream folders.

5. Using ``:ref:`` only when necessary

Use ``:ref:`` to create internal links only when needed, i.e. it is referenced somewhere.
Do not create references for all the sections and then only reference some of them, because
this created unnecessary references. This also generates ERROR in ``restructuredtext-lint``.

6. Spelling

You should check for spelling errors before you push changes. `Aspell <http://aspell.net/>`_
is a GNU project Command Line tool you can use for this purpose. Download and install Aspell,
then execute ``aspell check <file-name>`` for all the files changed. Be careful about not
changing commands or other stuff as Aspell gives prompts for a lot of them. Also delete the
temporary ``.bak`` files generated. Refer the `manual <http://aspell.net/man-html/>`_ for more
information on how to use.

7. Notes and Warning Snippets

Every ``Note`` and ``Warning`` sections are to be kept in ``rst_snippets/note_snippets/`` and
``rst_snippets/warning_snippets/`` and then included to eliminate redundancy, as these are
frequently used in multiple files.

Converting from Markdown
------------------------

If you want to convert a ``.md`` file to a ``.rst`` file, this `tool <https://github.com/chrissimpkins/md2rst>`_
does it pretty well. You'd still have to clean up and check for errors as this contains a lot of
bugs. But this is definitely better than converting everything by yourself.

This will be helpful in converting GitHub wiki's (Markdown Files) to reStructuredtext files for
Sphinx/ReadTheDocs hosting.
3 changes: 2 additions & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ Welcome to nexb-skeleton's documentation!
:maxdepth: 2
:caption: Contents:

skeleton/index
skeleton-usage
contribute/contrib_doc

Indices and tables
==================
Expand Down
4 changes: 3 additions & 1 deletion docs/skeleton-usage.rst → docs/source/skeleton-usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,13 @@ To generate requirements.txt:
python etc/scripts/gen_requirements.py -s venv/lib/python<version>/site-packages/
Replace \<version\> with the version number of the Python being used, for example: ``venv/lib/python3.6/site-packages/``
Replace \<version\> with the version number of the Python being used, for example:
``venv/lib/python3.6/site-packages/``

To generate requirements-dev.txt after requirements.txt has been generated:

.. code-block:: bash
./configure --dev
python etc/scripts/gen_requirements_dev.py -s venv/lib/python<version>/site-packages/
Expand Down
15 changes: 0 additions & 15 deletions docs/source/skeleton/index.rst

This file was deleted.

0 comments on commit f3d1fcd

Please sign in to comment.