From 24772dfea6f4751540d28d970b0d7041ef41f5b5 Mon Sep 17 00:00:00 2001 From: phaesler Date: Tue, 29 Sep 2020 10:10:01 +1000 Subject: [PATCH 1/5] Report version in index page. --- datacube_ows/__init__.py | 2 +- datacube_ows/ogc.py | 9 ++++++++- datacube_ows/templates/index.html | 4 +--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/datacube_ows/__init__.py b/datacube_ows/__init__.py index 08f1df4d0..655fbbf80 100644 --- a/datacube_ows/__init__.py +++ b/datacube_ows/__init__.py @@ -1,4 +1,4 @@ try: from ._version import version as __version__ except ImportError: - __version__ = "Unknown - 1.8.x+?" + __version__ = "1.8.1+?" diff --git a/datacube_ows/ogc.py b/datacube_ows/ogc.py index d18473bb4..34b4f211f 100644 --- a/datacube_ows/ogc.py +++ b/datacube_ows/ogc.py @@ -6,6 +6,7 @@ from flask import g, render_template, request from flask_log_request_id import current_request_id +from datacube_ows import __version__ from datacube_ows.legend_generator import create_legend_for_style from datacube_ows.ogc_utils import capture_headers, resp_headers, get_service_base_url, lower_get_args from datacube_ows.wms import WMS_REQUESTS @@ -73,7 +74,13 @@ def ogc_impl(): cfg = get_config() url = nocase_args.get('Host', nocase_args['url_root']) base_url = get_service_base_url(cfg.allowed_urls, url) - return (render_template("index.html", cfg=cfg, supported=OWS_SUPPORTED, base_url=base_url), + return (render_template( + "index.html", + cfg=cfg, + supported=OWS_SUPPORTED, + base_url=base_url, + version=__version__, + ), 200, resp_headers({"Content-Type": "text/html"})) except OGCException as e: diff --git a/datacube_ows/templates/index.html b/datacube_ows/templates/index.html index ed6faa991..870d8ce33 100644 --- a/datacube_ows/templates/index.html +++ b/datacube_ows/templates/index.html @@ -35,11 +35,9 @@ -
From 6a7d5fa7042209a4d8869736055df1fbfc8aec40 Mon Sep 17 00:00:00 2001 From: phaesler Date: Tue, 29 Sep 2020 10:27:45 +1000 Subject: [PATCH 2/5] Legacy setuptools support. --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index aced87f4e..746abf9e4 100644 --- a/setup.py +++ b/setup.py @@ -68,6 +68,8 @@ 'Natural Language :: English', 'Programming Language :: Python :: 3.5', ], + setup_requires=['setuptools_scm'], + use_scm_version=True, test_suite='tests', tests_require=test_requirements ) From 68ae86f540c672219dac232b5aac2d6fc8c74a74 Mon Sep 17 00:00:00 2001 From: phaesler Date: Tue, 29 Sep 2020 10:47:19 +1000 Subject: [PATCH 3/5] Docker build problem? --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 746abf9e4..49b5a529e 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,9 @@ 'geoalchemy', 'xarray', 'pyows', - 'prometheus-flask-exporter' + 'prometheus-flask-exporter', + # + 'setuptools_scm' ] test_requirements = [ From 2760175bff725a8814625784083f68fae93a705e Mon Sep 17 00:00:00 2001 From: phaesler Date: Wed, 30 Sep 2020 14:30:47 +1000 Subject: [PATCH 4/5] SCM Docker build problem. --- .dockerignore | 3 +-- Dockerfile | 3 +++ requirements.txt | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.dockerignore b/.dockerignore index 08cf3eb62..ac899de76 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,3 @@ datacube_wms/wms_cfg_local.py .pytest_cache -*/__pycache__ -.git \ No newline at end of file +*/__pycache__ \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 425b1f9af..f991a1eab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,9 @@ RUN mkdir -p /code WORKDIR /code ADD . /code +RUN ls -la /code + +RUN echo "version=\"`python setup.py --version`\"" > datacube_ows/_version.py RUN pip install . diff --git a/requirements.txt b/requirements.txt index e6e0f9e64..347f85e37 100644 --- a/requirements.txt +++ b/requirements.txt @@ -31,4 +31,5 @@ blinker pyows owslib pytest-helpers-namespace -prometheus-flask-exporter \ No newline at end of file +prometheus-flask-exporter +setuptools_scm \ No newline at end of file From 3d2faeb2faa68d0b27f7594e62e71163f7f4aa4f Mon Sep 17 00:00:00 2001 From: phaesler Date: Wed, 30 Sep 2020 14:52:28 +1000 Subject: [PATCH 5/5] Remove unneeded diagnostic ls. --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f991a1eab..efb4c561f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,8 +16,6 @@ RUN mkdir -p /code WORKDIR /code ADD . /code -RUN ls -la /code - RUN echo "version=\"`python setup.py --version`\"" > datacube_ows/_version.py RUN pip install .