Fix setup.py for the changes

fix compiling of colours module
raise DeprecationWarning when something from old API is called.

Signed-off-by: Naveen M K <[email protected]>

Author: naveen521kk

.gitignore

@@ -8,7 +8,7 @@ docs/_build
 *.c
 # C extensions
 *.so
-manimpango/*.dll
+*.dll
 # Distribution / packaging
 .Python
 build/

manimpango/__init__.py

@@ -10,8 +10,9 @@
         f"{os.environ['PATH']}"
     )
 try:
-    from .cmanimpango import *  # noqa: F403,F401
+    from ._deprecated.cmanimpango import *  # noqa: F403,F401
     from .enums import *  # noqa: F403,F401
     from .register_font import *  # noqa: F403,F401
+    from ._cutils import *  # noqa: F403,F401
 except ImportError:  # pragma: no cover
     raise ImportError("Couldn't load the necessary Shared Libraries.")

manimpango/_cutils.pyx

@@ -0,0 +1,8 @@
+from pango cimport *
+from cairo cimport *
+
+cpdef str pango_version():
+    return pango_version_string().decode('utf-8')
+
+cpdef str cairo_version():
+    return cairo_version_string().decode('utf-8')

manimpango/_depreciated/cmanimpango.pyx renamed to manimpango/_deprecated/cmanimpango.pyx

@@ -1,7 +1,20 @@
 from xml.sax.saxutils import escape
-from .utils import *
-from .enums import Alignment
+from ..utils import *
+from ..enums import Alignment
 import warnings
+from glib cimport *
+from cairo cimport *
+from pango cimport *
+import warnings
+
+def raise_deprecation_warning(name):
+    msg = (
+        "`manimpango.{n}` is a deprecated. "
+        "This warning may have happen because you have used newer "
+        "version of manimpango with older version of Manim. "
+        "Either upgrade Manim or downgrade ManimPango."
+    ).format(n=name)
+    warnings.warn(msg, DeprecationWarning, stacklevel=2)
 
 class TextSetting:
     """Formatting for slices of a :class:`manim.mobject.svg.text_mobject.Text` object."""
@@ -14,6 +27,7 @@ class TextSetting:
         weight,
         line_num=-1
     ):
+        raise_deprecation_warning("TextSetting")
         self.start = start
         self.end = end
         self.font = font.encode('utf-8')
@@ -34,6 +48,7 @@ def text2svg(
     orig_text:str
 ) -> int:
     """Render an SVG file from a :class:`manim.mobject.svg.text_mobject.Text` object."""
+    raise_deprecation_warning("text2svg")
     cdef cairo_surface_t* surface
     cdef cairo_t* cr
     cdef PangoFontDescription* font_desc
@@ -130,6 +145,7 @@ def text2svg(
 class MarkupUtils:
     @staticmethod
     def validate(text: str) -> bool:
+        raise_deprecation_warning("MarkupUtils.validate")
         text_bytes = text.encode("utf-8")
         return pango_parse_markup(text_bytes, -1, 0, NULL, NULL, NULL, NULL)
 
@@ -154,6 +170,7 @@ class MarkupUtils:
         alignment: Alignment = None
     ) -> int:
         """Render an SVG file from a :class:`manim.mobject.svg.text_mobject.MarkupText` object."""
+        raise_deprecation_warning("MarkupUtils.text2svg")
         cdef cairo_surface_t* surface
         cdef cairo_t* context
         cdef PangoFontDescription* font_desc
@@ -251,9 +268,3 @@ class MarkupUtils:
         cairo_surface_destroy(surface)
         g_object_unref(layout)
         return file_name
-
-cpdef str pango_version():
-    return pango_version_string().decode('utf-8')
-
-cpdef str cairo_version():
-    return cairo_version_string().decode('utf-8')

manimpango/_depreciated/cmanimpango.pxd

@@ -1,9 +1,10 @@
-from pango import *
+from pango cimport *
+
 cdef class Color:
     cdef int red
     cdef int green
     cdef int blue
     cdef PangoColor* color
     cpdef Color copy(self)
-    cpdef void* parse_color(self, char* spec)
+    cpdef void parse_color(self, char* spec)
     cpdef str to_string(self)

manimpango/colours.pxd

@@ -3,16 +3,13 @@
 # attributes.
 
 import copy
+
 cdef class Color:
-    cdef int red
-    cdef int green
-    cdef int blue
-    cdef PangoColor* color = NULL
     def __init__(self, red: int, green: int, blue: int):
         self.red = red
         self.green = green
         self.blue = blue
-     
+
     cpdef Color copy(self):
         """
         Make a deep copy of the ``Color`` structure.
@@ -59,7 +56,7 @@ cdef class Color:
         self._blue = int(blue)
         self.color.blue = blue
 
-    cpdef void* parse_color(self, char* spec):
+    cpdef void parse_color(self, char* spec):
         """
         Fill in the fields of a color from a string
         specification. The string can either one of

manimpango/colours.pyx

@@ -4,5 +4,6 @@ cdef extern from "glib.h":
     ctypedef unsigned int guint
     ctypedef gint gboolean
     ctypedef unsigned short guint16
+    ctypedef char gchar
     void g_object_unref(gpointer object)
     void g_free(gpointer mem)

manimpango/glib.pxd

@@ -7,5 +7,6 @@
 # gets a bit easy.
 
 cdef class Layout:
+
     def __init__(self):
         pass

manimpango/layout.pyx

@@ -41,6 +41,10 @@ cdef extern from "pango/pangocairo.h":
         PANGO_ALIGN_LEFT
         PANGO_ALIGN_CENTER
         PANGO_ALIGN_RIGHT
+    ctypedef struct PangoColor:
+        guint16 red
+        guint16 green
+        guint16 blue
     PangoLayout* pango_cairo_create_layout(cairo_t* cr)
     void pango_cairo_show_layout(
         cairo_t* cr,
@@ -137,6 +141,13 @@ cdef extern from "pango/pangocairo.h":
         PangoLayout *layout,
         PangoAlignment alignment
     )
+    bint pango_color_parse(
+        PangoColor *color,
+        const char *spec
+    )
+    gchar* pango_color_to_string(
+        const PangoColor *color
+    )
 
 cdef extern from *:
     """

manimpango/pango.pxd

@@ -207,8 +207,8 @@ def update_dict(dict1: dict, dict2: dict):
 
 ext_modules = [
     Extension(
-        "manimpango.cmanimpango",
-        [str(base_file / ("cmanimpango" + ext))],
+        "manimpango._deprecated.cmanimpango",
+        [str(base_file / "_deprecated" / ("cmanimpango" + ext))],
         **returns,
     ),
     Extension(
@@ -221,12 +221,23 @@ def update_dict(dict1: dict, dict2: dict):
         [str(base_file / ("register_font" + ext))],
         **returns,
     ),
+    # New one's here
+    Extension(
+        "manimpango._cutils",
+        [str(base_file / ("_cutils" + ext))],
+        **returns,
+    ),
+    Extension(
+        "manimpango.colours",
+        [str(base_file / ("colours" + ext))],
+        **returns,
+    ),
 ]
 if USE_CYTHON:
     ext_modules = cythonize(
         ext_modules,
         language_level=3,
-        include_path=["manimpango"],
+        include_path=["manimpango","manimpango/_deprecated"],
         gdb_debug=DEBUG,
         compiler_directives={"linetrace": coverage},
     )