Prepare poppy_humanoid for pypot>=3

JSC-DDDservices · Jul 29, 2016 · fc4c6cf · fc4c6cf
1 parent ec4a330
commit fc4c6cf
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/software/poppy_humanoid/_version.py b/software/poppy_humanoid/_version.py
@@ -1 +1 @@
-__version__ = '1.1.2'
+__version__ = '1.2.0rc1'
diff --git a/software/poppy_humanoid/poppy_humanoid.py b/software/poppy_humanoid/poppy_humanoid.py
@@ -4,7 +4,7 @@
 
 from functools import partial
 
-from poppy.creatures import AbstractPoppyCreature
+from pypot.creatures import AbstractPoppyCreature
 
 from .primitives.safe import LimitTorque, TemperatureMonitor
 from .primitives.dance import SimpleBodyBeatMotion

diff --git a/software/setup.py b/software/setup.py
@@ -14,12 +14,19 @@ def version():
 if sys.version_info >= (3,):
     extra['use_2to3'] = True
 
+extra_packages = []
+try:
+    import poppy.creatures
+
+    extra_packages.append('poppy-creature>=1.9')
+except ImportError:
+    pass
+
 setup(name='poppy-humanoid',
       version=version(),
       packages=find_packages(),
 
-      install_requires=['poppy-creature >= 1.8',
-                        'pypot >= 2.11'],
+      install_requires=['pypot >= 3.0.0a'] + extra_packages,
 
       include_package_data=True,
       exclude_package_data={'': ['README', '.gitignore']},