Merge branch 'release-1.6.0'

* release-1.6.0:
  ADD needed adaptations to enable documentation builds using readthedocs.org
  Added some dependencies needed to fix fail executions with python-keystoneclient.
  fix: dev: fixing missing badges on README file
  updating version

README.rst

@@ -131,7 +131,7 @@ License
    :target: https://travis-ci.org/telefonicaid/fiware-cloto
 .. |Coverage Status| image:: https://coveralls.io/repos/telefonicaid/fiware-cloto/badge.png?branch=develop
    :target: https://coveralls.io/r/telefonicaid/fiware-cloto
-.. |Pypi Version| image:: https://pypip.in/v/fiware-cloto/badge.png
+.. |Pypi Version| image:: https://badge.fury.io/py/fiware-cloto.svg
    :target: https://pypi.python.org/pypi/fiware-cloto/
-.. |Pypi License| image:: https://pypip.in/license/fiware-cloto/badge.png
+.. |Pypi License| image:: https://img.shields.io/pypi/l/fiware-cloto.svg
    :target: https://pypi.python.org/pypi/fiware-cloto/

cloto/tests/acceptance_tests/component/tenant_information/features/retrieve_tenant_information.feature

@@ -11,7 +11,7 @@ Feature: Policy Manager information
       When I retrieve the tenant information
       Then I get the following information:
       | doc                                          | owner          | version | windowsize |
-      | https://forge.fi-ware.org/plugins/mediawiki/wiki/fiware/index.php/Policy_Manager_Open_RESTful_API_Specification | Telefonica I+D | 1.5.0     | 5          |
+      | https://forge.fi-ware.org/plugins/mediawiki/wiki/fiware/index.php/Policy_Manager_Open_RESTful_API_Specification | Telefonica I+D | 1.6.0     | 5          |
 
 
     Scenario Outline: Get not existant tenant information

cloto/tests/acceptance_tests/requirements.txt

@@ -1,5 +1,7 @@
 git+https://github.com/telefonicaid/lettuce-tools.git#egg=lettuce_tools
 bottle==0.11.6
 ujson==1.33
+lettuce==0.2.20
+testtools==0.9.34
 
 

conf.py

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+#
+# on_rtd is whether we are on readthedocs.org
+import os
+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+
+if not on_rtd:  # only import and set the theme if we're building docs locally
+    import sphinx_rtd_theme
+    html_theme = 'sphinx_rtd_theme'
+    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+
+# otherwise, readthedocs.org uses their theme by default, so no need to specify it
+
+project = 'Fiware-Cloto'

contents.rst

@@ -0,0 +1,8 @@
+.. toctree::
+   :glob:
+   :maxdepth: 2
+
+   User & Programmer Guide   <doc/user_guide>
+   Admin Guide               <doc/admin_guide>
+   Architecture              <doc/architecture>
+   Open Specification        <doc/open_spec>

index.rst

@@ -0,0 +1 @@
+.. include:: README.rst

requirements.txt

@@ -11,4 +11,7 @@ python-keystoneclient==1.3.0
 circus==0.9.2
 pika==0.9.13
 mysql-python==1.2.5
-
+oslo.config==1.13.0
+oslo.i18n==1.7.0
+oslo.serialization==1.6.0
+oslo.utils==1.7.0

settings/settings.py

@@ -51,7 +51,7 @@
 OWNER = u'Telefonica I+D'
 API_INFO_URL = u'https://forge.fi-ware.org/plugins/mediawiki/wiki/fiware/index.php/' \
                u'Policy_Manager_Open_RESTful_API_Specification'
-VERSION = u'1.5.0'
+VERSION = u'1.6.0'
 MAX_WINDOW_SIZE = 5
 LOGGING_PATH = u'/var/log/fiware-cloto'
 

sonar-project.properties

@@ -32,7 +32,7 @@ sonar.projectName=Policy Manager - Cloto
 sonar.projectKey=com.telefonica.iot:policymanager-cloto
 sonar.sources=./cloto
 sonar.dynamicAnalysis=reuseReports
-sonar.projectVersion=1.5.0
+sonar.projectVersion=1.6.0
 
 
 ### LANGUAGE