Skip to content
Open
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
14a862e
Port of aggdraw to agg 2.4
dov Jan 21, 2019
6274212
Fixed file references in MANIFEST.in.
dov Feb 5, 2019
b7ac3db
Tried to get rid of bad windows interaction with min/max macros.
dov Feb 5, 2019
9858643
Moved NOMINMAX define from sources to setup.py .
dov Feb 7, 2019
7d995f8
Merge branch 'master' into troll-agg24
djhoese Mar 11, 2019
030b9c4
Use array delete for point arrays
adenyes Jul 26, 2019
14960d7
Merge pull request #50 from dov/troll-agg24
djhoese Jul 28, 2019
e9d7bcb
Merge pull request #60 from adenyes/master
djhoese Jul 30, 2019
6c1cf87
Change default linejoin and linecap to preserve previous behavior (#62)
djhoese Nov 6, 2019
9c7cef5
Fix ci-helpers github URL in travis CI
djhoese Sep 27, 2020
7817f09
Remove py27 from appveyor builds and remove python 3.9 from wheel bui…
djhoese Sep 27, 2020
f86c847
Update version to 1.3.12 in setup.py
djhoese Sep 27, 2020
4c7594d
Add debug messages to travis install for cron debug
djhoese Oct 3, 2020
bd751fc
Update README badges to point to main intead of master
djhoese May 4, 2021
af5381d
Add linux aarch64 wheel build support (#81)
odidev Jan 26, 2022
c6deb81
Remove old travis and appveyor configs
djhoese Jan 26, 2022
ae4ff17
Include maint branches in CI runs
djhoese Jan 26, 2022
58109e4
Update release notes for 1.3.13
djhoese Jan 27, 2022
ec2fb52
Fix "PY_SSIZE_T_CLEAN macro must be defined for '#' formats" error
ejeschke Jun 18, 2022
db2697e
Merge pull request #83 from ejeschke/fix-PY_SSIZE_T_CLEAN-error
djhoese Jun 27, 2022
a611b17
Attempt to fix PyPy/CPython 3.8+ compatibility
djhoese Nov 2, 2022
8f15b50
Enable PyPy wheel builds
djhoese Nov 2, 2022
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
87 changes: 87 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
name: CI

on:
push:
branches: [main, "maint/*"]
pull_request:
branches: [main, "maint/*"]

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
BUILDMODE: [CIBUILDWHEEL, ASTROPY]

steps:
- uses: actions/checkout@v2

- uses: actions/setup-python@v2

- name: Set up QEMU
if: ${{ matrix.os == 'ubuntu-latest' && matrix.BUILDMODE == 'CIBUILDWHEEL' }}
id: qemu
uses: docker/setup-qemu-action@v1

- name: Setup Conda Environment
if: ${{ matrix.BUILDMODE == 'ASTROPY' }}
uses: conda-incubator/setup-miniconda@v2
with:
miniforge-variant: Mambaforge
miniforge-version: latest
use-mamba: true
python-version: ${{ matrix.python-version }}
environment-file: ci/environment.yaml
activate-environment: test-environment

- name: Run tests
if: ${{ matrix.BUILDMODE == 'ASTROPY' }}
shell: bash -l {0}
run: |
pip install -e .
python selftest.py
- name: Build wheel
if: ${{ matrix.BUILDMODE == 'CIBUILDWHEEL' }}
env:
CIBW_TEST_COMMAND: python {project}/selftest.py
CIBW_BEFORE_BUILD_LINUX: yum install -y freetype-devel
CIBW_SKIP: "*-musllinux*"
CIBW_TEST_REQUIRES: numpy pillow pytest
CIBW_ARCHS_LINUX: auto aarch64
run: |
python -m pip install cibuildwheel
cibuildwheel --output-dir wheelhouse
- name: upload
if: ${{ matrix.BUILDMODE == 'CIBUILDWHEEL' }}
uses: actions/upload-artifact@v2
with:
name: wheelhouse
path: "wheelhouse/*.whl"

publish:
if: startsWith(github.ref, 'refs/tags')
runs-on: ubuntu-latest
needs:
- build
steps:
- uses: actions/checkout@v2

- uses: actions/setup-python@v2

- name: sdist
run: python setup.py sdist

- name: download
uses: actions/download-artifact@v2

- name: Install dependencies
run: python -m pip install twine

- name: Publish wheels to PyPI
env:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
python -m twine upload --skip-existing dist/*.tar.gz
python -m twine upload --skip-existing wheelhouse/*.whl
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -167,3 +167,4 @@ ENV/
.idea/
# distutils MANIFEST
MANIFEST
.pytest_cache
46 changes: 0 additions & 46 deletions .travis.yml

This file was deleted.

8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# The aggdraw Library

## Version 1.3.13

- Rebuild for python 3.10 wheels and switch to GitHub Actions

## Version 1.3.12

- Rebuild for python 3.8 wheels

## Version 1.3.11

- Force rebuild to fix freetype linking in OSX wheels
Expand Down
4 changes: 2 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include aggdraw.cxx
include LICENSE.txt
recursive-include agg2 *.cpp
recursive-include agg2 *.h
recursive-include agg *.cpp
recursive-include agg *.h
22 changes: 18 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,25 @@
The aggdraw module
==================

.. image:: https://travis-ci.org/pytroll/aggdraw.svg?branch=master
:target: https://travis-ci.org/pytroll/aggdraw
.. image:: https://github.com/pytroll/aggdraw/workflows/CI/badge.svg?branch=main
:target: https://github.com/pytroll/aggdraw/actions?query=workflow%3A%22CI%22

.. image:: https://ci.appveyor.com/api/projects/status/9g7qt1kitwxya7u4/branch/master?svg=true
:target: https://ci.appveyor.com/project/pytroll/aggdraw/branch/master
----------------------------------------------------------------------
agg 2.4 notes
----------------------------------------------------------------------

aggdraw was ported to agg 2.4 and extended by

Dov Grobgeld <[email protected]>
2016-05-30 Mon

This port is planned for released as 1.4.0, but currently produces different
results from previous versions and the causes of these differences have not
been tracked down.

----------------------------------------------------------------------
Original README
----------------------------------------------------------------------

A high-quality graphics engine for PIL, based on Maxim Shemanarev's
Anti-Grain Geometry library (from http://antigrain.com).
Expand Down
Loading