fixing dependencies to latest pyros

pyros-dev · Apr 20, 2018 · d0c2144 · d0c2144
1 parent 19a9d56
commit d0c2144
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,4 @@
+sudo: false
 language: python
 
 branches:

diff --git a/requirements/ROS/indigo.txt b/requirements/ROS/indigo.txt
@@ -8,12 +8,11 @@
 # TESTS are outside the package : they dont need to match the system packages on the corresponding ROS DISTRO
 # since they willnot be distributed as part of the package.
 
-
 # Package Dependencies need to match ROS (or trusty's) package version
 
 Flask==0.10.1
 Flask-Cors==3.0.2
-Flask-Restfu==0.3.4
+Flask-Restful==0.3.4
 Flask-reverse-proxy==0.2.0
 click==6.2.0
 webargs==1.3.4

diff --git a/requirements/ROS/kinetic.txt b/requirements/ROS/kinetic.txt
@@ -16,7 +16,7 @@ Flask-Restful==0.3.4
 Flask-reverse-proxy==0.2.0
 click==6.2.0
 webargs==1.3.4
-pyros==0.4.1
+pyros==0.4.3
 #pyros_setup  # pyros should provide this...
 #pyros_config  # pyros should provide this...
 tornado==4.2.1

diff --git a/rostful/api_0_1/flask_views.py b/rostful/api_0_1/flask_views.py
@@ -9,8 +9,6 @@
 
 import time
 
-import pyros
-
 CONFIG_PATH = '_rosdef'
 SRV_PATH = '_srv'
 MSG_PATH = '_msg'
@@ -73,7 +71,6 @@ def get_query_bool(query_string, param_name):
 
 parser = FlaskParser()
 
-import urllib
 from pyros_common.exceptions import PyrosException
 
 from rostful.exceptions import ServiceNotFound, ServiceTimeout, WrongMessageFormat

diff --git a/rostful/api_0_1/index.py b/rostful/api_0_1/index.py
@@ -9,9 +9,6 @@
 import flask_restful as restful
 
 
-# Reference for package structure since this is a flask app : http://flask.pocoo.org/docs/0.10/patterns/packages/
-from .. import context
-
 from webargs.flaskparser import FlaskParser, use_kwargs
 from webargs import fields
 

diff --git a/rostful/frontend/flask_views.py b/rostful/frontend/flask_views.py
@@ -4,7 +4,7 @@
 import re
 
 # Reference for package structure since this is a flask app : http://flask.pocoo.org/docs/0.10/patterns/packages/
-from rostful import context
+from rostful import get_pyros_client
 
 import time
 
@@ -105,7 +105,7 @@ def ros_list():
     current_app.logger.debug('in ros_list ')
 
     try:
-        node_client = context.get_pyros_client()  # we retrieve pyros client from app context
+        node_client = get_pyros_client()  # we retrieve pyros client from app context
         return render_template(
                 'index.html',
                 pathname2url=urllib.pathname2url,

diff --git a/setup.py b/setup.py
@@ -60,7 +60,7 @@
         'Flask-reverse-proxy',
         'click>=6.2.0',
         'webargs>=1.3.4',
-        'pyros>=0.3.0',
+        'pyros>=0.4.3',
         #'pyros_setup>=0.1.5',  # pyros should provide this...
         #'pyros_config>=0.1.4',  # pyros should provide this...
         'tornado>=4.2.1, <5.0',  # untested with tornado > 5.0

diff --git a/tox.ini b/tox.ini
@@ -48,11 +48,11 @@ setenv =
 deps =
 
     indigo: -rrequirements/ROS/indigo.txt
-    latest: -rrequirements/tests.txt
+    indigo: -rrequirements/tests.txt
     indigo: -rrequirements/dev.txt
 
     kinetic: -rrequirements/ROS/kinetic.txt
-    latest: -rrequirements/tests.txt
+    kinetic: -rrequirements/tests.txt
     kinetic: -rrequirements/dev.txt
 
     latest: -rrequirements/tests.txt