Update to match pypot 3 dependency, upgrade version

poppy-project · Apr 4, 2017 · 289d386 · 289d386
1 parent 96f6d45
commit 289d386
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/software/poppy_ergo_jr/_version.py b/software/poppy_ergo_jr/_version.py
@@ -1 +1 @@
-__version__ = '1.6.2'
+__version__ = '2.0.0'
diff --git a/software/poppy_ergo_jr/poppy_ergo_jr.py b/software/poppy_ergo_jr/poppy_ergo_jr.py
@@ -1,8 +1,8 @@
 from numpy import sum
 from functools import partial
 
-from poppy.creatures import AbstractPoppyCreature
-from poppy.creatures.ik import IKChain
+from pypot.creatures import AbstractPoppyCreature
+from pypot.creatures.ik import IKChain
 
 from .primitives.dance import Dance
 from .primitives.face_tracking import FaceTracking

diff --git a/software/samples/handsoff_demo.py b/software/samples/handsoff_demo.py
@@ -7,7 +7,7 @@
 from contextlib import closing
 from collections import deque
 
-from poppy.creatures import PoppyErgoJr
+from pypot.creatures import PoppyErgoJr
 from pypot.primitive import LoopPrimitive
 from poppy_ergo_jr.postures import IdleBreathing
 

diff --git a/software/samples/marker_demo.py b/software/samples/marker_demo.py
@@ -1,6 +1,6 @@
 import cv2
 
-from poppy.creatures import PoppyErgoJr
+from pypot.creatures import PoppyErgoJr
 
 if __name__ == '__main__':
     jr = PoppyErgoJr()

diff --git a/software/samples/notebooks/Discover your Poppy Ergo Jr.ipynb b/software/samples/notebooks/Discover your Poppy Ergo Jr.ipynb
@@ -70,7 +70,7 @@
    },
    "outputs": [],
    "source": [
-    "from poppy.creatures import PoppyErgoJr\n",
+    "from pypot.creatures import PoppyErgoJr\n",
     "\n",
     "poppy = PoppyErgoJr()"
    ]

diff --git a/software/samples/notebooks/Record, Save and Play Moves on Poppy Ergo Jr.ipynb b/software/samples/notebooks/Record, Save and Play Moves on Poppy Ergo Jr.ipynb
@@ -82,7 +82,7 @@
    },
    "outputs": [],
    "source": [
-    "from poppy.creatures import PoppyErgoJr\n",
+    "from pypot.creatures import PoppyErgoJr\n",
     "\n",
     "poppy = PoppyErgoJr()"
    ]

diff --git a/software/samples/testbed.py b/software/samples/testbed.py
@@ -7,7 +7,7 @@
 from numpy import mean, std
 
 from pypot.primitive.utils import PositionWatcher
-from poppy.creatures import PoppyErgoJr
+from pypot.creatures import PoppyErgoJr
 from hampy import detect_markers
 
 D = 10

diff --git a/software/setup.py b/software/setup.py
@@ -18,14 +18,14 @@ def version():
       version=version(),
       packages=find_packages(),
 
-      install_requires=['pypot >= 2.11', 'poppy-creature >= 1.8', 'hampy'],
+      install_requires=['pypot >= 3', 'hampy'],
 
       include_package_data=True,
       exclude_package_data={'': ['README', '.gitignore']},
 
       zip_safe=False,
 
-      author='Pierre Rouanet, Jonathan Grizou, Matthieu Lapeyre',
+      author='https://github.com/poppy-project/poppy-ergo-jr/graphs/contributors',
       author_email='[email protected]',
       description='Poppy Ergo Jr Software Library',
       url='https://github.com/poppy-project/poppy-ergo-jr',