Merge remote-tracking branch 'origin/develop' into develop

Alignak-monitoring-contrib · May 25, 2018 · 46f5ac6 · 46f5ac6
2 parents 192dd2f + 08cc87b
commit 46f5ac6
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 31 deletions.
diff --git a/alignak_backend/app.py b/alignak_backend/app.py
@@ -2054,7 +2054,8 @@ def get_settings(prev_settings):
 
 settings['RESOURCE_METHODS'] = ['GET', 'POST', 'DELETE']
 settings['ITEM_METHODS'] = ['GET', 'PATCH', 'DELETE']
-settings['XML'] = False
+# settings['XML'] = False
+settings['JSON'] = True
 # Allow $regex in filtering ...
 # Default is ['$where', '$regex']
 settings['MONGO_QUERY_BLACKLIST'] = ['$where']

diff --git a/etc/settings.json b/etc/settings.json
@@ -16,6 +16,7 @@
   "RATE_LIMIT_PATCH": null,   /* Limit number of PATCH requests */
   "RATE_LIMIT_DELETE": null,  /* Limit number of DELETE requests */
 
+  "MONGO_URI": "mongodb:\/\/localhost:27017\/alignak-backend",
   "MONGO_HOST": "localhost",          /* Address of MongoDB */
   "MONGO_PORT": 27017,                /* port of MongoDB */
   "MONGO_DBNAME": "alignak-backend",  /* Name of database in MongoDB */

diff --git a/requirements.txt b/requirements.txt
@@ -11,12 +11,13 @@ flask-apscheduler
 six==1.11.0
 influxdb
 statsd
-# Force Flask version because Eve requires this!
-flask>=0.10.1,<=0.12
+# Force Flask version >= 1.0 because Eve recent version requires this!
+flask>=1.0
 # Force Werkzeug version because Eve requires this!
-werkzeug<=0.11.15
-# Set Eve as minimum 0.7.8 because 0.7.7 breaks the Travis build
-Eve>=0.7.8
+# werkzeug<=0.11.15
+# Set Eve as 0.7.9 because >=0.8.0 is not yet compatible
+Eve==0.7.9
 
 # uWSGI server - a recommended Web server to run the application in a production environment
+# uncomment this to install from the Python repository if not installed by the server packaging
 # uwsgi
diff --git a/test/requirements.py26.txt b/test/requirements.py26.txt
diff --git a/test/requirements.txt b/test/requirements.txt
@@ -3,20 +3,20 @@
 
 unittest2
 # Web test
-webtest
+WebTest==2.0.29
 # Use py.test as test-runner
-pytest
-pytest-cov
-# Let coverage use the most recent version
-coverage
+pytest==3.6.0
+pytest-cov==2.5.1
+# code coverage
+coverage==4.5.1
 # Report coverage results to coveralls.io
-coveralls
+coveralls==1.3.0
 # Static code analysis libraries
-pylint
-pycodestyle
-pep257
+pycodestyle==2.4.0
+pylint==1.9.1
+pep257==0.7.0
 # uWSGI server
-uwsgi
+uWSGI==2.0.17
 # Mock
-mock
-requests_mock
+mock==2.0.0
+requests-mock==1.4.0