update README, normalize text, abstract version

tomkralidis · tomkralidis · commit 7d0a7c893f5d · 2016-02-15T07:31:52.000-05:00
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -1,7 +1,9 @@
-Contributors to PyWPS-4
-=======================
+# Contributors to PyWPS
 
 * Jachym Cepicky [jachym] jachym.cepicky gmail com
 * Alex Morega [mgax] alex grep ro
 * Calin Ciociu [noctalin] calin.ciociu gmail com
 * Luís de Sousa [ldesousa] luis.a.de.sousa gmail com
+* Tom Kralidis [tomkralidis] tomkralidis gmail com
+
+Full list at <http://pywps.org/contributors>
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (C) 2014-2015 PyWPS Development Team, represented by Jachym Cepicky
+Copyright (C) 2014-2016 PyWPS Development Team, represented by Jachym Cepicky
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1 +1,2 @@
-recursive-include pywps/schemas *
+include *.txt
+recursive-include pywps/schemas *
diff --git a/README.md b/README.md
@@ -1,32 +1,25 @@
-pywps-4
-=======
+# PyWPS 
 
-New version of PyWPS, written from scratch.
+PyWPS is an implementation of the Web Processing Service standard from
+the Open Geospatial Consortium. PyWPS is written in Python.
 
-* [Documentation](http://pywps.rtfd.org), hosted by ReadTheDocs.
-* Continuous integration with Travis: 
-  [![Build Status](https://travis-ci.org/PyWPS/pywps-4.png)](https://travis-ci.org/PyWPS/pywps-4)
+[![Documentation Status](https://readthedocs.org/projects/pywps/badge/?version=latest)](http://pywps.readthedocs.org/en/latest/?badge=latest)
+[![Build Status](https://travis-ci.org/geopython/pywps.png)](https://travis-ci.org/geopython/pywps)
+[![PyPI](https://img.shields.io/pypi/dm/pywps.svg)]()
+[![GitHub license](https://img.shields.io/github/license/geopython/pywps.svg)]()
+[![Gitter Chat](http://img.shields.io/badge/chat-online-brightgreen.svg)](https://gitter.im/PyWPS)
 
-* Chat: https://gitter.im/PyWPS
+# License
 
-License
-=======
+As of PyWPS 4.0.0, PyWPS is released under an
+[MIT](https://en.wikipedia.org/wiki/MIT_License) license
+(see [LICENSE.txt](LICENSE.txt)).
 
-Short version: [MIT](https://en.wikipedia.org/wiki/MIT_License)
-Long version: see [LICENSE.txt](LICENSE.txt) file
+# Dependencies
 
-Dependencies
-============
+See [requirements.txt](requirements.txt) file
 
-* lxml (http://lxml.de)
-* werkzeug (http://werkzeug.pocoo.org)
-* libxml2-dev, libxslt1-dev
-* GDAL (http://www.gdal.org/)
-* owslib (http://geopython.github.io/OWSLib/)
-* jsonschema (http://json-schema.org/)
-
-Run tests
-=========
+# Run tests
 
 Install and run [tox](http://testrun.org/tox/latest/):
 
@@ -41,11 +34,9 @@ Or run the tests by hand, with either Python 2 or 3:
 python tests/__init__.py
 ```
 
-Run web application
-===================
+# Run web application
 
-Demo application
-----------------
+## Demo application
 
 Clone PyWPS-4 recursively with the demo application:
 
@@ -64,8 +55,7 @@ cd demo/
 python demo.py
 ```
  
-Apache configuration
---------------------
+## Apache configuration
 
 1. Enable WSGI extension
 
@@ -104,18 +94,17 @@ Apache configuration
 
 4. Run via web browser
 
-    `http://localhost/pywps/?service=wps&request=GetCapabilities&version=1.0.0`
+    `http://localhost/pywps/?service=WPS&request=GetCapabilities&version=1.0.0`
 
 5. Run in command line:
   
     ```bash
-    curl 'http://localhost/pywps/?service=wps&request=GetCapabilities&version=1.0.0'
+    curl 'http://localhost/pywps/?service=WPS&request=GetCapabilities&version=1.0.0'
     ```
 
 
-Issues
-======
+# Issues
 
-On Windows PyWPS-4 does not support multiprocessing which is used when making
-requests storing the response document and updating the status to displaying to the user
-the progression of a process.
+On Windows PyWPS does not support multiprocessing which is used when making
+requests storing the response document and updating the status to displaying
+to the user the progression of a process.
diff --git a/VERSION.txt b/VERSION.txt
@@ -0,0 +1 @@
+4.0.0-alpha2
diff --git a/docs/conf.py b/docs/conf.py
@@ -1,11 +1,41 @@
-# encoding: utf-8
+###############################################################################
+#
+# Copyright (C) 2014-2016 PyWPS Development Team, represented by Jachym Cepicky
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#
+###############################################################################
 
-import sys, os
+import sys
 
 project = u'PyWPS'
-copyright = u'2013, Jachym Cepicky'
-version = '4.0'
-release = '4.0'
+
+license = ('This work is licensed under a Creative Commons Attribution 4.0 ',
+           'International License')
+
+copyright = ('Copyright (C) 2014-2016 PyWPS Development Team, ',
+             'represented by Jachym Cepicky.' + license)
+
+with open('../VERSION.txt') as f:
+    version = f.read().strip()
+
+release = version
 latex_logo = 'pywps.png'
 
 extensions = ['sphinx.ext.autodoc']
@@ -23,8 +53,10 @@
 class Mock(object):
     def __init__(self, *args, **kwargs):
         pass
+
     def __call__(self, *args, **kwargs):
         return Mock()
+
     @classmethod
     def __getattr__(cls, name):
         if name in ('__file__', '__path__'):
diff --git a/pywps/__init__.py b/pywps/__init__.py
@@ -4,7 +4,7 @@
 responses back to client.
 """
 # Author:    Alex Morega & Calin Ciociu
-#            
+#
 # License:
 #
 # Web Processing Service implementation
@@ -16,10 +16,10 @@
 # rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
 # sell copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -31,7 +31,7 @@
 import os
 from lxml.builder import ElementMaker
 
-__version__ = '4.0.0-dev'
+__version__ = '4.0.0-alpha2'
 
 
 PYWPS_INSTALL_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -88,4 +88,3 @@
 
 if __name__ == "__main__":
     pass
-
diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright (C) 2014-2015 PyWPS Development Team, represented by Jachym Cepicky
+# Copyright (C) 2014-2016 PyWPS Development Team, represented by Jachym Cepicky
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -29,15 +29,38 @@
 except ImportError:
     from distutils.core import setup
 
-DESCRIPTION = 'PyWPS - Python implementation of OGC Web Processing Service'
+with open('VERSION.txt') as ff:
+    VERSION = ff.read().strip()
+
+DESCRIPTION = ('PyWPS is an implementation of the Web Processing Service '
+               'standard from the Open Geospatial Consortium. PyWPS is '
+               'written in Python.')
+
+KEYWORDS = 'PyWPS WPS OGC processing'
 
 CONFIG = {
+    'name': 'pywps',
+    'version': VERSION,
     'description': DESCRIPTION,
+    'keywords': KEYWORDS,
+    'license': 'MIT',
+    'platforms': 'all',
     'author': 'Jachym Cepicky',
-    'url': 'http://pywps.org',
-    'download_url': 'https://github.com/PyWPS/pywps-4',
     'author_email': 'jachym.cepicky@gmail.com',
-    'version': '4.0',
+    'maintainer': 'Jachym Cepicky',
+    'maintainer_email': 'jachym.cepicky@gmail.com',
+    'url': 'http://pywps.org',
+    'download_url': 'https://github.com/geopython/pywps',
+    'classifiers': [
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Web Environment',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Science/Research',
+        'License :: OSI Approved :: MIT License',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Topic :: Scientific/Engineering :: GIS'
+    ],
     'install_requires': [
         'lxml',
         'werkzeug',
@@ -54,7 +77,6 @@
         'pywps/inout/formats'
     ],
     'scripts': [],
-    'name': 'pywps'
 }
 
 if sys.version_info.major < 3:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (C) 2014-2015 PyWPS Development Team, represented by Jachym Cepicky`
	`1`	`+Copyright (C) 2014-2016 PyWPS Development Team, represented by Jachym Cepicky`
`2`	`2`
`3`	`3`	`Permission is hereby granted, free of charge, to any person obtaining a copy`
`4`	`4`	`of this software and associated documentation files (the "Software"), to`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-recursive-include pywps/schemas *`
	`1`	`+include *.txt`
	`2`	`+recursive-include pywps/schemas *`