Nested implement

.gitignore

@@ -1,2 +1,10 @@
 *.pyc
 build
+dist
+.tox
+.hypothesis
+*.egg-info
+.cache
+.idea
+__pycache__
+

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "tests/rosdeps/std_msgs"]
+	path = tests/rosdeps/std_msgs
+	url = https://github.com/ros/std_msgs.git
+[submodule "tests/rosdeps/ros_comm_msgs"]
+	path = tests/rosdeps/ros_comm_msgs
+	url = https://github.com/ros/ros_comm_msgs.git

.travis.yml

@@ -1,63 +1,51 @@
-sudo: required
-language: generic
-services:
-  - docker
+language: python
 
 branches:
   except:
-   - gh-pages
+    - gh-pages
 
 env:
-  global:
-    - CONTAINER_NAME=pyros_msgs_docker
-  # This will check any ROS distro supported on this OS
-  # checking devel and install separately so that they don't influence each other (dependencies, path, env, etc.)
-  matrix:
-    - ROS_DISTRO=indigo ROS_FLOW=devel
-    - ROS_DISTRO=indigo ROS_FLOW=install
+  # These will be used to determine the proper version of our dependencies
+  # We will NOT rely on a full ROS installation.
+  - ROS_DISTRO=indigo
+  - ROS_DISTRO=kinetic
+  # Latest not LTS
+  - ROS_DISTRO=lunar
+  # to get latest dependencies (not released in a ROS distro yet)
+  - ROS_DISTRO=latest
+
+python:
+  # always test python2 (default supported python version for ROS1)
+  - 2.7
+  # always test latest python3 (to guarantee recent python support)
+  - 3.6
+  #- pypy
+  #- pypy3
+
+# Add specific python3 versions
+matrix:
+  include:
+    # explicitely matching python version to the version on the ubuntu distro supported by the ROS LTS distro
+    - python: 3.4
+      env: ROS_DISTRO=indigo
+    - python: 3.5
+      env: ROS_DISTRO=kinetic
+  exclude:
+    # explicitely exclude python3 version not supported by matching linux distro
+    - python: 3.6
+      env: ROS_DISTRO=indigo
+    - python: 3.6
+      env: ROS_DISTRO=kinetic
 
-    - ROS_DISTRO=jade ROS_FLOW=devel
-    - ROS_DISTRO=jade ROS_FLOW=install
-
-    - ROS_DISTRO=kinetic ROS_FLOW=devel
-    - ROS_DISTRO=kinetic ROS_FLOW=install
 
 before_install:
-  # Getting docker ros image
-  - docker pull ros:${ROS_DISTRO}-ros-core
-  # Running as daemon
-  - docker run --name ${CONTAINER_NAME} -d -t ros:${ROS_DISTRO}-ros-core /bin/bash | tee container.id
-  # Switching to use ros shadow fixed packages
-  - docker exec -ti ${CONTAINER_NAME} /bin/bash -c "sed -i.bak -e s,packages.ros.org/ros/ubuntu,packages.ros.org/ros-shadow-fixed/ubuntu, /etc/apt/sources.list.d/ros-latest.list"
-  # Checking current container
-  - docker ps -a
-  - docker exec -ti ${CONTAINER_NAME} hostname
-  - docker exec -ti ${CONTAINER_NAME} uname -a
-  - docker exec -ti ${CONTAINER_NAME} cat /etc/lsb-release
 
 install:
-  # refreshing packages
-  - docker exec -ti ${CONTAINER_NAME} apt-get update
-  # TMP Patch because rosdep doesnt declare a dependency to sudo yet (2016-08-25) and it doesnt come with xenial
-  - docker exec -ti ${CONTAINER_NAME} apt-get install sudo -y
-  # TMP Patch because catkin doesnt declare a dependency to gcc yet (2016-09-02) and it doesnt come in ros image
-  - docker exec -ti ${CONTAINER_NAME} apt-get install build-essential -y
-
-  # refreshing rosdep
-  - docker exec -ti ${CONTAINER_NAME} rosdep update
-  # copying local clone to the running container (volume is currently broken)
-  - docker cp . ${CONTAINER_NAME}:/git_clone
-  # Installing package dependencies
-  - docker exec -ti ${CONTAINER_NAME} rosdep install --default-yes --from-paths /git_clone --rosdistro $ROS_DISTRO
-
-# full ROS setup, build and test
+  - pip install tox tox-travis
+
 script:
-  - CONTAINER_ID=$(cat container.id)
-  - docker ps -a
-  - docker exec -ti ${CONTAINER_NAME} /bin/bash -c "source /opt/ros/$ROS_DISTRO/setup.bash && rospack profile"
-  # Passing env vars here since passing in docker run currently breaks (2016-08-25)
-  - docker exec -ti ${CONTAINER_NAME} /bin/bash -c "export ROS_DISTRO=$ROS_DISTRO && export ROS_FLOW=$ROS_FLOW && /git_clone/travis_checks.bash"
-  - docker stop "${CONTAINER_ID}"
+  - tox
 
 notifications:
   email: false
+

CHANGELOG.rst

@@ -0,0 +1,151 @@
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Changelog for package pyros_msgs
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+0.1.1 (2017-05-16)
+------------------
+* Merge pull request `#16 <https://github.com/asmodehn/pyros-msgs/issues/16>`_ from yotabits/nested_implement
+  Added test for time in opt_as_nested
+* now nesting using type checker method instead of duplicating it.
+* Added test for time in opt_as_nested
+  The actual test seems to be failing because the type checker seems to be waiting
+  for int32 datatype instead of uint32
+* Merge pull request `#10 <https://github.com/asmodehn/pyros-msgs/issues/10>`_ from yotabits/nested_implement
+  Adding tests in opt_as_nested
+* Added test for duration in opt_as_nested
+* Added test for std_empty in opt_as_nested
+* Added test for string in opt_as_nested
+  This include also a small bug fix in the typechecker, now object of type any
+  can "contain" objects of type any aswell
+* stand alone working
+* Fixed test_opt_duration in opt_as_array
+  Actually Ros does not allow to have negative nano-seconds:
+  1s, -100 000 000ns
+  will be transformed into
+  900 000 ns
+  in the case we test with limit values this could create issues
+  so the testing limit values have been changed
+* Merge pull request `#3 <https://github.com/asmodehn/pyros-msgs/issues/3>`_ from asmodehn/nested_implement
+  Nested implement
+* testing...
+* testing...
+* testing...
+* Added test for uint64 in opt_as_nested
+* Added test for uint32 in opt_as_nested
+* Added test for uint16 in opt_as_nested
+* Added test for uint8 in opt_as_nested
+* Adapted all int type size tests
+* fixing yaml dependency name
+* adding quantified code badge
+* adding yaml as dependency since our genpy source code relies on it.
+* cleaning up doc and comments
+* Merge pull request `#2 <https://github.com/asmodehn/pyros-msgs/issues/2>`_ from asmodehn/nested_implement
+  Nested implement
+* Added test for int64 in opt_as_nested
+* Merge pull request `#9 <https://github.com/asmodehn/pyros-msgs/issues/9>`_ from asmodehn/fixing_catkin_tests
+  Fixing catkin tests
+* fixing array test to use new msg_generate
+* Added test for int32 in opt_as_nested
+* Added test for int16 in opt_as_nested
+* Merge branch 'nested_implement' of https://github.com/asmodehn/pyros-msgs into fixing_catkin_tests
+* fixing import_msgsrv to handle namespace packages properly.
+  recovered accidently lost comment for namespace package in __init_\_.
+* Small fix on test_opt_int8 in opt_as_nested
+* fixing setup.py usage of generator
+* fixing generator tests
+* Added test for int8 in opt_as_nested
+* refactored how we do generation to privilege the common usecase.
+  now generating message into a temporary directory.
+  fixed all tests for basic pytest.
+* Merge pull request `#8 <https://github.com/asmodehn/pyros-msgs/issues/8>`_ from yotabits/nested_implement
+  Nested implement
+* Added test for uint64 in opt_as_array
+* Added test for uint32 in opt_as_array
+* fixing a bunch of tests for catkin. WIP before rosmsg_generator refactor.
+* Added test for uint16 in opt_as_array
+* Added test for uint8 in opt_as_array
+* Added test for int16 and int 32
+  Added test for int16 and int32 for opt_as_array
+* fixing pyros_msgs.msg path in nested test
+* WIP. attempting to generate all messages at once
+  so that starting tests in same or different interpreter doesnt matter anymore
+* fixing hardcoded path of generator for test.
+* Merge pull request `#1 <https://github.com/asmodehn/pyros-msgs/issues/1>`_ from asmodehn/nested_implement
+  Nested implement
+* adding importer tests into tox
+* fixing path for package message
+  adding test for using rosmsg_generator module directly
+  fixing tests
+* tox fixes...
+* improving code to make it more ROS independent.
+* improved message generation and tests
+* moving ros_genmsg_py and improving API
+* fixed all tests
+  but still a problem remain : reloading package of newly generated module...
+* fixing all tests for opt_as_array with runtime message generation
+* fix to handle rosmsg_py dependency path search during generation.
+* adapted set_opt_bool to dynamically generate and import message class for tests.
+* some fixes still WIP
+* making test work for jade. But we still depend on pure ROS package pyros_utils.
+* adding pyros-setup as dependency, plus a few comments
+* found a method usable by tox to generate ros messages. needs refining...
+* adding setup.py custom command to generate message modules.
+* fixing test assert that could break on set repr with different order
+* modifying travis script to run pytest directly on install directory.
+* adding python-pytest dependency
+* fixing travis checks
+* more common -> typecheck renaming
+* fixing setup.py with proper name
+* renamed subpackage common to typecheck. fixed tests.
+* adding tests and dependency on hypothesis
+* adding dependency on hypothesis. now patching messages inside opt_as_array package
+* finalizing optional fields as nested implementation
+* fixing basic common tests to work with xenial version of hypothesis.
+* fixing imports for test runs. other small fixes.
+* refining tests
+* reorganized tests.
+* Merge pull request `#5 <https://github.com/asmodehn/pyros-msgs/issues/5>`_ from asmodehn/hypothesis
+  Hypothesis
+* adding catkin_pip as dependency
+* small improvements. all array tests running...
+* fixing array tests
+* now seems to work fine with catkin_pip
+* fixing opt_as_array tests
+* now able to generate type checker from rosmsg type
+* improved type checker tests
+* more typechecker hypothesis tests
+* improved typechecker, not relying on ROS types for it anymore.
+* experimenting with hypothesis for proper testing
+* opt_as_nested seems to work fine now. more tests required...
+* all opt_as_array tests passing
+* better type checking by introducing typeschemas
+* start of refactor to allow multiple implementations for optional fields... added lots of doctests.
+* adding travis badge
+* updating Readme to reflect opt_as_nested as WIP
+* now travis uses shadow-fixed repository
+* adding pyros_utils as dependency
+* adding python-six as system dependency
+* Merge pull request `#1 <https://github.com/asmodehn/pyros-msgs/issues/1>`_ from asmodehn/http
+  optional fields implemented as array
+* Merge branch 'http' of https://github.com/asmodehn/pyros-msgs into http
+* cleaning up wrong init file
+* Merge branch 'master' into http
+* adding README
+* adding _opt_slots field to the punched message type.
+  other changes to get all httpbin tests to pass.
+* slightly different way to initializa when doing opt_as_array
+* attempting travis fix. comments.
+* resurrecting optional message fields, since it is necessary to make explicit the intent of having an optional field in a message.
+* added readme for dropping repo.
+* WIP. commit before changing internal dict representation of optional messages
+* extending path if needed to get ros generated messages. useful when running from here (nose has his own import behavior).
+* adding http status code message
+* base optional message types and test template
+* cleanup bad __init_\_ file. added ignore for *.pyc and build/
+* small refactoring. fixed all tests.
+* adding dependency on marshmallow
+* adding roslint as build depend
+* standard message types implemented with doc test. added travis files.
+* Started implementing standard ROS message -> dict serialization
+* Initial commit
+* Contributors: AlexV, Thomas, alexv, yotabits

CMakeLists.txt

@@ -10,68 +10,22 @@ project(pyros_msgs)
 ##############################################################################
 
 find_package(catkin REQUIRED COMPONENTS
-    roslint
+    catkin_pip
     std_msgs
     message_generation
     message_runtime
 )
 
 
-catkin_python_setup()
-
-
-# Lint Python modules
-file(GLOB_RECURSE ${PROJECT_NAME}_PY_SRCS
-     RELATIVE ${PROJECT_SOURCE_DIR} src/pyros_msgs/*.py)
-roslint_python(${${PROJECT_NAME}_PY_SRCS})
-
-
 #####
 # MESSAGES
 #####
 
 add_message_files(
   DIRECTORY
-    msg/opt_as_nested
-  FILES
-    opt_empty.msg
-    opt_bool.msg
-    opt_int8.msg
-    opt_int16.msg
-    opt_int32.msg
-    opt_int64.msg
-    opt_uint8.msg
-    opt_uint16.msg
-    opt_uint32.msg
-    opt_uint64.msg
-    opt_float32.msg
-    opt_float64.msg
-    opt_string.msg
-    opt_time.msg
-    opt_duration.msg
-    opt_header.msg
-)
-
-add_message_files(
-  DIRECTORY
-    msg/opt_as_array
+    msg
   FILES
-    test_opt_empty_as_array.msg
-    test_opt_bool_as_array.msg
-    test_opt_int8_as_array.msg
-    test_opt_int16_as_array.msg
-    test_opt_int32_as_array.msg
-    test_opt_int64_as_array.msg
-    test_opt_uint8_as_array.msg
-    test_opt_uint16_as_array.msg
-    test_opt_uint32_as_array.msg
-    test_opt_uint64_as_array.msg
-    test_opt_float32_as_array.msg
-    test_opt_float64_as_array.msg
-    test_opt_string_as_array.msg
-    test_opt_time_as_array.msg
-    test_opt_duration_as_array.msg
-    test_opt_header_as_array.msg
+    OptionalFields.msg
 )
 
 generate_messages(DEPENDENCIES std_msgs)
@@ -82,14 +36,16 @@ generate_messages(DEPENDENCIES std_msgs)
 # Catkin
 ##############################################################################
 
-catkin_package()
+catkin_pip_package(pyros_msgs)
 
 #########
 # Tests
 #######
 
 if (CATKIN_ENABLE_TESTING)
-  catkin_add_nosetests(tests)
+  catkin_add_pytests(tests/test_pyros_msgs/typecheck)
+  catkin_add_pytests(tests/test_pyros_msgs/opt_as_array)
+  catkin_add_pytests(tests/test_pyros_msgs/opt_as_nested)
 endif()
 
 

MANIFEST.in

@@ -0,0 +1,7 @@
+# default
+include README.rst
+include setup.py
+
+# including tests in sdist
+recursive-include tests *
+recursive-exclude tests .hypothesis