Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
shell: bash -l {0}
run: |
pip install -e .
python selftest.py
pytest -v

build:
name: "Build wheels on ${{ matrix.os }} ${{ matrix.cibw_archs }}"
Expand Down Expand Up @@ -63,17 +63,8 @@ jobs:
- name: Build wheels
uses: pypa/cibuildwheel@v3.3.1
env:
CIBW_TEST_COMMAND: python {project}/selftest.py
CIBW_BEFORE_BUILD_LINUX: yum install -y freetype-devel
CIBW_SKIP: "cp39-* cp310-* *-win32 *i686 *-musllinux*"
CIBW_TEST_REQUIRES: numpy pillow pytest
CIBW_TEST_SKIP: "*-win_arm64"
# see pyproject.toml for other options
CIBW_ARCHS: "${{ matrix.cibw_archs }}"
# disable finding unintended freetype installations
CIBW_ENVIRONMENT_WINDOWS: "AGGDRAW_FREETYPE_ROOT=''"
# we use libpng/libfreetype from homebrew which has a current limit of
# macos 14
CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=14
- name: upload
uses: actions/upload-artifact@v6
with:
Expand Down
1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
include aggdraw.cxx
include LICENSE.txt
recursive-include agg2 *.cpp
recursive-include agg2 *.h
16 changes: 0 additions & 16 deletions PKG-INFO

This file was deleted.

5 changes: 3 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ with the WCK renderer.

The necessary AGG sources are included in the aggdraw source kit.

For posterity, reference `the old documentation <http://www.effbot.org/zone/aggdraw.htm>`_.
For posterity, reference
`the old documentation <https://web.archive.org/web/20190308154642/http://effbot.org/zone/aggdraw-index.htm>`_.

Build instructions (all platforms)
----------------------------------
Expand Down Expand Up @@ -57,7 +58,7 @@ Build instructions (all platforms)

4. Once aggdraw is installed run the tests::

$ python selftest.py
$ pytest -v

5. Enjoy!

Expand Down
7 changes: 7 additions & 0 deletions aggdraw/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from .core import Draw, Pen, Brush, Path, Symbol, Font
from .dib import Dib

__all__ = ["Pen", "Brush", "Font", "Path", "Symbol", "Draw", "Dib"]

VERSION = "1.4.1"
__version__ = VERSION
4 changes: 2 additions & 2 deletions aggdraw.cxx → aggdraw/_aggdraw.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -2634,7 +2634,7 @@ const char *mod_doc = "Python interface to the Anti-Grain Graphics Drawing libra
#ifdef IS_PY3K
static struct PyModuleDef moduledef = {
PyModuleDef_HEAD_INIT,
"aggdraw",
"_aggdraw",
mod_doc,
-1,
aggdraw_functions,
Expand Down Expand Up @@ -2704,7 +2704,7 @@ aggdraw_init(void)

#ifdef IS_PY3K
PyMODINIT_FUNC
PyInit_aggdraw(void)
PyInit__aggdraw(void)
{
return aggdraw_init();
}
Expand Down
Loading
Loading