diff options
author | Paul Zander <negril.nx+gentoo@gmail.com> | 2024-06-04 14:19:19 +0200 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2024-06-06 01:58:09 +0100 |
commit | b1e1f05e988a019aa8be2bd5ba3f97f92f8c59d0 (patch) | |
tree | 286f80a62f45761b87c68caf7c9030f2ae989cf7 /media-gfx/alembic/files | |
parent | app-shells/fzf: Stabilize 0.51.0 amd64, #933645 (diff) | |
download | gentoo-b1e1f05e988a019aa8be2bd5ba3f97f92f8c59d0.tar.gz gentoo-b1e1f05e988a019aa8be2bd5ba3f97f92f8c59d0.tar.bz2 gentoo-b1e1f05e988a019aa8be2bd5ba3f97f92f8c59d0.zip |
media-gfx/alembic: 1.8.6 fix broken patch
kaputt .editorconfig broke this...
Closes: https://bugs.gentoo.org/933514
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37033
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-gfx/alembic/files')
-rw-r--r-- | media-gfx/alembic/files/alembic-1.8.6-py312.patch | 150 |
1 files changed, 83 insertions, 67 deletions
diff --git a/media-gfx/alembic/files/alembic-1.8.6-py312.patch b/media-gfx/alembic/files/alembic-1.8.6-py312.patch index 863388be22a9..499645280d9a 100644 --- a/media-gfx/alembic/files/alembic-1.8.6-py312.patch +++ b/media-gfx/alembic/files/alembic-1.8.6-py312.patch @@ -1,46 +1,83 @@ -From: Paul Zander <negril.nx+gentoo@gmail.com>
-tests: use assertEqual instead of assertEquals
-tests: use assertRaises instead of failUnlessRaises
-
-diff --git a/python/PyAlembic/Tests/testCollections.py b/python/PyAlembic/Tests/testCollections.py
-index ab48a54..1745582 100644
---- a/python/PyAlembic/Tests/testCollections.py
-+++ b/python/PyAlembic/Tests/testCollections.py
-@@ -67,14 +67,14 @@ class CollectionTest(unittest.TestCase):
- prop = group.getSchema().createCollection("prop")
- prop.setValue(strVec)
-
-- self.assertEquals(group.getSchema().getNumCollections(), 1)
-+ self.assertEqual(group.getSchema().getNumCollections(), 1)
-
- # TODO passing in time sampling here causes a segfault, most likely because
- # of how createCollection currently takes an Argument &, see #274
- cool = group.getSchema().createCollection("cool", md)
- cool.setTimeSampling(ts)
-
-- self.assertEquals(
-+ self.assertEqual(
- group.getSchema().getCollection(1).getMetaData().get("coupe"),
- "de ville" )
-
-diff --git a/python/PyAlembic/Tests/testCurves.py b/python/PyAlembic/Tests/testCurves.py
-index dba9e1c..956625a 100644
---- a/python/PyAlembic/Tests/testCurves.py
-+++ b/python/PyAlembic/Tests/testCurves.py
-@@ -59,7 +59,7 @@ class CurvesTest(unittest.TestCase):
- widthSamp, uvSamp )
-
- knots = curvesSamp.getKnots()
-- self.assertEquals(len(knots), 0)
-+ self.assertEqual(len(knots), 0)
-
- newKnots = FloatArray(4)
- for ii in range(4):
-diff --git a/python/PyAlembic/Tests/testTypes.py b/python/PyAlembic/Tests/testTypes.py
-index bad9577..f0e8d26 100644
---- a/python/PyAlembic/Tests/testTypes.py
-+++ b/python/PyAlembic/Tests/testTypes.py
-@@ -60,7 +60,7 @@ class TypesTest(unittest.TestCase):
+From 3b6c04d8c02520a973c95b51ca1fa4bd5e7e8e73 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Tue, 4 Jun 2024 14:15:11 +0200 +Subject: [PATCH] python/PyAlembic/Tests: update do python3.12 + +tests: use assertEqual instead of assertEquals +tests: use assertRaises instead of failUnlessRaises + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> +--- + maya/Tests/AbcExport_dupRoots_test.py | 2 +- + python/PyAlembic/Tests/testCollections.py | 4 ++-- + python/PyAlembic/Tests/testCurves.py | 2 +- + python/PyAlembic/Tests/testPropExcept.py | 2 +- + python/PyAlembic/Tests/testTypes.py | 2 +- + 5 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/maya/Tests/AbcExport_dupRoots_test.py b/maya/Tests/AbcExport_dupRoots_test.py +index d532c10..f864281 100644 +--- a/maya/Tests/AbcExport_dupRoots_test.py ++++ b/maya/Tests/AbcExport_dupRoots_test.py +@@ -48,7 +48,7 @@ class AbcExport_dupRootsTest(unittest.TestCase): + MayaCmds.group(n='group1') + MayaCmds.duplicate() + +- self.failUnlessRaises(RuntimeError, MayaCmds.AbcExport, ++ self.assertRaises(RuntimeError, MayaCmds.AbcExport, + j='-root group1|cube -root group2|cube -f dupRoots.abc') + + # the abc file shouldn't exist +diff --git a/python/PyAlembic/Tests/testCollections.py b/python/PyAlembic/Tests/testCollections.py +index ab48a54..1745582 100644 +--- a/python/PyAlembic/Tests/testCollections.py ++++ b/python/PyAlembic/Tests/testCollections.py +@@ -67,14 +67,14 @@ class CollectionTest(unittest.TestCase): + prop = group.getSchema().createCollection("prop") + prop.setValue(strVec) + +- self.assertEquals(group.getSchema().getNumCollections(), 1) ++ self.assertEqual(group.getSchema().getNumCollections(), 1) + + # TODO passing in time sampling here causes a segfault, most likely because + # of how createCollection currently takes an Argument &, see #274 + cool = group.getSchema().createCollection("cool", md) + cool.setTimeSampling(ts) + +- self.assertEquals( ++ self.assertEqual( + group.getSchema().getCollection(1).getMetaData().get("coupe"), + "de ville" ) + +diff --git a/python/PyAlembic/Tests/testCurves.py b/python/PyAlembic/Tests/testCurves.py +index dba9e1c..956625a 100644 +--- a/python/PyAlembic/Tests/testCurves.py ++++ b/python/PyAlembic/Tests/testCurves.py +@@ -59,7 +59,7 @@ class CurvesTest(unittest.TestCase): + widthSamp, uvSamp ) + + knots = curvesSamp.getKnots() +- self.assertEquals(len(knots), 0) ++ self.assertEqual(len(knots), 0) + + newKnots = FloatArray(4) + for ii in range(4): +diff --git a/python/PyAlembic/Tests/testPropExcept.py b/python/PyAlembic/Tests/testPropExcept.py +index e1a1dff..2ddf40d 100644 +--- a/python/PyAlembic/Tests/testPropExcept.py ++++ b/python/PyAlembic/Tests/testPropExcept.py +@@ -70,5 +70,5 @@ class PropExceptTest(unittest.TestCase): + p = props.getProperty("myprop") + self.assertEqual(p.getName(), "myprop") + +- self.failUnlessRaises(KeyError, props.getProperty, "notfound") ++ self.assertRaises(KeyError, props.getProperty, "notfound") + self.assertRaises(IndexError, props.getProperty, 99) +diff --git a/python/PyAlembic/Tests/testTypes.py b/python/PyAlembic/Tests/testTypes.py +index bad9577..f0e8d26 100644 +--- a/python/PyAlembic/Tests/testTypes.py ++++ b/python/PyAlembic/Tests/testTypes.py +@@ -60,7 +60,7 @@ class TypesTest(unittest.TestCase): self.assertIsNotNone(POD.kUnknownPOD)
# If a new POD type is added, this will throw an exception
@@ -49,27 +86,6 @@ index bad9577..f0e8d26 100644 def testDataTypeWrapper(self):
# Default Constructor
-diff --git a/maya/Tests/AbcExport_dupRoots_test.py b/maya/Tests/AbcExport_dupRoots_test.py
-index d532c10..f864281 100644
---- a/maya/Tests/AbcExport_dupRoots_test.py
-+++ b/maya/Tests/AbcExport_dupRoots_test.py
-@@ -48,7 +48,7 @@ class AbcExport_dupRootsTest(unittest.TestCase):
- MayaCmds.group(n='group1')
- MayaCmds.duplicate()
-
-- self.failUnlessRaises(RuntimeError, MayaCmds.AbcExport,
-+ self.assertRaises(RuntimeError, MayaCmds.AbcExport,
- j='-root group1|cube -root group2|cube -f dupRoots.abc')
-
- # the abc file shouldn't exist
-diff --git a/python/PyAlembic/Tests/testPropExcept.py b/python/PyAlembic/Tests/testPropExcept.py
-index e1a1dff..2ddf40d 100644
---- a/python/PyAlembic/Tests/testPropExcept.py
-+++ b/python/PyAlembic/Tests/testPropExcept.py
-@@ -70,5 +70,5 @@ class PropExceptTest(unittest.TestCase):
- p = props.getProperty("myprop")
- self.assertEqual(p.getName(), "myprop")
-
-- self.failUnlessRaises(KeyError, props.getProperty, "notfound")
-+ self.assertRaises(KeyError, props.getProperty, "notfound")
- self.assertRaises(IndexError, props.getProperty, 99)
+-- +2.45.1 + |