Rename pyagg -> celiagg (celiagg#7)

suarezvictor · Nov 9, 2016 · 493faeb · 493faeb
1 parent 5b4d7e6
commit 493faeb
Show file tree

Hide file tree

Showing 48 changed files with 71 additions and 60 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,5 +24,5 @@
 build
 dist
 
-# pyagg specific
-pyagg/_pyagg.cpp
+# celiagg specific
+celiagg/_celiagg.cpp
diff --git a/.travis.yml b/.travis.yml
@@ -31,4 +31,4 @@ install:
     source activate test_env;
     pip install -e . ${BUILD_ARGS};
 script:
-    nosetests -v pyagg;
+    nosetests -v celiagg;
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,4 @@
-include pyagg/*.hxx
+include celiagg/*.hxx
 graft agg-svn/agg-2.4/include
 graft agg-svn/agg-2.4/font_freetype
 graft agg-svn/agg-2.4/font_win32_tt
diff --git a/README.md b/README.md
@@ -1,10 +1,11 @@
-pyagg
-=====
+celiagg
+=======
 
-pyagg provides a simple, stateless canvas object that uses [Anti-Grain Geometry 2.4] (svn://svn.code.sf.net/p/agg/svn)
-with Cython to render directly into a Numpy array.
+celiagg provides a simple, stateless canvas object that uses
+[Anti-Grain Geometry 2.4] (svn://svn.code.sf.net/p/agg/svn) with Cython to
+render directly into a Numpy array.
 
-A respectably modern compiler is required to build pyagg (one supporting certain C++11
+A respectably modern compiler is required to build celiagg (one supporting certain C++11
 features).
 
 # Installation
@@ -16,3 +17,13 @@ features).
 * Numpy
 * Cython
 * Freetype2 (optional)
+
+## Contributing
+We encourage contributions to celiagg!  If you would like to contribute, just
+fork the repository on GitHub, make your changes, and issue a pull request.
+
+## History
+celiagg started as pyagg (https://github.com/erikhvatum/pyagg) but was renamed
+to avoid clashing with PyAgg (https://github.com/karimbahgat/PyAgg).
+
+celiagg is a play on Celiac (Anti grain...) and AGG (Anti-Grain Geometry).
diff --git a/pyagg/__init__.py → celiagg/__init__.py b/pyagg/__init__.py → celiagg/__init__.py
@@ -26,13 +26,13 @@
 # flake8: noqa
 from __future__ import absolute_import
 
-from ._pyagg import HAS_TEXT
-from ._pyagg import (
+from ._celiagg import HAS_TEXT
+from ._celiagg import (
     AggError, BlendMode, BSpline, DrawingMode, Font, FontCacheType,
     GradientSpread, GradientUnits, GraphicsState, Image, InnerJoin,
     LinearGradientPaint, LineCap, LineJoin, RadialGradientPaint, Path,
     PatternPaint, PatternStyle, PixelFormat, Rect, ShapeAtPoints, SolidPaint,
     TextDrawingMode, Transform
 )
-from ._pyagg import (CanvasG8, CanvasGA16, CanvasRGB24, CanvasRGBA32,
+from ._celiagg import (CanvasG8, CanvasGA16, CanvasRGB24, CanvasRGBA32,
                      CanvasBGRA32, CanvasRGBA128)
diff --git a/pyagg/_pyagg.pyx → celiagg/_celiagg.pyx b/pyagg/_pyagg.pyx → celiagg/_celiagg.pyx
diff --git a/pyagg/_enums.pxd → celiagg/_enums.pxd b/pyagg/_enums.pxd → celiagg/_enums.pxd
diff --git a/pyagg/_font.pxd → celiagg/_font.pxd b/pyagg/_font.pxd → celiagg/_font.pxd
diff --git a/pyagg/_graphics_state.pxd → celiagg/_graphics_state.pxd b/pyagg/_graphics_state.pxd → celiagg/_graphics_state.pxd
diff --git a/pyagg/_image.pxd → celiagg/_image.pxd b/pyagg/_image.pxd → celiagg/_image.pxd
diff --git a/pyagg/_ndarray_canvas.pxd → celiagg/_ndarray_canvas.pxd b/pyagg/_ndarray_canvas.pxd → celiagg/_ndarray_canvas.pxd
diff --git a/pyagg/_paint.pxd → celiagg/_paint.pxd b/pyagg/_paint.pxd → celiagg/_paint.pxd
diff --git a/pyagg/_transform.pxd → celiagg/_transform.pxd b/pyagg/_transform.pxd → celiagg/_transform.pxd
diff --git a/pyagg/_vertex_source.pxd → celiagg/_vertex_source.pxd b/pyagg/_vertex_source.pxd → celiagg/_vertex_source.pxd
diff --git a/pyagg/conversion.pxi → celiagg/conversion.pxi b/pyagg/conversion.pxi → celiagg/conversion.pxi
diff --git a/pyagg/enums.pxi → celiagg/enums.pxi b/pyagg/enums.pxi → celiagg/enums.pxi
diff --git a/pyagg/font.cpp → celiagg/font.cpp b/pyagg/font.cpp → celiagg/font.cpp
diff --git a/pyagg/font.h → celiagg/font.h b/pyagg/font.h → celiagg/font.h
@@ -22,8 +22,8 @@
 //
 // Authors: John Wiggins
 
-#ifndef PYAGG_FONT_H
-#define PYAGG_FONT_H
+#ifndef CELIAGG_FONT_H
+#define CELIAGG_FONT_H
 
 #include <agg_basics.h>
 #include <agg_font_cache_manager.h>
@@ -88,4 +88,4 @@ class Font
 #endif
 };
 
-#endif // PYAGG_FONT_H
+#endif // CELIAGG_FONT_H
diff --git a/pyagg/font.pxi → celiagg/font.pxi b/pyagg/font.pxi → celiagg/font.pxi
@@ -76,7 +76,7 @@ IF _ENABLE_TEXT_RENDERING:
 ELSE:
     cdef class Font:
         def __init__(self, *args):
-            msg = ("The pyagg library was compiled without font support!  "
+            msg = ("The celiagg library was compiled without font support!  "
                    "If you would like to render text, you will need to "
                    "reinstall the library.")
             raise RuntimeError(msg)
diff --git a/pyagg/glyph_iter.cpp → celiagg/glyph_iter.cpp b/pyagg/glyph_iter.cpp → celiagg/glyph_iter.cpp
diff --git a/pyagg/glyph_iter.h → celiagg/glyph_iter.h b/pyagg/glyph_iter.h → celiagg/glyph_iter.h
@@ -22,8 +22,8 @@
 //
 // Authors: John Wiggins
 
-#ifndef PYAGG_GLYPH_ITER_H
-#define PYAGG_GLYPH_ITER_H
+#ifndef CELIAGG_GLYPH_ITER_H
+#define CELIAGG_GLYPH_ITER_H
 
 #include "font.h"
 
@@ -61,4 +61,4 @@ class GlyphIterator
     bool        m_is_drawing;
 };
 
-#endif // PYAGG_GLYPH_ITER_H
+#endif // CELIAGG_GLYPH_ITER_H
diff --git a/pyagg/graphics_state.h → celiagg/graphics_state.h b/pyagg/graphics_state.h → celiagg/graphics_state.h
@@ -22,8 +22,8 @@
 //
 // Authors: John Wiggins
 
-#ifndef PYAGG_GRAPHICS_STATE_H
-#define PYAGG_GRAPHICS_STATE_H
+#ifndef CELIAGG_GRAPHICS_STATE_H
+#define CELIAGG_GRAPHICS_STATE_H
 
 #include <vector>
 #include <agg_basics.h>
@@ -208,4 +208,4 @@ class GraphicsState
     bool            m_anti_aliased;
 };
 
-#endif // PYAGG_GRAPHICS_STATE_H
+#endif // CELIAGG_GRAPHICS_STATE_H
diff --git a/pyagg/graphics_state.pxi → celiagg/graphics_state.pxi b/pyagg/graphics_state.pxi → celiagg/graphics_state.pxi
diff --git a/pyagg/image.cpp → celiagg/image.cpp b/pyagg/image.cpp → celiagg/image.cpp
diff --git a/pyagg/image.h → celiagg/image.h b/pyagg/image.h → celiagg/image.h
@@ -22,8 +22,8 @@
 // 
 // Authors: John Wiggins
 
-#ifndef PYAGG_IMAGE_H
-#define PYAGG_IMAGE_H
+#ifndef CELIAGG_IMAGE_H
+#define CELIAGG_IMAGE_H
 
 #include <stdint.h>
 
@@ -252,4 +252,4 @@ class Image
     unsigned width() const;
 };
 
-#endif // PYAGG_IMAGE_H
+#endif // CELIAGG_IMAGE_H
diff --git a/pyagg/image.pxi → celiagg/image.pxi b/pyagg/image.pxi → celiagg/image.pxi
diff --git a/pyagg/ndarray_canvas.h → celiagg/ndarray_canvas.h b/pyagg/ndarray_canvas.h → celiagg/ndarray_canvas.h
diff --git a/pyagg/ndarray_canvas.hxx → celiagg/ndarray_canvas.hxx b/pyagg/ndarray_canvas.hxx → celiagg/ndarray_canvas.hxx
diff --git a/pyagg/ndarray_canvas.pxi → celiagg/ndarray_canvas.pxi b/pyagg/ndarray_canvas.pxi → celiagg/ndarray_canvas.pxi
@@ -187,7 +187,7 @@ cdef class CanvasBase:
           fill: The Paint to use for fills
         """
         IF not _ENABLE_TEXT_RENDERING:
-            msg = ("The pyagg library was compiled without font support!  "
+            msg = ("The celiagg library was compiled without font support!  "
                    "If you would like to render text, you will need to "
                    "reinstall the library.")
             raise RuntimeError(msg)

diff --git a/pyagg/paint.cpp → celiagg/paint.cpp b/pyagg/paint.cpp → celiagg/paint.cpp
diff --git a/pyagg/paint.h → celiagg/paint.h b/pyagg/paint.h → celiagg/paint.h
@@ -22,8 +22,8 @@
 //
 // Authors: John Wiggins
 
-#ifndef PYAGG_PAINT_H
-#define PYAGG_PAINT_H
+#ifndef CELIAGG_PAINT_H
+#define CELIAGG_PAINT_H
 
 #include <stdint.h>
 
@@ -198,4 +198,4 @@ class Paint
 
 #include "paint.hxx"
 
-#endif // PYAGG_PAINT_H
+#endif // CELIAGG_PAINT_H
diff --git a/pyagg/paint.hxx → celiagg/paint.hxx b/pyagg/paint.hxx → celiagg/paint.hxx
diff --git a/pyagg/paint.pxi → celiagg/paint.pxi b/pyagg/paint.pxi → celiagg/paint.pxi
diff --git a/pyagg/setup.py → celiagg/setup.py b/pyagg/setup.py → celiagg/setup.py
@@ -42,8 +42,8 @@
           "pre-made cpp file...")
 
 # These are added to the environment by the main setup.py script
-with_text_rendering = os.environ.get('PYAGG_TEXT_RENDERING', '0') == '1'
-with_pkgconfig = os.environ.get('PYAGG_USE_PKGCONFIG', '0') == '1'
+with_text_rendering = os.environ.get('CELIAGG_TEXT_RENDERING', '0') == '1'
+with_pkgconfig = os.environ.get('CELIAGG_USE_PKGCONFIG', '0') == '1'
 
 
 def get_freetype_info():
@@ -120,9 +120,9 @@ def configuration(parent_package='', top_path=None):
         'agg-svn/agg-2.4/src/agg_vpgen_segmentator.cpp',
     ]
     base_path = op.abspath(op.dirname(__file__))
-    pyagg_cython_source = op.join(base_path, '_pyagg.pyx')
-    pyagg_sources = ['font.cpp', 'glyph_iter.cpp', 'image.cpp', 'paint.cpp',
-                     'vertex_source.cpp', '_pyagg.cpp']
+    celiagg_cython_source = op.join(base_path, '_celiagg.pyx')
+    celiagg_sources = ['font.cpp', 'glyph_iter.cpp', 'image.cpp', 'paint.cpp',
+                       'vertex_source.cpp', '_celiagg.cpp']
 
     include_dirs = ['agg-svn/agg-2.4/include',
                     'agg-svn/agg-2.4',
@@ -157,17 +157,17 @@ def configuration(parent_package='', top_path=None):
     }
 
     # Installing from an SDIST is special...
-    cpp_pyagg = op.join('pyagg', '_pyagg.cpp')
-    pyx_pyagg = op.join('pyagg', '_pyagg.pyx')
-    is_sdist = op.exists(cpp_pyagg) and not op.exists(pyx_pyagg)
+    cpp_celiagg = op.join('celiagg', '_celiagg.cpp')
+    pyx_celiagg = op.join('celiagg', '_celiagg.pyx')
+    is_sdist = op.exists(cpp_celiagg) and not op.exists(pyx_celiagg)
 
     # Run Cython first if this is a development version
     if not is_sdist and cythonize is not None:
-        cythonize(pyagg_cython_source, language='c++',
+        cythonize(celiagg_cython_source, language='c++',
                   compile_time_env=cython_compile_env)
 
-    config = Configuration('pyagg', parent_package, top_path)
-    config.add_extension('_pyagg', sources=pyagg_sources + sources,
+    config = Configuration('celiagg', parent_package, top_path)
+    config.add_extension('_celiagg', sources=celiagg_sources + sources,
                          **ext_kwargs)
     config.add_subpackage('tests')
     return config

diff --git a/pyagg/tests/__init__.py → celiagg/tests/__init__.py b/pyagg/tests/__init__.py → celiagg/tests/__init__.py
diff --git a/pyagg/tests/test_canvas.py → celiagg/tests/test_canvas.py b/pyagg/tests/test_canvas.py → celiagg/tests/test_canvas.py
@@ -4,7 +4,7 @@
 import numpy as np
 from numpy.testing import assert_equal
 
-import pyagg as agg
+import celiagg as agg
 
 
 def test_cleanup():

diff --git a/pyagg/tests/test_no_text.py → celiagg/tests/test_no_text.py b/pyagg/tests/test_no_text.py → celiagg/tests/test_no_text.py
@@ -1,7 +1,7 @@
 from nose.tools import assert_raises
 import numpy as np
 
-import pyagg as agg
+import celiagg as agg
 
 
 def test_no_text_font_failure():

diff --git a/pyagg/tests/test_paint.py → celiagg/tests/test_paint.py b/pyagg/tests/test_paint.py → celiagg/tests/test_paint.py
@@ -1,5 +1,5 @@
-from pyagg import (GradientSpread, GradientUnits, SolidPaint,
-                   LinearGradientPaint, RadialGradientPaint)
+from celiagg import (GradientSpread, GradientUnits, SolidPaint,
+                     LinearGradientPaint, RadialGradientPaint)
 
 _GRADIENT_STOPS = ((0.0, 1.0, 0.0, 0.0, 1.0),
                    (0.5, 1.0, 1.0, 1.0, 1.0),

diff --git a/pyagg/tests/test_path.py → celiagg/tests/test_path.py b/pyagg/tests/test_path.py → celiagg/tests/test_path.py
@@ -1,7 +1,7 @@
 from nose.tools import assert_raises
 import numpy as np
 
-from pyagg import Path, ShapeAtPoints
+from celiagg import Path, ShapeAtPoints
 
 
 def test_sap_bad_init_args():

diff --git a/pyagg/tests/test_state.py → celiagg/tests/test_state.py b/pyagg/tests/test_state.py → celiagg/tests/test_state.py
@@ -1,8 +1,8 @@
 from nose.tools import assert_raises
 import numpy as np
 
-from pyagg import (GraphicsState, BlendMode, DrawingMode, Image, InnerJoin,
-                   LineCap, LineJoin, PixelFormat, Rect, TextDrawingMode)
+from celiagg import (GraphicsState, BlendMode, DrawingMode, Image, InnerJoin,
+                     LineCap, LineJoin, PixelFormat, Rect, TextDrawingMode)
 
 
 def array_bases_equal(arr0, arr1):

diff --git a/pyagg/tests/test_transform.py → celiagg/tests/test_transform.py b/pyagg/tests/test_transform.py → celiagg/tests/test_transform.py
@@ -1,7 +1,7 @@
 import numpy as np
 from numpy.testing import assert_allclose
 
-from pyagg import Transform
+from celiagg import Transform
 
 
 def test_construction():

diff --git a/pyagg/transform.pxi → celiagg/transform.pxi b/pyagg/transform.pxi → celiagg/transform.pxi
diff --git a/pyagg/vertex_source.cpp → celiagg/vertex_source.cpp b/pyagg/vertex_source.cpp → celiagg/vertex_source.cpp
diff --git a/pyagg/vertex_source.h → celiagg/vertex_source.h b/pyagg/vertex_source.h → celiagg/vertex_source.h
@@ -22,8 +22,8 @@
 //
 // Authors: John Wiggins
 
-#ifndef PYAGG_VERTEX_SOURCE_H
-#define PYAGG_VERTEX_SOURCE_H
+#ifndef CELIAGG_VERTEX_SOURCE_H
+#define CELIAGG_VERTEX_SOURCE_H
 
 #include <math.h>
 #include <agg_path_storage.h>
@@ -136,4 +136,4 @@ class RepeatedSource : public VertexSource
     const RepeatedSource& operator=(const RepeatedSource&);
 };
 
-#endif // PYAGG_VERTEX_SOURCE_H
+#endif // CELIAGG_VERTEX_SOURCE_H
diff --git a/pyagg/vertex_source.pxi → celiagg/vertex_source.pxi b/pyagg/vertex_source.pxi → celiagg/vertex_source.pxi
diff --git a/examples/python_logo.py b/examples/python_logo.py
@@ -1,7 +1,7 @@
 import numpy as np
 from skimage.io import imsave
 
-import pyagg as agg
+import celiagg as agg
 
 
 top = agg.Path()

diff --git a/examples/stencil.py b/examples/stencil.py
@@ -1,7 +1,7 @@
 import numpy as np
 from skimage.io import imsave
 
-import pyagg as agg
+import celiagg as agg
 
 SIZE = 1000
 

diff --git a/setup.py b/setup.py
@@ -31,13 +31,13 @@
 # Disable text rendering with this option
 if '--no-text-rendering' in sys.argv:
     del sys.argv[sys.argv.index('--no-text-rendering')]
-    os.environ['PYAGG_TEXT_RENDERING'] = '0'
+    os.environ['CELIAGG_TEXT_RENDERING'] = '0'
 else:
-    os.environ['PYAGG_TEXT_RENDERING'] = '1'
-    os.environ['PYAGG_USE_PKGCONFIG'] = '1'
+    os.environ['CELIAGG_TEXT_RENDERING'] = '1'
+    os.environ['CELIAGG_USE_PKGCONFIG'] = '1'
     if '--no-freetype-pkg-config' in sys.argv:
         del sys.argv[sys.argv.index('--no-freetype-pkg-config')]
-        os.environ['PYAGG_USE_PKGCONFIG'] = '0'
+        os.environ['CELIAGG_USE_PKGCONFIG'] = '0'
 
 
 def configuration(parent_package='', top_path=None):
@@ -48,11 +48,11 @@ def configuration(parent_package='', top_path=None):
         delegate_options_to_subpackages=True,
         quiet=True)
 
-    config.add_subpackage('pyagg')
+    config.add_subpackage('celiagg')
     return config
 
 setup(
-    name='pyagg',
+    name='celiagg',
     configuration=configuration,
     license='MIT',
     version='0.1.0',
@@ -73,5 +73,5 @@ def configuration(parent_package='', top_path=None):
         'Operating System :: MacOS',
     ],
     requires=['numpy', 'freetype'],
-    packages=['pyagg', 'pyagg.tests']
+    packages=['celiagg', 'celiagg.tests']
 )