Merge remote-tracking branch 'upstream/master' into docker_extension

Author: lazaa32

CODE_OF_CONDUCT.md

@@ -40,7 +40,7 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://contributor-covenant.org/version/1/4][version]
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+[homepage]: https://contributor-covenant.org
+[version]: https://contributor-covenant.org/version/1/4/

CONTRIBUTING.rst

@@ -3,7 +3,7 @@ Contributing to PyWPS
 
 The PyWPS project openly welcomes contributions (bug reports, bug fixes, code
 enhancements/features, etc.).  This document will outline some guidelines on
-contributing to PyWPS.  As well, the PyWPS `community <http://pywps.org/community>`_ is a
+contributing to PyWPS.  As well, the PyWPS `community <https://pywps.org/community>`_ is a
 great place to get an idea of how to connect and participate in the PyWPS community
 and development.
 
@@ -17,7 +17,7 @@ Code of Conduct
 
 Contributors to this project are expected to act respectfully towards others in
 accordance with the `OSGeo Code of Conduct
-<http://www.osgeo.org/code_of_conduct>`_.
+<https://www.osgeo.org/code_of_conduct>`_.
 
 Contributions and Licensing
 ---------------------------
@@ -82,7 +82,7 @@ Documentation
 
 - documentation is managed in ``docs/``, in reStructuredText format
 - `Sphinx`_ is used to generate the documentation
-- See the `reStructuredText Primer <http://sphinx-doc.org/rest.html>`_ on rST
+- See the `reStructuredText Primer <http://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html>`_ on rST
   markup and syntax
 
 Bugs
@@ -119,7 +119,7 @@ GitHub Commit Guidelines
 - Git commits shall include the GitHub issue number (i.e. ``#1234``) in the Git
   commit log message
 - all enhancements or bug fixes must successfully pass all
-  `OGC CITE <http://cite.opengeospatial.org>`_ tests before they are committed
+  `OGC CITE <https://cite.opengeospatial.org>`_ tests before they are committed
 - all enhancements or bug fixes must successfully pass all tests
   before they are committed
 - enhancements which can be demonstrated from the PyWPS tests should be
@@ -139,7 +139,7 @@ Submitting a Pull Request
 
 This section will guide you through steps of working on PyWPS.  This section
 assumes you have forked PyWPS into your own GitHub repository. Note that 
-``develop`` is the main development branch in PyWPS; ``master`` is only used 
+``master`` is the main development branch in PyWPS.
 for stable releases and managed exclusively by the PyWPS team.
 
 .. code-block:: bash
@@ -155,9 +155,9 @@ for stable releases and managed exclusively by the PyWPS team.
 
   # add the main PyWPS development branch to keep up to date with upstream changes
   git remote add upstream https://github.com/geopython/pywps.git
-  git pull upstream develop
+  git pull upstream master
 
-  # create a local branch off develop
+  # create a local branch off master
   # The name of the branch should include the issue number if it exists
   git branch issue-72
   git checkout issue-72
@@ -180,8 +180,8 @@ master:
 
 .. code-block:: bash
 
-  git checkout develop
-  git pull upstream develop
+  git checkout master
+  git pull upstream master
 
 Release Packaging
 -----------------
@@ -193,7 +193,7 @@ Release packaging notes are maintained at https://github.com/geopython/pywps/wik
 .. _`Individual`: http://www.osgeo.org/sites/osgeo.org/files/Page/individual_contributor.txt
 .. _`[email protected]`: mailto:[email protected]
 .. _`OSGeo`: http://www.osgeo.org/content/foundation/legal/licenses.html
-.. _`PEP 8`: http://www.python.org/dev/peps/pep-0008/
-.. _`flake8`: https://flake8.readthedocs.org/en/latest/
+.. _`PEP 8`: https://www.python.org/dev/peps/pep-0008/
+.. _`flake8`: https://flake8.readthedocs.io/en/latest/
 .. _`Sphinx`: http://sphinx-doc.org/
-.. _`mailing list`: http://pywps.org/community
+.. _`mailing list`: https://pywps.org/community

README.md

@@ -3,7 +3,7 @@
 PyWPS is an implementation of the Web Processing Service standard from
 the Open Geospatial Consortium. PyWPS is written in Python.
 
-[![Documentation Status](https://img.shields.io/badge/docs-latest-brightgreen.svg)](http://pywps.readthedocs.org/en/latest/?badge=latest)
+[![Documentation Status](https://img.shields.io/badge/docs-latest-brightgreen.svg)](https://pywps.readthedocs.io/en/latest/?badge=latest)
 [![Build Status](https://travis-ci.org/geopython/pywps.png)](https://travis-ci.org/geopython/pywps)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/19d53c45a3854e37b89523cf9bb1d262)](https://www.codacy.com/project/cehbrecht/pywps/dashboard?utm_source=github.com&utm_medium=referral&utm_content=geopython/pywps&utm_campaign=Badge_Grade_Dashboard)
 [![Coverage Status](https://coveralls.io/repos/github/geopython/pywps/badge.svg?branch=master)](https://coveralls.io/github/geopython/pywps?branch=master)

debian/control

@@ -11,7 +11,7 @@ Package: python-pywps
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, python-pkg-resources, python-dateutil, python-flufl.enum, python-jsonschema, python-lxml, python-owslib, python-werkzeug
 Suggests: grass, apache2, apache
-Homepage: http://pywps.org
+Homepage: https://pywps.org
 Description: OGC Web Processing Service (WPS) Implementation
  PyWPS is an implementation of the Web Processing Service
  standard from the Open Geospatial Consortium. PyWPS is written in Python.

default-sample.cfg

@@ -6,7 +6,7 @@ identification_keywords_type=theme
 identification_fees=None
 identification_accessconstraints=None
 provider_name=PyWPS Developement team
-provider_url=http://pywps.org/'
+provider_url=https://pywps.org/'
 contact_name=Your Name
 contact_position=Developer
 contact_address=My Street
@@ -17,7 +17,7 @@ contact_country=World, Internet
 contact_phone=+00 00 11 22 33
 contact_fax=+00 99 88 77 66
 [email protected]
-contact_url=http://pywps.org
+contact_url=https://pywps.org
 contact_hours=8:00-20:00UTC
 contact_instructions=Knock on the door
 contact_role=pointOfContact

docs/configuration.rst

@@ -10,7 +10,7 @@ interpolation initialised using `os.environ`.
 .. versionadded:: 4.0.0
 .. warning:: Compatibility with PyWPS 3.x: major changes have been made
   to the config file in order to allow for shared configurations with `PyCSW
-  <http://pycsw.org/>`_ and other projects.
+  <https://pycsw.org/>`_ and other projects.
 
 The configuration file has several sections:
 
@@ -19,7 +19,7 @@ The configuration file has several sections:
     * `processing` for processing backend configuration
     * `logging` for logging configuration
     * `grass` for *optional* configuration to support `GRASS GIS
-      <http://grass.osgeo.org>`_
+      <https://grass.osgeo.org>`_
 
 PyWPS ships with a sample configuration file (``default-sample.cfg``).
 A similar file is also available in the `flask` service as
@@ -31,7 +31,7 @@ Copy the file to ``default.cfg`` and edit the following:
 ---------------
 
 The `[metadata:main]` section was designed according to the `PyCSW project
-configuration file <http://docs.pycsw.org/en/latest/configuration.html>`_.
+configuration file <https://docs.pycsw.org/en/latest/configuration.html>`_.
 
 :identification_title:
     the title of the service
@@ -170,7 +170,7 @@ configuration file <http://docs.pycsw.org/en/latest/configuration.html>`_.
 
 :level:
     the logging level (see
-    http://docs.python.org/library/logging.html#logging-levels)
+    https://docs.python.org/3/library/logging.html#logging-levels)
 
 :format:
     the format string used by the logging `:Formatter:` (see
@@ -182,7 +182,7 @@ configuration file <http://docs.pycsw.org/en/latest/configuration.html>`_.
     messages.
 
 :database:
-    Connection string to database where the login about requests/responses is to be stored. We are using `SQLAlchemy <http://docs.sqlalchemy.org/en/latest/core/engines.html#database-urls>`_
+    Connection string to database where the login about requests/responses is to be stored. We are using `SQLAlchemy <https://docs.sqlalchemy.org/en/latest/core/engines.html#database-urls>`_
     please use the configuration string. The default is SQLite3 `:memory:` object.
 
 
@@ -221,7 +221,7 @@ Sample file
   identification_fees=NONE
   identification_accessconstraints=NONE
   provider_name=Organization Name
-  provider_url=http://pywps.org/
+  provider_url=https://pywps.org/
   contact_name=Lastname, Firstname
   contact_position=Position Title
   contact_address=Mailing Address

docs/deployment.rst

@@ -129,7 +129,7 @@ Deployment on Nginx-Gunicorn
 
    For difference between WSGI server consult:  `WSGI comparison <https://www.digitalocean.com/community/tutorials/a-comparison-of-web-servers-for-python-based-web-applications>`_.
 
-   uWSGU is more popular than gunicorn, best documentation is probably to be found at `Readthedocs <http://uwsgi-docs.readthedocs.io/en/latest/WSGIquickstart.html>`_.
+   uWSGU is more popular than gunicorn, best documentation is probably to be found at `Readthedocs <https://uwsgi-docs.readthedocs.io/en/latest/WSGIquickstart.html>`_.
 
 We need nginx and gunicorn server::
 

docs/install.rst

@@ -46,7 +46,7 @@ Using pip
 
 
 Manual installation
-        Manual installation of PyWPS requires `downloading <http://pywps.org/download>`_ the
+        Manual installation of PyWPS requires `downloading <https://pywps.org/download>`_ the
         source code followed by usage of the `setup.py` script.  An example again for Debian based systems (note
         the usage of `sudo` for install)::
 

docs/migration.rst

@@ -15,7 +15,7 @@ processes in single files, although it's not required.
 Configuration file
 -------------------
 Configuration file format remains the same (it's the one used by `configparser <https://docs.python.org/3.6/library/configparser.html>`_ module). The sections are shift a bit, so they
-are more alike another GeoPython project - `pycsw <http://pycsw.org>`_.
+are more alike another GeoPython project - `pycsw <https://pycsw.org>`_.
 
 See section :ref:`configuration`.
 
@@ -67,7 +67,7 @@ Deployment
 While PyWPS 3.x was usually deployed as CGI application, PyWPS 4.x is configured
 as `WSGI` application. PyWPS 4.x is distributed without any processes or sample
 deploy script. We provide such example in our `pywps-flask
-<http://github.com/geopython/pywps-flask>`_ project.
+<https://github.com/geopython/pywps-flask>`_ project.
 
 .. note:: PYWPS_PROCESSES environment variable is gone, you have to assing
         processes to deploy script manually (or semi-automatically).
@@ -90,7 +90,7 @@ config values to each process class instance during it's definition.
 Sample processes
 ================
 For sample processes, please refer to `pywps-flask
-<http://github.com/geopython/pywps-flask>`_ project on GITHub.
+<https://github.com/geopython/pywps-flask>`_ project on GITHub.
 
 Needed steps summarization
 ==========================

docs/process.rst

@@ -60,7 +60,7 @@ Example vector buffer process
 
 As an example, we will create a *buffer* process - which will take a vector
 file as the input, create specified the buffer around the data (using `Shapely
-<http://toblerity.org/shapely/>`_),  and return back the result.
+<https://shapely.readthedocs.io>`_),  and return back the result.
 
 Therefore, the process will have two inputs:
 
@@ -120,7 +120,7 @@ Next we define the *handler* method. In it, *geospatial analysis
 may happen*. The method gets a :class:`pywps.app.WPSRequest` and a
 :class:`pywps.response.WPSResponse` object as parameters. In our case, we
 calculate the buffer around each vector feature using
-`GDAL/OGR library <http://gdal.org>`_. We will not got much into the details,
+`GDAL/OGR library <https://gdal.org>`_. We will not got much into the details,
 what you should note is how to get input data from the
 :class:`pywps.app.WPSRequest` object and how to set data as outputs in the
 :class:`pywps.response.WPSResponse` object.
@@ -421,5 +421,5 @@ is defined. In other words, if both `title` and `abstract` are given, only the `
 will be included in the documentation to avoid redundancy.
 
 .. _Flask: http://flask.pocoo.org
-.. _PyWPS-Flask: http://github.com/geopython/pywps-flask
-.. _Sphinx: http://sphinx-doc.org
+.. _PyWPS-Flask: https://github.com/geopython/pywps-flask
+.. _Sphinx: http://sphinx-doc.org