restructuring to extract tests, fix package dist, replace ros submodu…

…les with pips
pyros-dev · Jul 27, 2017 · a441052 · a441052
1 parent e4a8f3e
commit a441052
Show file tree

Hide file tree

Showing 84 changed files with 63 additions and 107 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,10 @@
 *.pyc
 build
+dist
 .tox
 .hypothesis
 *.egg-info
+.cache
+.idea
+__pycache__
+
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,6 @@
-[submodule "rosdeps/genmsg"]
-	path = rosdeps/genmsg
-	url = https://github.com/ros/genmsg.git
-[submodule "rosdeps/genpy"]
-	path = rosdeps/genpy
-	url = https://github.com/ros/genpy.git
-[submodule "rosdeps/std_msgs"]
-	path = rosdeps/std_msgs
+[submodule "tests/rosdeps/std_msgs"]
+	path = tests/rosdeps/std_msgs
 	url = https://github.com/ros/std_msgs.git
-[submodule "rosdeps/ros_comm_msgs"]
-	path = rosdeps/ros_comm_msgs
+[submodule "tests/rosdeps/ros_comm_msgs"]
+	path = tests/rosdeps/ros_comm_msgs
 	url = https://github.com/ros/ros_comm_msgs.git
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,3 @@
+# default
+include README.rst
+include setup.py
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,11 +1,14 @@
 gitchangelog
 twine
-pytest>=2.8.0,  # as per hypothesis requirement (careful with 2.5.1 on trusty)
-pytest-xdist,  # for --boxed (careful with the version it will be moved out of xdist)
-hypothesis>=3.0.1,  # to target xenial LTS version
-numpy>=1.8.2,  # from trusty version
-rosimport
+pytest>=2.8.0  # as per hypothesis requirement (careful with 2.5.1 on trusty)
+pytest-xdist  # for --boxed (careful with the version it will be moved out of xdist)
+hypothesis>=3.0.1  # to target xenial LTS version
+numpy>=1.8.2  # from trusty version
 
-# source access to latest filefinder from git ...
-#-e git+https://github.com/asmodehn/filefinder2.git#egg=filefinder2
-#-e git+https://github.com/asmodehn/rosimport.git#egg=rosimport
+# source access to latest filefinder and rosimport from git ...
+-e git+https://github.com/asmodehn/filefinder2.git#egg=filefinder2
+-e git+https://github.com/asmodehn/rosimport.git#egg=rosimport
+
+# ros dependencies (necessary when running tests from install)
+-e git+https://github.com/asmodehn/genmsg.git@setuptools#egg=ros_genmsg
+-e git+https://github.com/asmodehn/genpy.git@setuptools#egg=ros_genpy
diff --git a/msg b/msg
@@ -0,0 +1 @@
+pyros_msgs/msg
diff --git a/pyros_msgs/__init__.py b/pyros_msgs/__init__.py
@@ -1,15 +0,0 @@
-from __future__ import absolute_import, division, print_function
-# This is a namespace package to merge the ROS generated messages and the python subpackage sources
-# Note : this file must be loaded first in order for other subpackages to be found
-# Note : this works for development packages only if pyros_setup has been activated
-#        because it will put egg directories on pythonpath FIRST.
-
-# Ref : https://packaging.python.org/namespace_packages/
-
-# pkgutil does not seem, somehow, to be compatible with ROS devel space...
-# import pkgutil
-# __path__ = pkgutil.extend_path(__path__, __name__)
-
-# Be aware : https://github.com/jonparrott/namespace-pkg-tests/blob/master/table.md
-import pkg_resources
-pkg_resources.declare_namespace(__name__)

diff --git a/msg/OptionalFields.msg → pyros_msgs/msg/OptionalFields.msg b/msg/OptionalFields.msg → pyros_msgs/msg/OptionalFields.msg
diff --git a/pyros_msgs/opt_as_nested/opt_as_nested.py b/pyros_msgs/opt_as_nested/opt_as_nested.py
@@ -11,10 +11,6 @@
     make_typechecker_field_hidden,
 )
 
-import os
-import sys
-
-
 from .ros_mappings import typechecker_from_rosfield_opttype
 
 

diff --git a/pyros_msgs/typecheck/ros_mappings.py b/pyros_msgs/typecheck/ros_mappings.py
@@ -27,7 +27,7 @@
 
 import six
 
-from pyros_msgs.typecheck import (
+from .typechecker import (
     six_long,
     Accepter, Sanitizer, Array, Any, MinMax, CodePoint,
     TypeChecker,

diff --git a/ros-site/README.md b/ros-site/README.md
diff --git a/ros-site/genmsg.pth b/ros-site/genmsg.pth
diff --git a/ros-site/genpy.pth b/ros-site/genpy.pth
diff --git a/rosdeps/genmsg b/rosdeps/genmsg
diff --git a/rosdeps/genpy b/rosdeps/genpy
diff --git a/setup.py b/setup.py
@@ -204,7 +204,6 @@ def run(self):
     package_data={
         '': ['*.msg', '*.srv']
     },
-    namespace_packages=['pyros_msgs'],
     # this is better than using package data ( since behavior is a bit different from distutils... )
     #include_package_data=True,  # use MANIFEST.in during install.
     # Reference for optional dependencies : http://stackoverflow.com/questions/4796936/does-pip-handle-extras-requires-from-setuptools-distribute-based-sources
@@ -213,6 +212,7 @@ def run(self):
         'pyyaml>=3.10',  # genpy relies on this...
     ],
     tests_require=[
+        'filefinder2',
         'rosimport',  # we rely on this for generating ROS message if necessary before importing
         'pytest>=2.8.0',  # as per hypothesis requirement (careful with 2.5.1 on trusty)
         'pytest-xdist',  # for --boxed (careful with the version it will be moved out of xdist)

diff --git a/tests/opt_as_array/__init__.py b/tests/opt_as_array/__init__.py
diff --git a/tests/opt_as_nested/__init__.py b/tests/opt_as_nested/__init__.py
diff --git a/rosdeps/ros_comm_msgs → tests/rosdeps/ros_comm_msgs b/rosdeps/ros_comm_msgs → tests/rosdeps/ros_comm_msgs
diff --git a/rosdeps/std_msgs → tests/rosdeps/std_msgs b/rosdeps/std_msgs → tests/rosdeps/std_msgs
diff --git a/tests/__init__.py → tests/test_pyros_msgs/__init__.py b/tests/__init__.py → tests/test_pyros_msgs/__init__.py
diff --git a/tests/test_pyros_msgs/opt_as_array/__init__.py b/tests/test_pyros_msgs/opt_as_array/__init__.py
@@ -0,0 +1,17 @@
+from __future__ import absolute_import, division, print_function
+
+import os
+import sys
+import site
+
+added_site_dir = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), 'rosdeps')
+print("Adding site directory {0} to access genmsg, genpy and, std_msgs".format(added_site_dir))
+site.addsitedir(added_site_dir)
+
+# Using genpy directly if ROS has been setup (while using from ROS pkg)
+import genpy, genmsg
+
+print(sys.path)
+
+import rosimport
+rosimport.activate()
diff --git a/...t_as_array/msg/test_opt_bool_as_array.msg → ...t_as_array/msg/test_opt_bool_as_array.msg b/...t_as_array/msg/test_opt_bool_as_array.msg → ...t_as_array/msg/test_opt_bool_as_array.msg
diff --git a/..._array/msg/test_opt_duration_as_array.msg → ..._array/msg/test_opt_duration_as_array.msg b/..._array/msg/test_opt_duration_as_array.msg → ..._array/msg/test_opt_duration_as_array.msg
diff --git a/...s_array/msg/test_opt_float32_as_array.msg → ...s_array/msg/test_opt_float32_as_array.msg b/...s_array/msg/test_opt_float32_as_array.msg → ...s_array/msg/test_opt_float32_as_array.msg
diff --git a/...s_array/msg/test_opt_float64_as_array.msg → ...s_array/msg/test_opt_float64_as_array.msg b/...s_array/msg/test_opt_float64_as_array.msg → ...s_array/msg/test_opt_float64_as_array.msg
diff --git a/...as_array/msg/test_opt_header_as_array.msg → ...as_array/msg/test_opt_header_as_array.msg b/...as_array/msg/test_opt_header_as_array.msg → ...as_array/msg/test_opt_header_as_array.msg
diff --git a/..._as_array/msg/test_opt_int16_as_array.msg → ..._as_array/msg/test_opt_int16_as_array.msg b/..._as_array/msg/test_opt_int16_as_array.msg → ..._as_array/msg/test_opt_int16_as_array.msg
diff --git a/..._as_array/msg/test_opt_int32_as_array.msg → ..._as_array/msg/test_opt_int32_as_array.msg b/..._as_array/msg/test_opt_int32_as_array.msg → ..._as_array/msg/test_opt_int32_as_array.msg
diff --git a/..._as_array/msg/test_opt_int64_as_array.msg → ..._as_array/msg/test_opt_int64_as_array.msg b/..._as_array/msg/test_opt_int64_as_array.msg → ..._as_array/msg/test_opt_int64_as_array.msg
diff --git a/...t_as_array/msg/test_opt_int8_as_array.msg → ...t_as_array/msg/test_opt_int8_as_array.msg b/...t_as_array/msg/test_opt_int8_as_array.msg → ...t_as_array/msg/test_opt_int8_as_array.msg
diff --git a/...array/msg/test_opt_std_empty_as_array.msg → ...array/msg/test_opt_std_empty_as_array.msg b/...array/msg/test_opt_std_empty_as_array.msg → ...array/msg/test_opt_std_empty_as_array.msg
diff --git a/...as_array/msg/test_opt_string_as_array.msg → ...as_array/msg/test_opt_string_as_array.msg b/...as_array/msg/test_opt_string_as_array.msg → ...as_array/msg/test_opt_string_as_array.msg
diff --git a/...t_as_array/msg/test_opt_time_as_array.msg → ...t_as_array/msg/test_opt_time_as_array.msg b/...t_as_array/msg/test_opt_time_as_array.msg → ...t_as_array/msg/test_opt_time_as_array.msg
diff --git a/...as_array/msg/test_opt_uint16_as_array.msg → ...as_array/msg/test_opt_uint16_as_array.msg b/...as_array/msg/test_opt_uint16_as_array.msg → ...as_array/msg/test_opt_uint16_as_array.msg
diff --git a/...as_array/msg/test_opt_uint32_as_array.msg → ...as_array/msg/test_opt_uint32_as_array.msg b/...as_array/msg/test_opt_uint32_as_array.msg → ...as_array/msg/test_opt_uint32_as_array.msg
diff --git a/...as_array/msg/test_opt_uint64_as_array.msg → ...as_array/msg/test_opt_uint64_as_array.msg b/...as_array/msg/test_opt_uint64_as_array.msg → ...as_array/msg/test_opt_uint64_as_array.msg
diff --git a/..._as_array/msg/test_opt_uint8_as_array.msg → ..._as_array/msg/test_opt_uint8_as_array.msg b/..._as_array/msg/test_opt_uint8_as_array.msg → ..._as_array/msg/test_opt_uint8_as_array.msg
diff --git a/tests/opt_as_array/test_opt_bool.py → ..._pyros_msgs/opt_as_array/test_opt_bool.py b/tests/opt_as_array/test_opt_bool.py → ..._pyros_msgs/opt_as_array/test_opt_bool.py
diff --git a/tests/opt_as_array/test_opt_duration.py → ...os_msgs/opt_as_array/test_opt_duration.py b/tests/opt_as_array/test_opt_duration.py → ...os_msgs/opt_as_array/test_opt_duration.py
diff --git a/tests/opt_as_array/test_opt_int16.py → ...pyros_msgs/opt_as_array/test_opt_int16.py b/tests/opt_as_array/test_opt_int16.py → ...pyros_msgs/opt_as_array/test_opt_int16.py
diff --git a/tests/opt_as_array/test_opt_int32.py → ...pyros_msgs/opt_as_array/test_opt_int32.py b/tests/opt_as_array/test_opt_int32.py → ...pyros_msgs/opt_as_array/test_opt_int32.py
diff --git a/tests/opt_as_array/test_opt_int64.py → ...pyros_msgs/opt_as_array/test_opt_int64.py b/tests/opt_as_array/test_opt_int64.py → ...pyros_msgs/opt_as_array/test_opt_int64.py
diff --git a/tests/opt_as_array/test_opt_int8.py → ..._pyros_msgs/opt_as_array/test_opt_int8.py b/tests/opt_as_array/test_opt_int8.py → ..._pyros_msgs/opt_as_array/test_opt_int8.py
diff --git a/tests/opt_as_array/test_opt_std_empty.py → ...s_msgs/opt_as_array/test_opt_std_empty.py b/tests/opt_as_array/test_opt_std_empty.py → ...s_msgs/opt_as_array/test_opt_std_empty.py
diff --git a/tests/opt_as_array/test_opt_string.py → ...yros_msgs/opt_as_array/test_opt_string.py b/tests/opt_as_array/test_opt_string.py → ...yros_msgs/opt_as_array/test_opt_string.py
diff --git a/tests/opt_as_array/test_opt_time.py → ..._pyros_msgs/opt_as_array/test_opt_time.py b/tests/opt_as_array/test_opt_time.py → ..._pyros_msgs/opt_as_array/test_opt_time.py
diff --git a/tests/opt_as_array/test_opt_uint16.py → ...yros_msgs/opt_as_array/test_opt_uint16.py b/tests/opt_as_array/test_opt_uint16.py → ...yros_msgs/opt_as_array/test_opt_uint16.py
diff --git a/tests/opt_as_array/test_opt_uint32.py → ...yros_msgs/opt_as_array/test_opt_uint32.py b/tests/opt_as_array/test_opt_uint32.py → ...yros_msgs/opt_as_array/test_opt_uint32.py
diff --git a/tests/opt_as_array/test_opt_uint64.py → ...yros_msgs/opt_as_array/test_opt_uint64.py b/tests/opt_as_array/test_opt_uint64.py → ...yros_msgs/opt_as_array/test_opt_uint64.py
diff --git a/tests/opt_as_array/test_opt_uint8.py → ...pyros_msgs/opt_as_array/test_opt_uint8.py b/tests/opt_as_array/test_opt_uint8.py → ...pyros_msgs/opt_as_array/test_opt_uint8.py
diff --git a/tests/test_pyros_msgs/opt_as_nested/__init__.py b/tests/test_pyros_msgs/opt_as_nested/__init__.py
@@ -0,0 +1,14 @@
+from __future__ import absolute_import, division, print_function
+
+import os
+import sys
+import site
+
+# This is used for message definitions, not for python code
+site.addsitedir(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), 'rosdeps'))
+
+# Using genpy directly if ROS has been setup (while using from ROS pkg)
+import genpy, genmsg
+
+import rosimport
+rosimport.activate()
diff --git a/...as_nested/msg/test_opt_bool_as_nested.msg → ...as_nested/msg/test_opt_bool_as_nested.msg b/...as_nested/msg/test_opt_bool_as_nested.msg → ...as_nested/msg/test_opt_bool_as_nested.msg
diff --git a/...ested/msg/test_opt_duration_as_nested.msg → ...ested/msg/test_opt_duration_as_nested.msg b/...ested/msg/test_opt_duration_as_nested.msg → ...ested/msg/test_opt_duration_as_nested.msg
diff --git a/...s_nested/msg/test_opt_int16_as_nested.msg → ...s_nested/msg/test_opt_int16_as_nested.msg b/...s_nested/msg/test_opt_int16_as_nested.msg → ...s_nested/msg/test_opt_int16_as_nested.msg
diff --git a/...s_nested/msg/test_opt_int32_as_nested.msg → ...s_nested/msg/test_opt_int32_as_nested.msg b/...s_nested/msg/test_opt_int32_as_nested.msg → ...s_nested/msg/test_opt_int32_as_nested.msg
diff --git a/...s_nested/msg/test_opt_int64_as_nested.msg → ...s_nested/msg/test_opt_int64_as_nested.msg b/...s_nested/msg/test_opt_int64_as_nested.msg → ...s_nested/msg/test_opt_int64_as_nested.msg
diff --git a/...as_nested/msg/test_opt_int8_as_nested.msg → ...as_nested/msg/test_opt_int8_as_nested.msg b/...as_nested/msg/test_opt_int8_as_nested.msg → ...as_nested/msg/test_opt_int8_as_nested.msg
diff --git a/...sted/msg/test_opt_std_empty_as_nested.msg → ...sted/msg/test_opt_std_empty_as_nested.msg b/...sted/msg/test_opt_std_empty_as_nested.msg → ...sted/msg/test_opt_std_empty_as_nested.msg
diff --git a/..._nested/msg/test_opt_string_as_nested.msg → ..._nested/msg/test_opt_string_as_nested.msg b/..._nested/msg/test_opt_string_as_nested.msg → ..._nested/msg/test_opt_string_as_nested.msg
diff --git a/...as_nested/msg/test_opt_time_as_nested.msg → ...as_nested/msg/test_opt_time_as_nested.msg b/...as_nested/msg/test_opt_time_as_nested.msg → ...as_nested/msg/test_opt_time_as_nested.msg
diff --git a/..._nested/msg/test_opt_uint16_as_nested.msg → ..._nested/msg/test_opt_uint16_as_nested.msg b/..._nested/msg/test_opt_uint16_as_nested.msg → ..._nested/msg/test_opt_uint16_as_nested.msg
diff --git a/..._nested/msg/test_opt_uint32_as_nested.msg → ..._nested/msg/test_opt_uint32_as_nested.msg b/..._nested/msg/test_opt_uint32_as_nested.msg → ..._nested/msg/test_opt_uint32_as_nested.msg
diff --git a/..._nested/msg/test_opt_uint64_as_nested.msg → ..._nested/msg/test_opt_uint64_as_nested.msg b/..._nested/msg/test_opt_uint64_as_nested.msg → ..._nested/msg/test_opt_uint64_as_nested.msg
diff --git a/...s_nested/msg/test_opt_uint8_as_nested.msg → ...s_nested/msg/test_opt_uint8_as_nested.msg b/...s_nested/msg/test_opt_uint8_as_nested.msg → ...s_nested/msg/test_opt_uint8_as_nested.msg
diff --git a/tests/opt_as_nested/test_opt_bool.py → ...pyros_msgs/opt_as_nested/test_opt_bool.py b/tests/opt_as_nested/test_opt_bool.py → ...pyros_msgs/opt_as_nested/test_opt_bool.py
diff --git a/tests/opt_as_nested/test_opt_duration.py → ...s_msgs/opt_as_nested/test_opt_duration.py b/tests/opt_as_nested/test_opt_duration.py → ...s_msgs/opt_as_nested/test_opt_duration.py
diff --git a/tests/opt_as_nested/test_opt_int16.py → ...yros_msgs/opt_as_nested/test_opt_int16.py b/tests/opt_as_nested/test_opt_int16.py → ...yros_msgs/opt_as_nested/test_opt_int16.py
diff --git a/tests/opt_as_nested/test_opt_int32.py → ...yros_msgs/opt_as_nested/test_opt_int32.py b/tests/opt_as_nested/test_opt_int32.py → ...yros_msgs/opt_as_nested/test_opt_int32.py
diff --git a/tests/opt_as_nested/test_opt_int64.py → ...yros_msgs/opt_as_nested/test_opt_int64.py b/tests/opt_as_nested/test_opt_int64.py → ...yros_msgs/opt_as_nested/test_opt_int64.py
diff --git a/tests/opt_as_nested/test_opt_int8.py → ...pyros_msgs/opt_as_nested/test_opt_int8.py b/tests/opt_as_nested/test_opt_int8.py → ...pyros_msgs/opt_as_nested/test_opt_int8.py
diff --git a/tests/opt_as_nested/test_opt_std_empty.py → ..._msgs/opt_as_nested/test_opt_std_empty.py b/tests/opt_as_nested/test_opt_std_empty.py → ..._msgs/opt_as_nested/test_opt_std_empty.py
diff --git a/tests/opt_as_nested/test_opt_string.py → ...ros_msgs/opt_as_nested/test_opt_string.py b/tests/opt_as_nested/test_opt_string.py → ...ros_msgs/opt_as_nested/test_opt_string.py
diff --git a/tests/opt_as_nested/test_opt_time.py → ...pyros_msgs/opt_as_nested/test_opt_time.py b/tests/opt_as_nested/test_opt_time.py → ...pyros_msgs/opt_as_nested/test_opt_time.py
diff --git a/tests/opt_as_nested/test_opt_uint16.py → ...ros_msgs/opt_as_nested/test_opt_uint16.py b/tests/opt_as_nested/test_opt_uint16.py → ...ros_msgs/opt_as_nested/test_opt_uint16.py
diff --git a/tests/opt_as_nested/test_opt_uint32.py → ...ros_msgs/opt_as_nested/test_opt_uint32.py b/tests/opt_as_nested/test_opt_uint32.py → ...ros_msgs/opt_as_nested/test_opt_uint32.py
diff --git a/tests/opt_as_nested/test_opt_uint64.py → ...ros_msgs/opt_as_nested/test_opt_uint64.py b/tests/opt_as_nested/test_opt_uint64.py → ...ros_msgs/opt_as_nested/test_opt_uint64.py
diff --git a/tests/opt_as_nested/test_opt_uint8.py → ...yros_msgs/opt_as_nested/test_opt_uint8.py b/tests/opt_as_nested/test_opt_uint8.py → ...yros_msgs/opt_as_nested/test_opt_uint8.py
diff --git a/tests/typecheck/__init__.py → tests/test_pyros_msgs/typecheck/__init__.py b/tests/typecheck/__init__.py → tests/test_pyros_msgs/typecheck/__init__.py
@@ -3,16 +3,6 @@
 import pytest
 import sys
 
-# try:
-#     import pyros_msgs
-#     import genpy
-# except ImportError:
-#     import pyros_setup
-#     pyros_setup.configurable_import().configure().activate()
-#     import pyros_msgs
-#     import genpy
-
-
 import six
 
 from pyros_msgs.typecheck.typechecker import (

diff --git a/...typecheck/test_basic_ros_serialization.py → ...typecheck/test_basic_ros_serialization.py b/...typecheck/test_basic_ros_serialization.py → ...typecheck/test_basic_ros_serialization.py
diff --git a/tests/typecheck/test_ros_mappings.py → ...pyros_msgs/typecheck/test_ros_mappings.py b/tests/typecheck/test_ros_mappings.py → ...pyros_msgs/typecheck/test_ros_mappings.py
diff --git a/tests/typecheck/test_typechecker_arrays.py → ...msgs/typecheck/test_typechecker_arrays.py b/tests/typecheck/test_typechecker_arrays.py → ...msgs/typecheck/test_typechecker_arrays.py
diff --git a/tests/typecheck/test_typechecker_basic.py → ..._msgs/typecheck/test_typechecker_basic.py b/tests/typecheck/test_typechecker_basic.py → ..._msgs/typecheck/test_typechecker_basic.py
diff --git a/tests/typecheck/test_typechecker_nested.py → ...msgs/typecheck/test_typechecker_nested.py b/tests/typecheck/test_typechecker_nested.py → ...msgs/typecheck/test_typechecker_nested.py
diff --git a/tox.ini b/tox.ini
@@ -10,7 +10,7 @@ envlist = py27
 
 # we skip sdist since currently our sdist doesnt generate messages
 # we will manually setup the package via develop in [testenv]
-skipsdist=True
+#skipsdist=True
 
 [travis]
 2.7 = py27
@@ -39,8 +39,8 @@ recreate=True
 # sitepackages=True
 # We do not want any access to system (same as basic travis python testing)
 
-# TMP because our dependencies are not in pips
-usedevelop = True
+;# TMP because our dependencies are not in pips
+;usedevelop = True
 
 # we need to set our ROS distro in the pythonpath for our code to rely on ROS
 #TODO : not havnig this breaks pyros-setup which tries to create its config file in
@@ -55,9 +55,9 @@ usedevelop = True
 
 setenv=
     # TODO : get rid of this by removing all dependencies to ROS on system...
-    indigo: PYTHONPATH=/opt/ros/indigo/lib/python2.7/dist-packages
-    jade: PYTHONPATH=/opt/ros/jade/lib/python2.7/dist-packages
-    kinetic: PYTHONPATH=/opt/ros/kinetic/lib/python2.7/dist-packages
+;    indigo: PYTHONPATH=/opt/ros/indigo/lib/python2.7/dist-packages
+;    jade: PYTHONPATH=/opt/ros/jade/lib/python2.7/dist-packages
+;    kinetic: PYTHONPATH=/opt/ros/kinetic/lib/python2.7/dist-packages
 
 commands=
     # we want to make sure python finds the installed package in tox env