Merge pull request #427 from opendatacube/version_in_index_page

Report version in index page.
opendatacube · Sep 30, 2020 · c145134 · c145134
2 parents 2efca98 + 3d2faeb
commit c145134
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,4 +1,3 @@
 datacube_wms/wms_cfg_local.py
 .pytest_cache
-*/__pycache__
-.git
+*/__pycache__
diff --git a/Dockerfile b/Dockerfile
@@ -16,6 +16,7 @@ RUN mkdir -p /code
 WORKDIR /code
 ADD . /code
 
+RUN echo "version=\"`python setup.py --version`\"" > datacube_ows/_version.py
 RUN pip install .
 
 

diff --git 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
@@ -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
@@ -35,11 +35,9 @@
 </head>
 
 <body>
-    <!-- Just an image -->
     <nav class="navbar navbar-light bg-light">
         <a class="navbar-brand" href="#">
-            <!-- <img src="https://docs.dea.ga.gov.au/_static/dea-logo-inline.svg" height="60" alt="{{ cfg.title }} (datacube-ows)" loading="lazy"> -->
-            {{ cfg.title }} (datacube-ows)
+            {{ cfg.title }} (datacube-ows v{{ version }})
         </a>
     </nav>
     <div class="jumbotron jumbotron-fluid" style="background-color: rgba(233, 236, 239, 0.6);">

diff --git a/requirements.txt b/requirements.txt
@@ -31,4 +31,5 @@ blinker
 pyows
 owslib
 pytest-helpers-namespace
-prometheus-flask-exporter
+prometheus-flask-exporter
+setuptools_scm
diff --git a/setup.py b/setup.py
@@ -33,7 +33,9 @@
     'geoalchemy',
     'xarray',
     'pyows',
-    'prometheus-flask-exporter'
+    'prometheus-flask-exporter',
+    #
+    'setuptools_scm'
 ]
 
 test_requirements = [
@@ -68,6 +70,8 @@
         'Natural Language :: English',
         'Programming Language :: Python :: 3.5',
     ],
+    setup_requires=['setuptools_scm'],
+    use_scm_version=True,
     test_suite='tests',
     tests_require=test_requirements
 )