Merge 922dbb6 into 4437134

README.md

@@ -1,8 +1,8 @@
 # AskOmics
 
-[![Build Status](https://travis-ci.org/askomics/askomics.svg?branch=master)](https://travis-ci.org/askomics/askomics)
-[![Coverage Status](https://coveralls.io/repos/github/askomics/askomics/badge.svg?branch=master)](https://coveralls.io/github/askomics/askomics?branch=master)
-![Docker Build](https://img.shields.io/docker/pulls/askomics/docker-askomics.svg)
+[![Build Status](https://travis-ci.org/askomics/askomics.svg?branch=federation)](https://travis-ci.org/askomics/askomics)
+[![Coverage Status](https://coveralls.io/repos/github/askomics/askomics/badge.svg?branch=federation)](https://coveralls.io/github/askomics/askomics?branch=federation)
+[![Docker Build](https://img.shields.io/docker/pulls/askomics/askomics.svg)](https://hub.docker.com/r/askomics/askomics/)
 
 ![Askomics logo](static/askomics.png)
 
@@ -114,6 +114,9 @@ Then, test can be run with
 ```
 ./venv/bin/python setup.py nosetests -a '!galaxy'
 ```
+##### Target a single file test
+
+./venv/bin/python setup.py nosetests -a '!galaxy' --tests askomics/test/askView_test.py 
 
 ##### With a html report coverage
 

askomics/__init__.py

@@ -8,7 +8,7 @@
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
-    my_session_factory = SignedCookieSessionFactory('itsaseekreet',timeout=1200)
+    my_session_factory = SignedCookieSessionFactory('itsaseekreet',timeout=1800)
 
     config = Configurator(settings=settings)
     config.set_session_factory(my_session_factory)
@@ -29,6 +29,10 @@ def main(global_config, **settings):
     config.add_route('empty_user_database', '/empty_user_database')
     config.add_route('list_user_graph', '/list_user_graph')
     config.add_route('delete_graph', '/delete_graph')
+    config.add_route('list_endpoints', '/list_endpoints')
+    config.add_route('delete_endpoints', '/delete_endpoints')
+    config.add_route('add_endpoint', '/add_endpoint')
+    config.add_route('enable_endpoints', '/enable_endpoints')
     config.add_route('getUserAbstraction', '/userAbstraction')
     config.add_route('sparqlquery', '/sparqlquery')
     config.add_route('getSparqlQueryInTextFormat', '/getSparqlQueryInTextFormat')
@@ -44,6 +48,7 @@ def main(global_config, **settings):
     config.add_route('load_gff_into_graph', '/load_gff_into_graph')
     config.add_route('load_ttl_into_graph', '/load_ttl_into_graph')
     config.add_route('load_bed_into_graph', '/load_bed_into_graph')
+    config.add_route('load_remote_data_into_graph', '/load_remote_data_into_graph')
 
     config.add_route('prefix_uri', '/prefix_uri')
     config.add_route('preview_ttl', '/preview_ttl')
@@ -57,8 +62,6 @@ def main(global_config, **settings):
     # Shortcuts and modules routes
     config.add_route('importShortcut', '/importShortcut')
     config.add_route('deleteShortcut', '/deleteShortcut')
-    config.add_route('modules', '/modules')
-    config.add_route('manage_module', '/manage_module')
 
     # Data upload routes
     # Inspired from https://github.com/blueimp/jQuery-File-Upload/ and https://github.com/grooverdan/pyramid-jQuery-File-Upload-demo/
@@ -80,6 +83,7 @@ def main(global_config, **settings):
     config.add_route('login_api_gie', '/login_api_gie')
     config.add_route('logout', '/logout')
     config.add_route('checkuser', '/checkuser')
+    config.add_route('nbUsers', '/nbUsers')
 
     # Administration
     config.add_route('get_users_infos', '/get_users_infos')
@@ -93,6 +97,9 @@ def main(global_config, **settings):
     config.add_route('api_key', '/api_key')
     config.add_route('del_apikey', '/del_apikey')
 
+    config.add_route('serverinformations', '/serverinformations')
+    config.add_route('cleantmpdirectory', '/cleantmpdirectory')
+
     # TODO no absolute path to static files
     # TODO check what is cors (iframe redirect?)
     # TODO check security (delete truc/../../../)