From 23d81cee17965681f8e07ab49bff9f65a107646a Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Sat, 9 May 2020 14:10:14 +0200 Subject: [PATCH] [wip/py-sot-talos] patch-aa: fix the other part of the typo --- py-sot-talos/Makefile | 2 +- py-sot-talos/distinfo | 2 +- py-sot-talos/patches/patch-aa | 22 ++++++++++++++++------ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/py-sot-talos/Makefile b/py-sot-talos/Makefile index 9d73c051..7f6696d4 100644 --- a/py-sot-talos/Makefile +++ b/py-sot-talos/Makefile @@ -5,7 +5,7 @@ ORG= stack-of-tasks NAME= sot-talos VERSION= 1.2.0 -PKGTREVISION= 1 +PKGTREVISION= 2 CATEGORIES= wip COMMENT= This packages provides a generic Stack Of Tasks library for the humanoid robot Pyrene. diff --git a/py-sot-talos/distinfo b/py-sot-talos/distinfo index 7fd2c8ec..f0f4a662 100644 --- a/py-sot-talos/distinfo +++ b/py-sot-talos/distinfo @@ -1,4 +1,4 @@ SHA1 (sot-talos-1.2.0.tar.gz) = 5028b80420357d489b807a3656a30b11639eba6a RMD160 (sot-talos-1.2.0.tar.gz) = 89af9a19532f0a65d3ac4fc0a376c497e16269c2 Size (sot-talos-1.2.0.tar.gz) = 815176 bytes -SHA1 (patch-aa) = 9a6c1a9fffa19a8999d69c03fb4fae7ae955a20e +SHA1 (patch-aa) = 3e1db3a36a4871647a2dcf1f7ef320d6b33916d4 diff --git a/py-sot-talos/patches/patch-aa b/py-sot-talos/patches/patch-aa index dd5e3a29..e88a4bb4 100644 --- a/py-sot-talos/patches/patch-aa +++ b/py-sot-talos/patches/patch-aa @@ -1,25 +1,35 @@ -From b0a7c68844def9f3da3b66ca6c7a2b305706bc3d Mon Sep 17 00:00:00 2001 +From bbba1aec84d70cafacecd874acd6834c87bdf081 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Sat, 9 May 2020 11:40:01 +0200 Subject: [PATCH] typo --- - tests/appli-test-simple-seq-play.py.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + cmake | 2 +- + tests/appli-test-simple-seq-play.py.cmake | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) +diff --git a/cmake b/cmake +index 321eb1c..72cf8cd 160000 +--- cmake ++++ cmake +@@ -1 +1 @@ +-Subproject commit 321eb1ccf1d94570eb564f3659b13ef3ef82239e ++Subproject commit 72cf8cdefcf8cde818745ad7998122bde0b54734 diff --git a/tests/appli-test-simple-seq-play.py.cmake b/tests/appli-test-simple-seq-play.py.cmake -index 5f7b599..3630a03 100644 +index 5f7b599..1209552 100644 --- tests/appli-test-simple-seq-play.py.cmake +++ tests/appli-test-simple-seq-play.py.cmake -@@ -3,7 +3,7 @@ from dynamic_graph.sot.core.matrix_util import matrixToTuple +@@ -3,8 +3,8 @@ from dynamic_graph.sot.core.matrix_util import matrixToTuple from dynamic_graph.sot.tools import SimpleSeqPlay from numpy import eye -from dynamic_graph.sot.core.sot import import Task +-from dynamic_graph.sot.core.feature_generic FeatureGeneric +from dynamic_graph.sot.core.sot import Task - from dynamic_graph.sot.core.feature_generic FeatureGeneric ++from dynamic_graph.sot.core.feature_generic import FeatureGeneric from dynamic_graph.sot.core.gain_adaptive import GainAdaptive from dynamic_graph.sot.core.meta_tasks import setGain + from dynamic_graph.sot.core.matrix_util import matrixToTuple -- 2.26.2 -- GitLab