docs handling

EOxServer · Dec 23, 2022 · 6b66eca · 6b66eca
1 parent 935f1ef
commit 6b66eca
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 299 deletions.
diff --git a/documentation/Readme.md b/documentation/Readme.md
diff --git a/documentation/_static/ESA_logo.png b/documentation/_static/ESA_logo.png
diff --git a/documentation/_static/HMA_Logo.jpg b/documentation/_static/HMA_Logo.jpg
diff --git a/documentation/conf.py b/documentation/conf.py
@@ -12,10 +12,14 @@
 # serve to show the default.
 
 import sys, os
+import django
 
 from django.conf import settings
 
+sys.path.insert(0, os.path.abspath('..'))
+os.environ['DJANGO_SETTINGS_MODULE'] = 'autotest.settings'
 settings.configure(DEBUG=True, )
+django.setup()
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -29,7 +33,7 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.intersphinx']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.intersphinx', 'myst_parser']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']

diff --git a/documentation/credits.rst b/documentation/credits.rst
@@ -35,12 +35,8 @@
 Credits
 =======
 
-.. figure:: ./_static/HMA_Logo.jpg
-   :target: http://rssportal.esa.int/tiki-index.php?page=Open%20Software
+.. figure:: ./_static/ESA_logo.png
 
-Work on EOxServer has been partly funded by the `European Space Agency (ESA)`_
-in the frame of the HMA-FO_ and O3S_ projects.
+Work on EOxServer has been funded by the `European Space Agency (ESA)`_
 
-.. _European Space Agency (ESA): http://www.esa.int/esaMI/ESRIN_SITE/
-.. _HMA-FO: http://wiki.services.eoportal.org/tiki-index.php?page=HMA-FO
-.. _O3S: http://wiki.services.eoportal.org/tiki-index.php?page=O3S
+.. _European Space Agency (ESA): http://www.esa.int/
diff --git a/documentation/developers/index.rst b/documentation/developers/index.rst
@@ -44,9 +44,6 @@ configuring the software stack and operators registering the available *EO
 Data* on the *Provider* side to end users consuming the registered *EO Data*
 on the *User* side.
 
-.. figure:: ../users/images/Global_Use_Case.png
-   :align: center
-
 .. toctree::
    :maxdepth: 3
 
@@ -65,6 +62,3 @@ on the *User* side.
    atp_dev_guide
    testing
    code-style-guide
-
-.. TODO
-   processes
diff --git a/documentation/index.rst b/documentation/index.rst
@@ -33,33 +33,11 @@ EOxServer's Documentation
 EOxServer is a Python application and framework for presenting Earth
 Observation (EO) data and metadata.
 
-.. only:: html
-.. raw:: html
-
-  <p><script type="text/javascript" src="http://www.ohloh.net/p/489120/widgets/project_partner_badge.js"></script></p>
-
-EOxServer implements the `OGC <http://www.opengeospatial.org/>`_
-Implementation Specifications EO-WCS and EO-WMS on top of
-`MapServer's <http://mapserver.org>`_
-`WCS <http://www.opengeospatial.org/standards/wcs>`_ and
-`WMS <http://www.opengeospatial.org/standards/wms>`_ implementations.
-
-EOxServer is released under the
-:ref:`EOxServer Open License <EOxServer Open License>` a MIT-style
-license and written in `Python <http://www.python.org/>`_ and entirely based on
-Open Source software including `MapServer <http://mapserver.org>`_,
-`Django/GeoDjango <https://www.djangoproject.com>`_,
-`GDAL <http://www.gdal.org>`_,
-`SpatiaLite <http://www.gaia-gis.it/spatialite/>`_, or
-`PostGIS <http://postgis.refractions.net/>`_, and
-`PROJ.4 <http://trac.osgeo.org/proj/>`_.
-
-Here you find the documentation for users and developers of EOxServer
-written in English.
 
 .. toctree::
    :maxdepth: 1
 
+   readme
    users/index
    developers/index
    release_notes/index

diff --git a/documentation/readme.md b/documentation/readme.md
@@ -0,0 +1,2 @@
+```{include} ../README.md
+```
diff --git a/eoxserver/COMMITTERS b/eoxserver/COMMITTERS
diff --git a/eoxserver/COPYING b/eoxserver/COPYING
diff --git a/eoxserver/INSTALL b/eoxserver/INSTALL
diff --git a/eoxserver/README b/eoxserver/README
diff --git a/eoxserver/services/auth/charonpdp.py b/eoxserver/services/auth/charonpdp.py
@@ -29,10 +29,10 @@
 import logging
 import os
 import datetime
-import httplib
+import httplib # TODO Python2 relic swap out
 import xml.dom.minidom
 import eoxserver
-from urlparse import urlparse
+from urllib.parse import urlparse
 
 from django.utils.six import iteritems
 
@@ -293,12 +293,7 @@ def _getPartAction(self, action):
     # Get XML snippet for the Environment part of the XACMLAuthzDecisionQuery
     def _getPartEnvironment(self):
         now = datetime.datetime.now()
-        formattedNow = now.strftime("%Y-%m-%dT%H:%M:%S.%f%z")
-        return template_attribute.format(attrib_current_date, \
-                                         dt_date, \
-                                         formattedNow)
-
-
+        formattedNow = now.strftime("%Y-%m-%dT%H:%M:%S.%f%z")urlparse
     # Get the full XACMLAuthzDecisionQuery
     def _getFullRequest(self, userAttributes, resourceAttributes, action):
         return template_request.format(self._getPartSubject(userAttributes), \

diff --git a/setup.py b/setup.py
@@ -107,11 +107,13 @@ def fullsplit(path, result=None):
         "python-keystoneclient<6.0.0",
         "python-swiftclient<5.0.0",
         "jsonfield",
-        "gunicorn"
+        "gunicorn",
+        "gdal",
+        "mapscript"
     ],
     extras_require={
         'dev': ['scipy', 'flake8', 'mypy', 'black'],
-        'docs': ['sphinx', 'sphinx_rtd_theme'],
+        'docs': ['sphinx', 'sphinx_rtd_theme', 'myst-parser'],
     },
     zip_safe=False,