Skip to content

Commit

Permalink
Merge branch 'master' into update-magpie-twitcher
Browse files Browse the repository at this point in the history
  • Loading branch information
fmigneault authored Sep 10, 2024
2 parents 6fdba45 + a38b4c5 commit 44a073a
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
6 changes: 5 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ Links to other issues or sources.
<!--
The test suite can be run using a different DACCS config with ``birdhouse_daccs_configs_branch: branch_name`` in the PR description.
To globally skip the test suite regardless of the commit message use ``birdhouse_skip_ci`` set to ``true`` in the PR description.
Note that using ``[skip ci]``, ``[ci skip]`` or ``[no ci]`` in the commit message will override ``birdhouse_skip_ci`` from the PR description.
Using ``[<cmd>]`` (with the brackets) where ``<cmd> = skip ci`` in the commit message will override ``birdhouse_skip_ci`` from the PR description.
Such commit command can be used to override the PR description behavior for a specific commit update.
However, a commit message cannot 'force run' a PR which the description turns off the CI.
To run the CI, the PR should instead be updated with a ``true`` value, and a running message can be posted in following PR comments to trigger tests once again.
-->

birdhouse_daccs_configs_branch: master
Expand Down
18 changes: 17 additions & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -357,4 +357,20 @@


# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {'https://docs.python.org/': None}
intersphinx_mapping = {
'python': ('http://docs.python.org/', None),
'phoenix': ('https://pyramid-phoenix.readthedocs.io/en/latest/', None),
'malleefowl': ('https://malleefowl.readthedocs.io/en/latest/', None),
'weaver': ('https://pavics-weaver.readthedocs.io/en/latest/', None),
'magpie': ('https://pavics-magpie.readthedocs.io/en/latest/', None),
'twitcher': ('https://twitcher.readthedocs.io/en/latest/', None),
'flyingpigeon': ('https://flyingpigeon.readthedocs.io/en/latest/', None),
'hummingbird': ('https://birdhouse-hummingbird.readthedocs.io/en/latest/', None),
'finch': ('https://finch.readthedocs.io/en/latest/', None),
'raven': ('https://pavics-raven.readthedocs.io/en/latest/', None),
'emu': ('https://emu.readthedocs.io/en/latest/', None),
'pelican': ('https://github.com/bird-house/pelican', None),
'birdy': ('https://birdy.readthedocs.io/en/latest/', None),
'bootstrap': ('https://birdhousebuilderbootstrap.readthedocs.io/en/latest/', None),
'birdhouse-deploy': ('https://birdhouse-deploy.readthedocs.io/en/latest/', None),
}

0 comments on commit 44a073a

Please sign in to comment.