Skip to content

Commit

Permalink
Ready for 1.8.5 release (#544)
Browse files Browse the repository at this point in the history
* Fix History.

* Fix README.rst

* Description still getting rejected.

* Ready for 1.8.5

Co-authored-by: phaesler <[email protected]>
  • Loading branch information
SpacemanPaul and phaesler authored Mar 25, 2021
1 parent 6db18aa commit a46939f
Show file tree
Hide file tree
Showing 4 changed files with 86 additions and 20 deletions.
53 changes: 50 additions & 3 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,56 @@ History

* Reconcile package version number with git managed version number

1.8.0 (2020-?-?)
----------------
1.8.0 (2020-06-10)
------------------

* Synchronise minor version number with datacube-core.
* Materialised spatio-temporal views for ranges.
* WCS2 support.
* WCS2 support.

1.8.1 (2020-08-18)
------------------

* Bug fixes
* Performance enhancements - most notable using materialised views for spatio-temporal DB searches.
* Improved testing and documentation.


1.8.2 (2020-10-26)
------------------

* Config inheritance for layers and styles.
* CRS aliases
* Enhanced band util functions.
* Query stats parameter.
* Stand-alone config parsing/validating tool.
* Cleaner internal APIs, improved test coverage, and bug fixes.


1.8.3 (2021-03-12)
------------------

* Generalised handling of WMTS tile matrix sets (#452)
* Progressive cache control headers (#476)
* Support for multi-product masking flags. (#499)
* Greatly improved test coverage (various)
* Many bug-fixes, documentation updates and minor enhancements (various)


1.8.4 (2021-03-19)
------------------

* Standalone API for OWS styling. (#523)
* Support for enumeration type bands in colour-map styles. (#529)
* Numerous bugfixes.
* Updated documentation.

1.8.5 (2021-03-25)
------------------

* Date delta can now control subtraction direction from config (#535)
* New helper functions in standalone API (#538)
* Bug fixes in standalone API. (#542, #543)
* First draft of new "HOWTO" Styling guide. (#540, #543)
* Miscellaneous cleanup. (#533, #534, #537, #541)
* Prep for PyPI (#544)
26 changes: 17 additions & 9 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
===============================
============
datacube-ows
===============================
============

.. image:: https://github.com/opendatacube/datacube-ows/workflows/Linting/badge.svg
:target: https://github.com/opendatacube/datacube-ows/actions?query=workflow%3ALinting
Expand All @@ -17,7 +17,7 @@ datacube-ows
.. image:: https://codecov.io/gh/opendatacube/datacube-ows/branch/master/graph/badge.svg
:target: https://codecov.io/gh/opendatacube/datacube-ows

Datacube Web Map Service
Datacube Open Web Services


* Free software: Apache Software License 2.0
Expand Down Expand Up @@ -201,10 +201,13 @@ Local Postgres database
2. run `datacube system init` after creating a datacube config file
3. A product added to your datacube `datacube product add url` some examples are here: https://github.com/GeoscienceAustralia/dea-config/tree/master/products
4. Index datasets into your product for example refer to https://datacube-ows.readthedocs.io/en/latest/usage.html
::
aws s3 ls s3://deafrica-data/jaxa/alos_palsar_mosaic/2017/ --recursive \
| grep yaml | awk '{print $4}' \
| xargs -n1 -I {} datacube dataset add s3://deafrica-data/{}

::

aws s3 ls s3://deafrica-data/jaxa/alos_palsar_mosaic/2017/ --recursive \
| grep yaml | awk '{print $4}' \
| xargs -n1 -I {} datacube dataset add s3://deafrica-data/{}

5. Write an ows config file to identify the products you want available in ows, see example here: https://github.com/opendatacube/datacube-ows/blob/master/datacube_ows/ows_cfg_example.py
6. Run `python3 https://github.com/opendatacube/datacube-ows/blob/master/update_ranges.py --schema` to create ows specific tables
7. Run update_ranges.py to generate ows extents `python3 update_ranges.py PRODUCT`
Expand All @@ -218,14 +221,18 @@ approach in most circumstances, but it may make sense for you.
If you use the ``pip install --pre`` approach described above, your OS's
pre-packaged python3 apache2-mod-wsgi package should suffice.

* Activate the wsgi module::
* Activate the wsgi module:

::

cd /etc/apache2/mods-enabled
ln -s ../mods-available/wsgi.load .
ln -s ../mods-available/wsgi.conf .

* Add the following to your Apache config (inside the
appropriate `VirtualHost` section)::
appropriate `VirtualHost` section):

::

WSGIDaemonProcess datacube_ows processes=20 threads=1 user=uuu group=ggg maximum-requests=10000
WSGIScriptAlias /datacube_ows /path/to/source_code/datacube-ows/datacube_ows/wsgi.py
Expand All @@ -252,3 +259,4 @@ This package was created with Cookiecutter_ and the `audreyr/cookiecutter-pypack

.. _Cookiecutter: https://github.com/audreyr/cookiecutter
.. _`audreyr/cookiecutter-pypackage`: https://github.com/audreyr/cookiecutter-pypackage

2 changes: 1 addition & 1 deletion datacube_ows/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
try:
from ._version import version as __version__
except ImportError:
__version__ = "1.8.4+?"
__version__ = "1.8.5+?"
25 changes: 18 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@

from setuptools import setup, find_packages

with open('README.rst') as readme_file:
readme = readme_file.read()

with open('HISTORY.rst') as history_file:
history = history_file.read()

requirements = [
'datacube',
'Flask',
Expand Down Expand Up @@ -46,7 +40,24 @@
setup(
name='datacube_ows',
description="Open Data Cube Open Web Services",
long_description=readme + '\n\n' + history,
long_description="""
============
datacube-ows
============
Open Web Services for the Open Datacube.
* Free software: Apache Software License 2.0
* Documentation: https://datacube-ows.readthedocs.io.
Features
--------
* Leverages the power of the Open Data Cube, including support for COGs on S3.
* Supports WMS and WMTS.
* Experimental support for WCS (1.0, 2.0, 2.1).
""",
author="Open Data Cube",
author_email='[email protected]',
url='https://github.com/opendatacube/datacube-ows',
Expand Down

0 comments on commit a46939f

Please sign in to comment.