comply with flake8 import order (#167)

* add flake8 test

* fix flake8 violations

* remove redundant pep8 and pyflakes tests

rclpy/services/minimal_client/client.py

@@ -14,10 +14,10 @@
 
 import time
 
-import rclpy
-
 from example_interfaces.srv import AddTwoInts
 
+import rclpy
+
 
 def main(args=None):
     rclpy.init(args)
@@ -43,5 +43,6 @@ def main(args=None):
         'Result of add_two_ints: for %d + %d = %d' %
         (req.a, req.b, cli.response.sum))
 
+
 if __name__ == '__main__':
     main()

rclpy/services/minimal_client/client_async.py

@@ -14,10 +14,10 @@
 
 import time
 
-import rclpy
-
 from example_interfaces.srv import AddTwoInts
 
+import rclpy
+
 
 def main(args=None):
     rclpy.init(args)
@@ -47,5 +47,6 @@ def main(args=None):
 
     rclpy.shutdown()
 
+
 if __name__ == '__main__':
     main()

rclpy/services/minimal_client/client_async_member_function.py

@@ -14,10 +14,10 @@
 
 import time
 
-import rclpy
-
 from example_interfaces.srv import AddTwoInts
 
+import rclpy
+
 
 class MinimalClientAsync:
     def __init__(self, node):
@@ -55,5 +55,6 @@ def main(args=None):
 
     rclpy.shutdown()
 
+
 if __name__ == '__main__':
     main()

rclpy/services/minimal_client/package.xml

@@ -8,16 +8,15 @@
   <maintainer email="mikael@osrfoundation.org">Mikael Arguedas</maintainer>
   <license>Apache License 2.0</license>
 
-  <exec_depend>rclpy</exec_depend>
   <exec_depend>example_interfaces</exec_depend>
+  <exec_depend>rclpy</exec_depend>
   <exec_depend>std_msgs</exec_depend>
 
   <!-- These test dependencies are optional
   Their purpose is to make sure that the code passes the linters -->
   <test_depend>ament_copyright</test_depend>
+  <test_depend>ament_flake8</test_depend>
   <test_depend>ament_pep257</test_depend>
-  <test_depend>ament_pep8</test_depend>
-  <test_depend>ament_pyflakes</test_depend>
 
   <export>
     <build_type>ament_python</build_type>

rclpy/topics/minimal_publisher/test/test_pyflakes.py → rclpy/services/minimal_client/test/test_flake8.py

@@ -1,4 +1,4 @@
-# Copyright 2015 Open Source Robotics Foundation, Inc.
+# Copyright 2017 Open Source Robotics Foundation, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ament_pyflakes.main import main
+from ament_flake8.main import main
 
 
 def test_pyflakes():
-    rc = main(argv=['.'])
+    rc = main(argv=[])
     assert rc == 0, 'Found errors'

rclpy/services/minimal_service/package.xml

@@ -8,16 +8,15 @@
   <maintainer email="mikael@osrfoundation.org">Mikael Arguedas</maintainer>
   <license>Apache License 2.0</license>
 
-  <exec_depend>rclpy</exec_depend>
   <exec_depend>example_interfaces</exec_depend>
+  <exec_depend>rclpy</exec_depend>
   <exec_depend>std_msgs</exec_depend>
 
   <!-- These test dependencies are optional
   Their purpose is to make sure that the code passes the linters -->
   <test_depend>ament_copyright</test_depend>
+  <test_depend>ament_flake8</test_depend>
   <test_depend>ament_pep257</test_depend>
-  <test_depend>ament_pep8</test_depend>
-  <test_depend>ament_pyflakes</test_depend>
 
   <export>
     <build_type>ament_python</build_type>

rclpy/services/minimal_service/service.py

@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import rclpy
-
 from example_interfaces.srv import AddTwoInts
 
+import rclpy
+
 
 def add_two_ints_callback(request, response):
     response.sum = request.a + request.b
@@ -39,5 +39,6 @@ def main(args=None):
     node.destroy_service(srv)
     rclpy.shutdown()
 
+
 if __name__ == '__main__':
     main()

rclpy/services/minimal_service/service_member_function.py

@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import rclpy
-
 from example_interfaces.srv import AddTwoInts
 
+import rclpy
+
 
 class MinimalService:
     def __init__(self, node):
@@ -40,5 +40,6 @@ def main(args=None):
 
     rclpy.shutdown()
 
+
 if __name__ == '__main__':
     main()

rclpy/services/minimal_client/test/test_pyflakes.py → rclpy/services/minimal_service/test/test_flake8.py

@@ -1,4 +1,4 @@
-# Copyright 2015 Open Source Robotics Foundation, Inc.
+# Copyright 2017 Open Source Robotics Foundation, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ament_pyflakes.main import main
+from ament_flake8.main import main
 
 
 def test_pyflakes():
-    rc = main(argv=['.'])
+    rc = main(argv=[])
     assert rc == 0, 'Found errors'

rclpy/topics/minimal_publisher/package.xml

@@ -14,9 +14,8 @@
   <!-- These test dependencies are optional
   Their purpose is to make sure that the code passes the linters -->
   <test_depend>ament_copyright</test_depend>
+  <test_depend>ament_flake8</test_depend>
   <test_depend>ament_pep257</test_depend>
-  <test_depend>ament_pep8</test_depend>
-  <test_depend>ament_pyflakes</test_depend>
 
   <export>
     <build_type>ament_python</build_type>

rclpy/topics/minimal_publisher/publisher_local_function.py

@@ -46,5 +46,6 @@ def timer_callback():
     node.destroy_node()
     rclpy.shutdown()
 
+
 if __name__ == '__main__':
     main()

rclpy/topics/minimal_publisher/publisher_member_function.py

@@ -50,5 +50,6 @@ def main(args=None):
     node.destroy_node()
     rclpy.shutdown()
 
+
 if __name__ == '__main__':
     main()

rclpy/topics/minimal_publisher/publisher_old_school.py

@@ -47,5 +47,6 @@ def main(args=None):
     node.destroy_node()
     rclpy.shutdown()
 
+
 if __name__ == '__main__':
     main()

rclpy/topics/minimal_subscriber/test/test_pyflakes.py → rclpy/topics/minimal_publisher/test/test_flake8.py

@@ -1,4 +1,4 @@
-# Copyright 2015 Open Source Robotics Foundation, Inc.
+# Copyright 2017 Open Source Robotics Foundation, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ament_pyflakes.main import main
+from ament_flake8.main import main
 
 
 def test_pyflakes():
-    rc = main(argv=['.'])
+    rc = main(argv=[])
     assert rc == 0, 'Found errors'

rclpy/topics/minimal_subscriber/package.xml

@@ -13,9 +13,8 @@
   <!-- These test dependencies are optional
   Their purpose is to make sure that the code passes the linters -->
   <test_depend>ament_copyright</test_depend>
+  <test_depend>ament_flake8</test_depend>
   <test_depend>ament_pep257</test_depend>
-  <test_depend>ament_pep8</test_depend>
-  <test_depend>ament_pyflakes</test_depend>
 
   <export>
     <build_type>ament_python</build_type>

rclpy/topics/minimal_subscriber/subscriber_lambda.py

@@ -35,5 +35,6 @@ def main(args=None):
     node.destroy_node()
     rclpy.shutdown()
 
+
 if __name__ == '__main__':
     main()

rclpy/topics/minimal_subscriber/subscriber_member_function.py

@@ -46,5 +46,6 @@ def main(args=None):
     node.destroy_node()
     rclpy.shutdown()
 
+
 if __name__ == '__main__':
     main()

rclpy/topics/minimal_subscriber/subscriber_old_school.py

@@ -38,5 +38,6 @@ def main(args=None):
     node.destroy_node()
     rclpy.shutdown()
 
+
 if __name__ == '__main__':
     main()

rclpy/services/minimal_service/test/test_pyflakes.py → rclpy/topics/minimal_subscriber/test/test_flake8.py

@@ -1,4 +1,4 @@
-# Copyright 2015 Open Source Robotics Foundation, Inc.
+# Copyright 2017 Open Source Robotics Foundation, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ament_pyflakes.main import main
+from ament_flake8.main import main
 
 
 def test_pyflakes():
-    rc = main(argv=['.'])
+    rc = main(argv=[])
     assert rc == 0, 'Found errors'