8000 Bump cairo version dep to the one practically required by pycairo. · matplotlib/mplcairo@07d4456 · GitHub
[go: up one dir, main page]

Skip to content

Commit 07d4456

Browse files
committed
Bump cairo version dep to the one practically required by pycairo.
1 parent e2ca62d commit 07d4456

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

README.rst

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ mplcairo requires
6161
- Python≥3.7,
6262
- Matplotlib≥2.2 (declared as ``install_requires``),
6363
- on Linux and macOS, pycairo≥1.16.0 [#]_ (declared as ``install_requires``),
64-
- on Windows, cairo≥1.11.4 [#]_ (shipped with the wheel).
64+
- on Windows, cairo≥1.13.1 [#]_ (shipped with the wheel).
6565

6666
It is recommended to use cairo≥1.17.4.
6767

@@ -93,16 +93,15 @@ path <add_dll_directory_>`_).
9393

9494
.. [#] pycairo 1.16.0 added ``get_include()``.
9595
96-
We do not actually rely on pycairo's Python bindings. Rather, specifying a
97-
dependency on pycairo is a convenient way to specify a dependency on cairo
98-
(≥1.13.1, for pycairo≥1.14.0) itself, and allows us to load cairo at
99-
runtime instead of linking to it (simplifying the build of self-contained
100-
wheels).
96+
We do not actually rely on pycairo's Python bindings. Rather, the
97+
dependency on pycairo (≥1.16.0) conveniently specifies a dependency on
98+
cairo (≥1.13.1) itself, and allows us to load cairo at runtime instead of
99+
linking to it (simplifying the build of self-contained wheels).
101100
102101
On Windows, this strategy is (AFAIK) not possible, so we explicitly link
103102
against the cairo DLL.
104103
105-
.. [#] cairo 1.11.4 added mesh gradient support (used by ``draw_quad_mesh()``).
104+
.. [#] cairo 1.13.1 matches the oldest version supported by pycairo 1.16.0.
106105
107106
cairo 1.15.4 added support for PDF metadata and links; the presence of this
108107
feature is detected at runtime.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
from setupext import Extension, build_ext, find_packages, setup
3737

3838

39-
MIN_CAIRO_VERSION = "1.11.4" # Also in _feature_tests.cpp.
39+
MIN_CAIRO_VERSION = "1.13.1" # Also in _feature_tests.cpp.
4040
MIN_RAQM_VERSION = "0.7.0"
4141
MANYLINUX = bool(os.environ.get("MPLCAIRO_MANYLINUX", ""))
4242
UNITY_BUILD = not bool(os.environ.get("MPLCAIRO_NO_UNITY_BUILD"))

src/_feature_tests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
#endif
55

66
#include <cairo.h>
7-
#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 11, 4)
8-
#error "Your versoin of cairo version is too old."
7+
#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 13, 1)
8+
#error "Your version of cairo version is too old."
99
#endif

0 commit comments

Comments
 (0)
0