Skip to content

Commit 2bbb8e7

Browse files
authored
Fix displayed version in documentation. (#135)
1 parent 9bd30f4 commit 2bbb8e7

File tree

5 files changed

+18
-13
lines changed

5 files changed

+18
-13
lines changed

CITATION

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@Unpublished{Raabe2020,
2-
Title = {A Python tool for managing scientific workflows.},
3-
Author = {Tobias Raabe},
4-
Year = {2020},
5-
Url = {https://github.com/pytask-dev/pytask}
2+
Title = {A Python tool for managing scientific workflows.},
3+
Author = {Tobias Raabe},
4+
Year = {2020},
5+
Url = {https://github.com/pytask-dev/pytask}
66
}

README.rst

+7-4
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,12 @@ projects. Its features include:
6868

6969
- **Easily extensible with plugins**. pytask's architecture is based on `pluggy
7070
<https://pluggy.readthedocs.io/en/latest/>`_, a plugin management framework, so that
71-
you can adjust pytask to your needs. Plugins are, for example, available for
72-
`parallelization <https://github.com/pytask-dev/pytask-parallel>`_, `LaTeX
71+
you can adjust pytask to your needs. Plugins are available for `parallelization
72+
<https://github.com/pytask-dev/pytask-parallel>`_, `LaTeX
7373
<https://github.com/pytask-dev/pytask-latex>`_, `R
7474
<https://github.com/pytask-dev/pytask-r>`_, and `Stata
75-
<https://github.com/pytask-dev/pytask-stata>`_. Read `here
75+
<https://github.com/pytask-dev/pytask-stata>`_ and `many more
76+
<https://github.com/topics/pytask>`_. Read `here
7677
<https://pytask-dev.readthedocs.io/en/latest/tutorials/how_to_use_plugins.html>`_ how
7778
you can use plugins.
7879

@@ -92,7 +93,9 @@ the package with
9293
9394
$ pip install pytask
9495
95-
# or
96+
or
97+
98+
.. code-block:: console
9699
97100
$ conda install -c conda-forge pytask
98101

docs/source/changes.rst

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ all releases are available on `PyPI <https://pypi.org/project/pytask>`_ and
1010
0.1.2 - 2021-xx-xx
1111
------------------
1212

13+
- :gh:`135` implements handling of version in docs as proposed by setuptools-scm.
1314
- :gh:`142` removes the display of skipped and persisted tasks from the live execution
1415
table for the default verbosity level of 1. They are displayed at 2.
1516
- :gh:`144` adds tryceratops to the pre-commit hooks for catching issues with

docs/source/conf.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
# these directories to sys.path here. If the directory is relative to the documentation
77
# root, use os.path.abspath to make it absolute, like shown here.
88
import datetime as dt
9+
from importlib.metadata import version
910

1011
import sphinx
11-
from pkg_resources import get_distribution
1212

1313

1414
# -- Project information ---------------------------------------------------------------
@@ -19,9 +19,9 @@
1919
copyright = f"2020-{year}, {author}" # noqa: A001
2020

2121
# The version, including alpha/beta/rc tags, but not commit hash and datestamps
22-
release = get_distribution("pytask").version.split("+")[0]
22+
release = version("pytask")
2323
# The short X.Y version.
24-
version = release
24+
version = ".".join(release.split(".")[:2])
2525

2626
# -- General configuration -------------------------------------------------------------
2727

@@ -80,8 +80,8 @@
8080
}
8181

8282
intersphinx_mapping = {
83-
"python": ("https://docs.python.org/3.8", None),
84-
"click": ("https://click.palletsprojects.com/en/7.x", None),
83+
"python": ("https://docs.python.org/3.9", None),
84+
"click": ("https://click.palletsprojects.com/en/8.0.x/", None),
8585
"pluggy": ("https://pluggy.readthedocs.io/en/latest", None),
8686
}
8787

setup.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from setuptools import setup
22

3+
34
if __name__ == "__main__":
45
setup()

0 commit comments

Comments
 (0)