Skip to content

Commit 5c3d722

Browse files
authored
Restore ability to build properly (#99)
* Create .readthedocs.yaml * Create .readthedocs.yaml * Update sphinx version to be compatible with sphix_rtd_theme * Specify dependencies * Fix double dash formatting * Add graphviz dependency to ensure digraphs render * Trying again but adding a apt_package instead * Update python to 3.11 * Maybe smartquotes is unnecessary and a single backslash escape is enough? * Missed a file when removing double escape
1 parent 91420e9 commit 5c3d722

14 files changed

+99
-74
lines changed

.readthedocs.yaml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# .readthedocs.yaml
2+
# Read the Docs configuration file
3+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
4+
5+
# Required
6+
version: 2
7+
8+
# Set the version of Python and other tools you might need
9+
build:
10+
os: ubuntu-22.04
11+
tools:
12+
python: "3.11"
13+
apt_packages:
14+
- graphviz
15+
16+
# Build documentation in the docs/ directory with Sphinx
17+
sphinx:
18+
configuration: conf.py
19+
20+
# We recommend specifying your dependencies to enable reproducible builds:
21+
# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
22+
python:
23+
install:
24+
- requirements: dependencies.txt

conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
# If your documentation needs a minimal Sphinx version, state it here.
3535
#
36-
# needs_sphinx = '1.0'
36+
needs_sphinx = '5.0'
3737

3838
# Add any Sphinx extension module names here, as strings. They can be
3939
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom

dependencies.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
sphinx_rtd_theme

reference/discovery-arguments.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ For each argument the name in brackets indicates which package contributes it.
77

88
.. _discovery-args_paths_arg:
99

10-
\\--paths [PATH [PATH ...]] [``colcon-core``]
10+
\--paths [PATH [PATH ...]] [``colcon-core``]
1111
The (non recursive) paths to check for a package.
1212
Use shell wildcards (e.g. ``src/*``) to select all direct subdirectories of
1313
``src``.
1414

1515
.. _discovery-args_base-paths_arg:
1616

17-
\\--base-paths [PATH [PATH ...]] [``colcon-recursive-crawl``]
17+
\--base-paths [PATH [PATH ...]] [``colcon-recursive-crawl``]
1818
The base paths to recursively crawl for packages.
1919
The default value is ``.``.
2020
In a workspace root the subdirectories other than ``src`` (commonly
@@ -23,28 +23,28 @@ For each argument the name in brackets indicates which package contributes it.
2323

2424
.. _discovery-args_metas_arg:
2525

26-
\\--metas [PATH [PATH ...]] [``colcon-metadata``]
26+
\--metas [PATH [PATH ...]] [``colcon-metadata``]
2727
The directories containing a ``colcon.meta`` file or paths to arbitrary files
2828
containing the same meta information.
2929
The default value is ``./colcon.meta``.
3030

3131
.. _discovery-args_ignore-user-meta_arg:
3232

33-
\\--ignore-user-meta [``colcon-metadata``]
33+
\--ignore-user-meta [``colcon-metadata``]
3434
Ignore ``*.meta`` files in the configuration directory
3535
:ref:`$COLCON_HOME <colcon-core_colcon-home_env>`\ ``/metadata/``.
3636

3737
.. _discovery-args_packages-ignore_arg:
3838

39-
\\--packages-ignore [PKG_NAME [PKG_NAME ...]] [``colcon-package-selection``]
39+
\--packages-ignore [PKG_NAME [PKG_NAME ...]] [``colcon-package-selection``]
4040
Ignore packages by name as if they were not discovered.
4141
In contrast to being skipped using
4242
:doc:`package selection <package-selection-arguments>` arguments, ignored
4343
packages aren't considered in the dependency graph.
4444

4545
.. _discovery-args_packages-ignore-regex_arg:
4646

47-
\\--packages-ignore-regex [PATTERN [PATTERN ...]] [``colcon-package-selection``]
47+
\--packages-ignore-regex [PATTERN [PATTERN ...]] [``colcon-package-selection``]
4848
Ignore packages where any of the patterns match the package name.
4949
In contrast to being skipped using
5050
:doc:`package selection <package-selection-arguments>` arguments, ignored

reference/event-handler-arguments.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ The event handlers are used by several verbs to generate any kind of output
55
based on the progress of the invocation.
66
For each argument the name in brackets indicates which package contributes it.
77

8-
\\--event-handlers [name1+ [name2- ...]] [``colcon-core``]
8+
\--event-handlers [name1+ [name2- ...]] [``colcon-core``]
99
A list of event handlers to enable (trailing ``+``) or disable (trailing
1010
``-``).
1111
The default is chosen by each available event handler (see

reference/executor-arguments.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ For each argument the name in brackets indicates which package contributes it.
77

88
.. _executor-args_executor_arg:
99

10-
\\--executor EXECUTOR [``colcon-core``]
10+
\--executor EXECUTOR [``colcon-core``]
1111
The executor to process all jobs.
1212
The default is chosen based on the priorities of all available executor
1313
extensions.
@@ -28,7 +28,7 @@ For each argument the name in brackets indicates which package contributes it.
2828

2929
.. _executor-args_parallel-workers_arg:
3030

31-
\\--parallel-workers NUMBER [``colcon-parallel-executor``]
31+
\--parallel-workers NUMBER [``colcon-parallel-executor``]
3232
The maximum number of jobs to process in parallel.
3333
The default value is the number of logical CPU cores as reported by
3434
`os.cpu_count() <https://docs.python.org/3/library/os.html#os.cpu_count>`_.

reference/global-arguments.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ For each argument the name in brackets indicates which package contributes it.
99

1010
.. _colcon_log-base_arg:
1111

12-
\\--log-base LOG_BASE [``colcon-core``]
12+
\--log-base LOG_BASE [``colcon-core``]
1313
The base path for all log directories.
1414
The default value is ``./log``.
1515
To completely disable logging, pass ``/dev/null`` (on POSIX) / ``nul`` (on
@@ -48,7 +48,7 @@ For each argument the name in brackets indicates which package contributes it.
4848

4949
.. _colcon_log-level_arg:
5050

51-
\\--log-level LOG_LEVEL [``colcon-core``]
51+
\--log-level LOG_LEVEL [``colcon-core``]
5252
Set the log level for the console output.
5353
The log file ``<log-dir>/logger_all.log`` always contains messages of all
5454
levels.

reference/mixin-arguments.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ The following arguments are provided by the ``colcon-mixin`` package:
88

99
.. _mixin-args_mixin-files_arg:
1010

11-
\\--mixin-files [FILE [FILE ...]]
11+
\--mixin-files [FILE [FILE ...]]
1212
Read additional mixin files and make the mixin names specified in them
1313
available in the ``--mixin`` argument.
1414

1515
.. _mixin-args_mixin_arg:
1616

17-
\\--mixin [mixin1 [mixin2 ...]]
17+
\--mixin [mixin1 [mixin2 ...]]
1818
The names of mixins to be used.
1919
The list of mixin names and their command line arguments depends on which
2020
ones are available.

reference/package-selection-arguments.rst

+19-19
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ For each argument the name in brackets indicates which package contributes it.
99

1010
.. _package-selection-args_build-base_arg:
1111

12-
\\--build-base BUILD_BASE
12+
\--build-base BUILD_BASE
1313
The base path for all build directories.
1414
The default value is ``./build``.
1515
Each package uses a subdirectory in that base path as its package specific
@@ -21,101 +21,101 @@ For each argument the name in brackets indicates which package contributes it.
2121

2222
.. _package-selection-args_packages-up-to_arg:
2323

24-
\\--packages-up-to [PKG_NAME [PKG_NAME ...]]
24+
\--packages-up-to [PKG_NAME [PKG_NAME ...]]
2525
Select the packages with the passed names as well as their recursive
2626
dependencies.
2727

2828
.. _package-selection-args_packages-up-to-regex_arg:
2929

30-
\\--packages-up-to-regex [PATTERN [PATTERN ...]]
30+
\--packages-up-to-regex [PATTERN [PATTERN ...]]
3131
Select the packages that match any of the passed patterns as well as their
3232
recursive dependencies.
3333

3434
.. _package-selection-args_packages-above_arg:
3535

36-
\\--packages-above [PKG_NAME [PKG_NAME ...]]
36+
\--packages-above [PKG_NAME [PKG_NAME ...]]
3737
Select the packages with the passed names as well as packages which
3838
recursively depend on them.
3939

4040
.. _package-selection-args_packages-above-and-dependencies_arg:
4141

42-
\\--packages-above-and-dependencies [PKG_NAME [PKG_NAME ...]]
42+
\--packages-above-and-dependencies [PKG_NAME [PKG_NAME ...]]
4343
Select the packages with the passed names, packages which
4444
recursively depend on them as well as their recursive dependencies.
4545

4646
.. _package-selection-args_packages-above-depth_arg:
4747

48-
\\--packages-above-depth DEPTH [PKG_NAME ...]
48+
\--packages-above-depth DEPTH [PKG_NAME ...]
4949
Select the packages with the passed names as well as packages which
5050
recursively depend on them up to the given depth.
5151

5252
.. _package-selection-args_packages-by-dep_arg:
5353

54-
\\--packages-select-by-dep [DEP_NAME [DEP_NAME ...]]
54+
\--packages-select-by-dep [DEP_NAME [DEP_NAME ...]]
5555
Select packages which (recursively) depend on the given packages.
5656

5757
.. _package-selection-args_packages-skip-by-dep_arg:
5858

59-
\\--packages-skip-by-dep [DEP_NAME [DEP_NAME ...]]
59+
\--packages-skip-by-dep [DEP_NAME [DEP_NAME ...]]
6060
Skip packages which (recursively) depend on the given packages.
6161

6262
.. _package-selection-args_packages-skip-up-to_arg:
6363

64-
\\--packages-skip-up-to [PKG_NAME [PKG_NAME ...]]
64+
\--packages-skip-up-to [PKG_NAME [PKG_NAME ...]]
6565
Skip the packages with the passed names as well as their recursive
6666
dependencies.
6767

6868
.. _package-selection-args_packages-select-build-failed_arg:
6969

70-
\\--packages-select-build-failed
70+
\--packages-select-build-failed
7171
Select packages which have failed to build previously.
7272
Packages which have been aborted previously are not included.
7373

7474
.. _package-selection-args_packages-skip-build-finished_arg:
7575

76-
\\--packages-skip-build-finished
76+
\--packages-skip-build-finished
7777
Skip packages which have finished to build previously.
7878

7979
.. _package-selection-args_packages-select-test-failures_arg:
8080

81-
\\--packages-select-test-failures
81+
\--packages-select-test-failures
8282
Select packages which had test failures previously.
8383

8484
.. _package-selection-args_packages-skip-test-passed_arg:
8585

86-
\\--packages-skip-test-passed
86+
\--packages-skip-test-passed
8787
Skip packages which had no test failures previously.
8888

8989
.. _package-selection-args_packages-select_arg:
9090

91-
\\--packages-select [PKG_NAME [PKG_NAME ...]]
91+
\--packages-select [PKG_NAME [PKG_NAME ...]]
9292
Select the packages with the passed names.
9393

9494
.. _package-selection-args_packages-skip_arg:
9595

96-
\\--packages-skip [PKG_NAME [PKG_NAME ...]]
96+
\--packages-skip [PKG_NAME [PKG_NAME ...]]
9797
Skip the packages with the passed names.
9898

9999
.. _package-selection-args_packages-select-regex_arg:
100100

101-
\\--packages-select-regex [PATTERN [PATTERN ...]]
101+
\--packages-select-regex [PATTERN [PATTERN ...]]
102102
Select the packages where any of the patterns match the package name.
103103

104104
.. _package-selection-args_packages-skip-regex_arg:
105105

106-
\\--packages-skip-regex [PATTERN [PATTERN ...]]
106+
\--packages-skip-regex [PATTERN [PATTERN ...]]
107107
Skip the packages where any of the patterns match the package name.
108108

109109
.. _package-selection-args_packages-start_arg:
110110

111-
\\--packages-start PKG_NAME
111+
\--packages-start PKG_NAME
112112
Skip packages before the given package name in flat topological ordering.
113113
This option only makes sense when using the
114114
:ref:`sequential executor <executor-args_executor_arg_sequential>`.
115115

116116
.. _package-selection-args_packages-end_arg:
117117

118-
\\--packages-end PKG_NAME
118+
\--packages-end PKG_NAME
119119
Skip packages after the given package name in flat topological ordering.
120120
This option only makes sense when using the
121121
:ref:`sequential executor <executor-args_executor_arg_sequential>`.

0 commit comments

Comments
 (0)