From 289d38671c5e6a033c4c0c67f7187b656abf50ed Mon Sep 17 00:00:00 2001
From: Damien Caselli <damien.caselli@gmail.com>
Date: Tue, 4 Apr 2017 16:18:04 +0200
Subject: [PATCH] Update to match pypot 3 dependency, upgrade version

---
 software/poppy_ergo_jr/_version.py                            | 2 +-
 software/poppy_ergo_jr/poppy_ergo_jr.py                       | 4 ++--
 software/samples/handsoff_demo.py                             | 2 +-
 software/samples/marker_demo.py                               | 2 +-
 software/samples/notebooks/Discover your Poppy Ergo Jr.ipynb  | 2 +-
 .../Record, Save and Play Moves on Poppy Ergo Jr.ipynb        | 2 +-
 software/samples/testbed.py                                   | 2 +-
 software/setup.py                                             | 4 ++--
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/software/poppy_ergo_jr/_version.py b/software/poppy_ergo_jr/_version.py
index 4a9b978..afced14 100644
--- 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
index f762327..d6084fb 100644
--- 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
index d6cd594..5f5b5e4 100755
--- 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
index 54cb743..7163375 100644
--- 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
index 7fe2c64..9413dc1 100644
--- 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
index 33a0f25..0d506cc 100644
--- 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
index 1958c1c..161bc9d 100644
--- 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
index df52d93..fab25ec 100644
--- 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='pierre.rouanet@gmail.com',
       description='Poppy Ergo Jr Software Library',
       url='https://github.com/poppy-project/poppy-ergo-jr',