Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/ep10-config' into ep10-config
Browse files Browse the repository at this point in the history
  • Loading branch information
SpacemanPaul committed Nov 21, 2023
2 parents 4121bdc + bcb25f6 commit d22b228
Show file tree
Hide file tree
Showing 13 changed files with 268 additions and 257 deletions.
10 changes: 5 additions & 5 deletions docs/about/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ About
*****

.. toctree::
:caption: About
:caption: About

whats_new
glossary
licence
release_process
whats_new
glossary
license
release_process
1 change: 0 additions & 1 deletion docs/about/license.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ ODC License
***********

.. literalinclude::

../../LICENSE
9 changes: 0 additions & 9 deletions docs/api/grid-processing/gridWorkflow.rst

This file was deleted.

9 changes: 0 additions & 9 deletions docs/api/grid-processing/tile.rst

This file was deleted.

2 changes: 0 additions & 2 deletions docs/api/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ The following pages provide a full API reference for the ``datacube`` python lib
core-classes/metadataType
core-classes/range
core-classes/query
grid-processing/tile


.. toctree::
Expand Down Expand Up @@ -52,4 +51,3 @@ The following pages provide a full API reference for the ``datacube`` python lib
Amazon Web Services (AWS) <utilities/aws>
Writing GeoTIFFs <utilities/cogs>
utilities/dask
grid-processing/gridWorkflow
7 changes: 5 additions & 2 deletions docs/click_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,15 @@ class DatacubeDomain(Domain):
'click-help': ClickHelpDirective,
}

def merge_domaindata(self, docnames, otherdata):
pass # avoid errors on parallel builds


def setup(app):
app.add_config_value('click_utils_commands', {}, 'html')

app.add_domain(DatacubeDomain)
return {
'parallel_read_safe': False,
'parallel_write_safe': False,
'parallel_read_safe': True,
'parallel_write_safe': True,
}
12 changes: 8 additions & 4 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,14 @@
'inherited-members': True
}

extlinks = {'issue': ('https://github.com/opendatacube/datacube-core/issues/%s', 'issue '),
'pull': ('https://github.com/opendatacube/datacube-core/pulls/%s', 'PR ')}
extlinks = {'issue': ('https://github.com/opendatacube/datacube-core/issues/%s', 'issue %s'),
'pull': ('https://github.com/opendatacube/datacube-core/pulls/%s', 'PR %s')}

intersphinx_mapping = {
'python': ('https://docs.python.org/3', None),
'pandas': ('https://pandas.pydata.org/pandas-docs/stable/', None),
'numpy': ('https://docs.scipy.org/doc/numpy/', None),
'xarray': ('https://xarray.pydata.org/en/stable/', None),
'numpy': ('https://numpy.org/doc/stable/', None),
'xarray': ('https://docs.xarray.dev/en/stable/', None),
}

graphviz_output_format = 'svg'
Expand Down Expand Up @@ -260,6 +260,10 @@ def setup(app):
app.add_css_file('pygments.css')
app.add_css_file('custom.css')

app.add_object_type('confval', 'confval',
objname='configuration value',
indextemplate='pair: %s; configuration value')

app.connect("html-page-context", custom_page_funcs)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ This combinator enables performing transformations to raster data in their nativ
rasters to a common grid.

Transform (Data modifying)
-------------------------
--------------------------

This node applies an on-the-fly data transformation on the loaded data. The recipe
for a ``transform`` has the form:
Expand Down
4 changes: 0 additions & 4 deletions docs/installation/cli.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ The Open Data Cube offers a CLI for common administrative tasks related to the O
:prog: datacube-search
:show-nested:

.. click:: datacube.execution.worker:main
:prog: datacube-worker
:show-nested:


.. note::

Expand Down
Loading

0 comments on commit d22b228

Please sign in to comment.