done

duckietown · Mar 15, 2019 · d1c4bed · d1c4bed
1 parent 73600a2
commit d1c4bed
Show file tree

Hide file tree

Showing 30 changed files with 39 additions and 2,321 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,6 +1,6 @@
 [run]
 
-source = aido_nodes
+source = aido_schemas
 
 concurrency = multiprocessing
 

diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ upload:
 	twine upload dist/*
 
 
-comptest_package=aido_nodes_tests,aido_schemas_tests,aido_node_wrapper_tests
+comptest_package=aido_schemas_tests
 out=out-comptests
 coverage_dir=out-coverage
 coverage_include='*src/aido_*'

diff --git a/minimal-nodes-stubs/dummy_image_filter/requirements.txt b/minimal-nodes-stubs/dummy_image_filter/requirements.txt
@@ -1,5 +1,6 @@
+-e git://github.com/AndreaCensi/zuper_utils.git@z1#egg=zuper_utils
+-e git://github.com/AndreaCensi/zuper_nodes.git@z1#egg=zuper_utils
 -e git://github.com/duckietown/aido-protocols.git@v4-devel3#egg=aido-protocols
--e git://github.com/AndreaCensi/zuper_utils.git@v4-devel#egg=zuper_utils
 
 numpy==1.16.2
 

diff --git a/minimal-nodes-stubs/dummy_image_source/requirements.txt b/minimal-nodes-stubs/dummy_image_source/requirements.txt
@@ -1,5 +1,6 @@
+-e git://github.com/AndreaCensi/zuper_utils.git@z1#egg=zuper_utils
+-e git://github.com/AndreaCensi/zuper_nodes.git@z1#egg=zuper_utils
 -e git://github.com/duckietown/aido-protocols.git@v4-devel3#egg=aido-protocols
--e git://github.com/AndreaCensi/zuper_utils.git@v4-devel#egg=zuper_utils
 
 numpy==1.16.2
 opencv-python==4.0.0.21

diff --git a/minimal-nodes-stubs/dummy_simulator/requirements.txt b/minimal-nodes-stubs/dummy_simulator/requirements.txt
@@ -1,5 +1,6 @@
+-e git://github.com/AndreaCensi/zuper_utils.git@z1#egg=zuper_utils
+-e git://github.com/AndreaCensi/zuper_nodes.git@z1#egg=zuper_utils
 -e git://github.com/duckietown/aido-protocols.git@v4-devel3#egg=aido-protocols
--e git://github.com/AndreaCensi/zuper_utils.git@v4-devel#egg=zuper_utils
 
 numpy==1.16.2
 

diff --git a/minimal-nodes-stubs/random_agent/requirements.txt b/minimal-nodes-stubs/random_agent/requirements.txt
@@ -1,5 +1,6 @@
+-e git://github.com/AndreaCensi/zuper_utils.git@z1#egg=zuper_utils
+-e git://github.com/AndreaCensi/zuper_nodes.git@z1#egg=zuper_utils
 -e git://github.com/duckietown/aido-protocols.git@v4-devel3#egg=aido-protocols
--e git://github.com/AndreaCensi/zuper_utils.git@v4-devel#egg=zuper_utils
 
 numpy==1.16.2
 

diff --git a/minimal-nodes-stubs/random_agent/template.py b/minimal-nodes-stubs/random_agent/template.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
-import numpy as np
 
-from aido_nodes import PWMCommands, protocol_agent_jpg_pwm, wrap_direct
+from aido_nodes import protocol_agent_jpg_pwm, wrap_direct
 
 
 class FakeEnvironment(Environment):
@@ -18,7 +17,6 @@ def step(self, commands):
         return last
 
 def main():
-    import sys
     node = RandomAgent()
     protocol = protocol_agent_jpg_pwm
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,5 @@
--e git://github.com/AndreaCensi/zuper_utils.git@v4#egg=zuper_utils
+-e git://github.com/AndreaCensi/zuper_utils.git@z1#egg=zuper_utils
+-e git://github.com/AndreaCensi/zuper_nodes.git@z1#egg=zuper_utils
 
 compmake
 pyparsing

diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@ def get_version(filename):
     return version
 
 
-version = get_version(filename='src/aido_nodes/__init__.py')
+version = get_version(filename='src/aido_schemas/__init__.py')
 
 setup(
         name='aido-protocols',

diff --git a/src/aido_node_wrapper/__init__.py b/src/aido_node_wrapper/__init__.py
diff --git a/src/aido_node_wrapper/constants.py b/src/aido_node_wrapper/constants.py
diff --git a/src/aido_node_wrapper/identify.py b/src/aido_node_wrapper/identify.py
diff --git a/src/aido_node_wrapper/meta_protocol.py b/src/aido_node_wrapper/meta_protocol.py