Skip to content

Commit

Permalink
Update docs (#441)
Browse files Browse the repository at this point in the history
* Initial commit

* Change python 3.5 references to 3.6

* Update files related to documentation-generation.

* Update CONTRIBUTING.rst

* Update CONTRIBUTING.rst

* Update README.md
  • Loading branch information
hpesonen committed Dec 16, 2022
1 parent 67e6ed9 commit 7c7a55e
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 5 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Changelog
=========


- Update documentation-related files: docs, conf.py and requirements-dev.txt
- Update PULL_REQUEST_TEMPLATE.md
- Drop tests for py36 and add tests for py39 and py310
- Fix couple of minor bugs in `ar1`-model
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ Before you submit a pull request, check that it meets these guidelines:
2. If the pull request adds functionality, the docs should be updated. Put
your new functionality into a function with a docstring, and add the
feature to the list in README.md.
3. The pull request should work for Python 3.7, or later. Check
3. The pull request should work for Python 3.7 and later. Check
https://github.com/elfi-dev/elfi/actions/workflows/pytest.yml
and make sure that the tests pass for all supported Python versions.

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ with your default Python environment and can easily use different versions of Py
in different projects. You can create a virtual environment for ELFI using anaconda with:

```
conda create -n elfi python=3.6 numpy
conda create -n elfi python=3.7 numpy
source activate elfi
pip install elfi
```
Expand Down
3 changes: 2 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ def setup(app):
'sphinx.ext.viewcode',
'sphinx.ext.autosummary',
'sphinx.ext.napoleon',
'IPython.sphinxext.ipython_console_highlighting',
# Inheritance diagrams
# 'sphinx.ext.graphviz',
# 'sphinx.ext.inheritance_diagram',
Expand Down Expand Up @@ -134,7 +135,7 @@ def setup(app):
#
# 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"

# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
Expand Down
2 changes: 1 addition & 1 deletion docs/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Quickstart

First ensure you have
`installed <http://elfi.readthedocs.io/en/stable/installation.html>`__
Python 3.6 (or greater) and ELFI. After installation you can start using
Python 3.7 (or greater) and ELFI. After installation you can start using
ELFI:

.. code:: ipython3
Expand Down
2 changes: 1 addition & 1 deletion docs/usage/parallelization.rst
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ start a local cluster to the background using 4 CPU cores:

.. code:: ipython3
!ipcluster start -n 4 --daemon
!ipcluster start -n 4 --daemonize
# This is here just to ensure that ipcluster has enough time to start properly before continuing
import time
Expand Down
2 changes: 2 additions & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ importlib-metadata<5.0.0

# Documentation
Sphinx>=1.4.8
sphinx-rtd-theme>=1.1.1
jupyter>=1.0.0

0 comments on commit 7c7a55e

Please sign in to comment.