Skip to content

Commit

Permalink
Merge b30c575 into 062d70d
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisjsewell committed Aug 12, 2019
2 parents 062d70d + b30c575 commit 8b4e3d8
Show file tree
Hide file tree
Showing 30 changed files with 1,895 additions and 371 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ install:
script:
- |
if [[ "$TEST_TYPE" == "pytest" ]]; then
# pytest -v --nb-test-files --log-cli-level=info --cov=pytest_notebook --cov-report=
pytest -v --cov=pytest_notebook --cov-report=
fi
- |
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ recursive-exclude * __pycache__
recursive-exclude * *.py[co]

recursive-include pytest_notebook/example_nbs *.ipynb
recursive-include pytest_notebook/resources *.json
2 changes: 2 additions & 0 deletions docs/source/apidoc/pytest_notebook.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Subpackages
.. toctree::

pytest_notebook.example_nbs
pytest_notebook.resources

Submodules
----------
Expand All @@ -17,6 +18,7 @@ Submodules
pytest_notebook.execution
pytest_notebook.ipy_magic
pytest_notebook.nb_regression
pytest_notebook.notebook
pytest_notebook.plugin
pytest_notebook.post_processors
pytest_notebook.utils
Expand Down
1 change: 1 addition & 0 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
("py:class", "attr.s"),
("py:class", "ruamel.yaml.dumper.RoundTripDumper"),
("py:exc", "nbconvert.preprocessors.CellExecutionError"),
("py:class", "nbconvert.preprocessors.execute.ExecutePreprocessor"),
]

# The reST default role (used for this markup: `text`) to use for all
Expand Down
12 changes: 10 additions & 2 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ pytest-notebook
:hidden:

user_guide/tutorial_intro
user_guide/tutorial_config

.. toctree::
:maxdepth: 1
:caption: Validation Schemas
:hidden:

literal_includes/nb_metadata_schema

.. toctree::
:maxdepth: 1
Expand Down Expand Up @@ -56,15 +64,15 @@ Features
2. As a pytest fixtures.
3. Using the ``pytest_notebook`` python package.

- All stages are highly configurable *via*:
- All stages are highly configurable (see :ref:`configuring_pytest_notebook`) *via*:

1. The pytest command-line interface.
2. The pytest configuration file.
3. The notebook and cell level metadata.

- Post-processor plugin entry-points, allow for customisable
modifications of the notebook, including source code formatting with
`black`_
`black`_ (see :ref:`post_processors`).

.. image:: _static/collaged_in_out.png
:alt: Configuration Examples
Expand Down
20 changes: 20 additions & 0 deletions docs/source/literal_includes/nb_metadata_schema.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
.. _nb_metadata_schema:

Notebook/Cell Metadata Schema
-----------------------------

This schema is applied to keys under the ``nbreg`` key.

For example:

.. code:: json
{
"nbreg": {
"skip": true,
"skip_reason": "There is an unresolved exception"
}
}
.. literalinclude:: ../../../pytest_notebook/resources/nb_metadata.schema.json
:language: JSON
Binary file added docs/source/user_guide/images/nb_metadata.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/source/user_guide/images/nb_tag_except.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 8b4e3d8

Please sign in to comment.