sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2234 from kleisauke/fix-ci-failures

Browse Source 
Fix CI failures
This commit is contained in:
John Cupitt 2021-05-03 12:19:21 +01:00 committed by GitHub
commit 1423c550cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -2,11 +2,7 @@
# also update the version number in the m4 macros below # 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.11.0], [vipsip@jiscmail.ac.uk])
=======
AC_INIT([vips], [8.10.7], [vipsip@jiscmail.ac.uk])
>>>>>>> 8.10
# required for gobject-introspection # required for gobject-introspection
AC_PREREQ(2.62) AC_PREREQ(2.62)

1
test/test-suite/test_foreign.py
View File

@ -44,6 +44,7 @@ class TestForeign:
def teardown_class(cls): def teardown_class(cls):
shutil.rmtree(cls.tempdir, ignore_errors=True) shutil.rmtree(cls.tempdir, ignore_errors=True)
cls.colour = None cls.colour = None
cls.rgba = None
cls.mono = None cls.mono = None
cls.rad = None cls.rad = None
cls.cmyk = None cls.cmyk = None