From 25a268c34148b0857d115bdeb81f4f0056e6465f Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Mon, 3 May 2021 12:39:40 +0200 Subject: [PATCH] Fix CI failures - Include the rgba image in the teardown of TestForeign. - Fix merge conflict. --- configure.ac | 4 ---- test/test-suite/test_foreign.py | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index c533d219..5b58cde7 100644 --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,7 @@ # also update the version number in the m4 macros below -<<<<<<< HEAD AC_INIT([vips], [8.11.0], [vipsip@jiscmail.ac.uk]) -======= -AC_INIT([vips], [8.10.7], [vipsip@jiscmail.ac.uk]) ->>>>>>> 8.10 # required for gobject-introspection AC_PREREQ(2.62) diff --git a/test/test-suite/test_foreign.py b/test/test-suite/test_foreign.py index d1a82e73..72bf416d 100644 --- a/test/test-suite/test_foreign.py +++ b/test/test-suite/test_foreign.py @@ -44,6 +44,7 @@ class TestForeign: def teardown_class(cls): shutil.rmtree(cls.tempdir, ignore_errors=True) cls.colour = None + cls.rgba = None cls.mono = None cls.rad = None cls.cmyk = None