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

Documentation improvements #142

Merged
merged 47 commits into from
Feb 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
bba8f5f
Point to the release page on GitHub instead of PyPI for the download
RKrahl Nov 22, 2023
9be8303
Put a full download URL in the spec file
RKrahl Nov 22, 2023
3999092
Set the table of predefined configuration variables in a table
RKrahl Dec 21, 2023
299c82b
ReST style fixes:
RKrahl Dec 21, 2023
1b27f82
Set the Synopsis section in man pages as line blocks
RKrahl Dec 21, 2023
d1d0f38
Add GitHub action to check ReST input files
RKrahl Dec 21, 2023
cec2595
Drop version constraint on Sphinx in RtD requirements,
RKrahl Dec 22, 2023
4306390
Add sphinx_copybutton extension
RKrahl Dec 22, 2023
fafaa64
Add python scripts to contain the interactive code blocks from the
RKrahl Dec 22, 2023
4e3bbe3
Fix overly long lines in interactive tutorial examples
RKrahl Dec 22, 2023
9963fd5
Merge branch 'develop' into doc
RKrahl Jan 2, 2024
c941a9d
Restrict running ReST lint on push to branches develop and master
RKrahl Jan 2, 2024
8871a81
Merge branch 'develop' into doc
RKrahl Jan 2, 2024
16443e8
Documentation fix: move a version changed note from module icat.ingest
RKrahl Jan 2, 2024
8446200
Minor doc config fixes
RKrahl Jan 2, 2024
af28f5d
- Add a new section on file formats to the documentation
RKrahl Jan 3, 2024
3b9367e
Review introduction of ICAT data files section
RKrahl Jan 3, 2024
33f8650
Some formulation review to the subsection on the structure of ICAT
RKrahl Jan 3, 2024
da2415f
Add simple ICAT data file examples
RKrahl Jan 3, 2024
af0ee8d
Add subsections on ICAT data XML files and on ICAT data YAML files
RKrahl Jan 3, 2024
4ad8e9e
Add the text content for the subsection on ICAT data XML files
RKrahl Jan 3, 2024
968127b
Merge branch 'develop' into doc
RKrahl Jan 5, 2024
ea4b9d6
Typo
RKrahl Jan 6, 2024
e62dc5a
- Review documentation Section "ICAT data XML files", adding more
RKrahl Jan 16, 2024
a472fc7
Fix duplicate user entry in example ICAT data file
RKrahl Jan 16, 2024
b3e3052
- Review documentation Section "ICAT data YAML files"
RKrahl Jan 16, 2024
acaff9d
Review Section ICAT data files with respect to object references, add
RKrahl Jan 16, 2024
9c5085c
Rework Section ICAT data files once again
RKrahl Jan 18, 2024
0fc8b00
Drop most of the docstring from module icat.dumpfile as this is now
RKrahl Jan 18, 2024
504d091
Indicate in the documentation of icat.dumpfile which methods of class
RKrahl Jan 18, 2024
a52714b
Minor language fixes
RKrahl Jan 19, 2024
f0112b8
Add first input to Section Metadata ingest files
RKrahl Jan 19, 2024
048a98c
Minor language fixes
RKrahl Jan 19, 2024
569d2c2
Merge branch 'develop' into doc
RKrahl Feb 2, 2024
dd7473f
Add an example to the Metadata ingest files Section of the
RKrahl Feb 2, 2024
634a416
Language fixes in the documentation
RKrahl Feb 12, 2024
987f22e
Documentation fix: also the relation to DatasetType is added by
RKrahl Feb 12, 2024
21235fa
- add a note on the versioning to metadata ingest file documentation
RKrahl Feb 12, 2024
c3d360b
Update documentation for module icat.ingest taking into account the
RKrahl Feb 12, 2024
f2b9657
Another language fix
RKrahl Feb 12, 2024
9ad05b5
Yet another language fix
RKrahl Feb 12, 2024
3eefef5
Add kink anchors to the entries for each version in the changelog in
RKrahl Feb 12, 2024
f1f2b73
Dynamically create a file _meta.rst in the documentation source that
RKrahl Feb 19, 2024
8f35940
Review install instructions, explaining how to verify the signature
RKrahl Feb 19, 2024
67b947c
Fixup 8f35940: need to run doc/src/conf.py before doc8-check now
RKrahl Feb 19, 2024
2a827fd
Aesthetic fix for rst-lint action: unshallow the checked out
RKrahl Feb 19, 2024
848a474
Some tweaks in the install instructions:
RKrahl Feb 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions .github/workflows/rst-lint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Check ReST input files
on:
push:
branches:
- develop
- master
pull_request:
jobs:
doc8:
runs-on: ubuntu-latest
steps:
- name: Check out repository code
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Python 3.11
uses: actions/setup-python@v4
with:
python-version: 3.11
- name: Install dependencies
run: |
pip install setuptools packaging git-props suds
- name: Run conf.py
run: |
python setup.py build
python doc/src/conf.py
- name: doc8-check
uses: deep-entertainment/doc8-action@v4
with:
scanPaths: "doc/src"
5 changes: 2 additions & 3 deletions .rtd-require
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ lxml
packaging
setuptools
suds
jinja2<3.1
sphinx>=2,<3
sphinx-rtd-theme>=0.5,<1
sphinx-copybutton
sphinx_rtd_theme
64 changes: 64 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ Changelog
=========


.. _changes-1_3_0:

1.3.0 (not yet released)
~~~~~~~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -36,6 +38,8 @@ Bug fixes and minor changes
.. _#147: https://github.com/icatproject/python-icat/pull/147


.. _changes-1_2_0:

1.2.0 (2023-10-31)
~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -84,6 +88,8 @@ Bug fixes and minor changes
.. _#140: https://github.com/icatproject/python-icat/pull/140


.. _changes-1_1_0:

1.1.0 (2023-06-30)
~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -139,6 +145,8 @@ Bug fixes and minor changes
.. _#129: https://github.com/icatproject/python-icat/pull/129


.. _changes-1_0_0:

1.0.0 (2022-12-21)
~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -231,6 +239,8 @@ Bug fixes and minor changes
.. _#106: https://github.com/icatproject/python-icat/pull/106


.. _changes-0_21_0:

0.21.0 (2022-01-28)
~~~~~~~~~~~~~~~~~~~

Expand All @@ -249,6 +259,8 @@ New features
.. _#100: https://github.com/icatproject/python-icat/pull/100


.. _changes-0_20_1:

0.20.1 (2021-11-04)
~~~~~~~~~~~~~~~~~~~

Expand All @@ -260,6 +272,8 @@ Bug fixes and minor changes
.. _#96: https://github.com/icatproject/python-icat/pull/96


.. _changes-0_20_0:

0.20.0 (2021-10-29)
~~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -296,6 +310,8 @@ Bug fixes and minor changes
.. _#95: https://github.com/icatproject/python-icat/pull/95


.. _changes-0_19_0:

0.19.0 (2021-07-20)
~~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -324,6 +340,8 @@ Bug fixes and minor changes
.. _#85: https://github.com/icatproject/python-icat/pull/85


.. _changes-0_18_1:

0.18.1 (2021-04-13)
~~~~~~~~~~~~~~~~~~~

Expand All @@ -341,6 +359,8 @@ Bug fixes and minor changes
.. _#82: https://github.com/icatproject/python-icat/pull/82


.. _changes-0_18_0:

0.18.0 (2021-03-29)
~~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -377,6 +397,8 @@ Bug fixes and minor changes
.. _#80: https://github.com/icatproject/python-icat/pull/80


.. _changes-0_17_0:

0.17.0 (2020-04-30)
~~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -468,6 +490,8 @@ Misc
.. _#72: https://github.com/icatproject/python-icat/issues/72


.. _changes-0_16_0:

0.16.0 (2019-09-26)
~~~~~~~~~~~~~~~~~~~

Expand All @@ -492,6 +516,8 @@ Bug fixes and minor changes
.. _#60: https://github.com/icatproject/python-icat/pull/60


.. _changes-0_15_1:

0.15.1 (2019-07-12)
~~~~~~~~~~~~~~~~~~~

Expand All @@ -513,6 +539,8 @@ Bug fixes and minor changes
.. _#57: https://github.com/icatproject/python-icat/issues/57


.. _changes-0_15_0:

0.15.0 (2019-03-27)
~~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -551,6 +579,8 @@ Bug fixes and minor changes
.. _#54: https://github.com/icatproject/python-icat/issues/54


.. _changes-0_14_2:

0.14.2 (2018-10-25)
~~~~~~~~~~~~~~~~~~~

Expand All @@ -563,6 +593,8 @@ Bug fixes and minor changes
probably not need it.


.. _changes-0_14_1:

0.14.1 (2018-06-05)
~~~~~~~~~~~~~~~~~~~

Expand All @@ -573,6 +605,8 @@ Bug fixes and minor changes
for the Write API call.


.. _changes-0_14_0:

0.14.0 (2018-06-01)
~~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -628,6 +662,8 @@ Bug fixes and minor changes
.. _#48: https://github.com/icatproject/python-icat/issues/48


.. _changes-0_13_1:

0.13.1 (2017-07-12)
~~~~~~~~~~~~~~~~~~~

Expand All @@ -640,6 +676,8 @@ Bug fixes and minor changes
.. _#38: https://github.com/icatproject/python-icat/issues/38


.. _changes-0_13_0:

0.13.0 (2017-06-09)
~~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -798,6 +836,8 @@ Bug fixes and minor changes
.. _pytest-dependency: https://pypi.python.org/pypi/pytest_dependency/


.. _changes-0_12_0:

0.12.0 (2016-10-10)
~~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -837,6 +877,8 @@ Bug fixes and minor changes
.. _#28: https://github.com/icatproject/python-icat/issues/28


.. _changes-0_11_0:

0.11.0 (2016-06-01)
~~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -896,6 +938,8 @@ Misc
.. _distutils_pytest: https://github.com/RKrahl/distutils-pytest


.. _changes-0_10_0:

0.10.0 (2015-12-06)
~~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -964,6 +1008,8 @@ Bug fixes and minor changes
.. _#15: https://github.com/icatproject/python-icat/issues/15


.. _changes-0_9_0:

0.9.0 (2015-08-13)
~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -1067,6 +1113,8 @@ Bug fixes and minor changes
.. _#10: https://github.com/icatproject/python-icat/issues/10


.. _changes-0_8_0:

0.8.0 (2015-05-08)
~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -1156,6 +1204,8 @@ Bug fixes and minor changes
:meth:`icat.query.Query.__repr__`.


.. _changes-0_7_0:

0.7.0 (2015-02-11)
~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -1187,6 +1237,8 @@ New features
:meth:`icat.ids.IDSClient.getLink` method.


.. _changes-0_6_0:

0.6.0 (2014-12-15)
~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -1314,6 +1366,8 @@ Minor changes and fixes
+ Add comparison operators to class :class:`icat.listproxy.ListProxy`.


.. _changes-0_5_1:

0.5.1 (2014-07-07)
~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -1357,6 +1411,8 @@ Minor changes and fixes
modifications, such as running 2to3 on them.


.. _changes-0_5_0:

0.5.0 (2014-06-24)
~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -1399,6 +1455,8 @@ Minor changes and fixes
.. __: https://github.com/icatproject/icat.server/issues/112


.. _changes-0_4_0:

0.4.0 (2014-02-11)
~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -1446,6 +1504,8 @@ Minor changes and fixes
:ref:`icatrestore <icatingest>`.


.. _changes-0_3_0:

0.3.0 (2014-01-10)
~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -1492,6 +1552,8 @@ Minor changes and fixes
+ Add example scripts :ref:`icatdump` and :ref:`icatrestore <icatingest>`.


.. _changes-0_2_0:

0.2.0 (2013-11-18)
~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -1532,6 +1594,8 @@ Minor changes and fixes
import :mod:`icat` and :mod:`icat.config`.


.. _changes-0_1_0:

0.1.0 (2013-11-01)
~~~~~~~~~~~~~~~~~~

Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ include doc/examples/icatdump-*.xml
include doc/examples/icatdump-*.yaml
include doc/examples/ingest-*.xml
include doc/examples/metadata-*.xml
include doc/examples/metadata.xml
include doc/icatdata*.xsd
include doc/man/*
include doc/tutorial/*.py
Expand Down
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ is based on Suds and extends it with ICAT specific features.
Download
--------

The latest release version can be found in the
`Python Package Index (PyPI)`__.
The latest release version can be found at the
`release page on GitHub`__.

.. __: `PyPI site`_
.. __: `GitHub release`_


Documentation
Expand Down Expand Up @@ -64,6 +64,6 @@ permissions and limitations under the License.


.. _ICAT: https://icatproject.org/
.. _PyPI site: https://pypi.org/project/python-icat/
.. _GitHub release: https://github.com/icatproject/python-icat/releases/latest
.. _Read the Docs site: https://python-icat.readthedocs.io/
.. _Apache License: https://www.apache.org/licenses/LICENSE-2.0
1 change: 1 addition & 0 deletions doc/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/src/_meta.rst
/devhelp/
/dirhtml/
/doctest/
Expand Down
1 change: 1 addition & 0 deletions doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ $(BUILDERS): $(STATIC_SOURCEDIRS)

distclean:
rm -rf doctrees $(BUILDERS)
rm -f src/_meta.rst

$(STATIC_SOURCEDIRS):
mkdir $@
Expand Down
Loading
Loading