.travis.yml

 language: python
 env:
   global:
-        # Set defaults to avoid repeating in most cases
   - PYTHON_VERSION=$TRAVIS_PYTHON_VERSION
   - NUMPY_VERSION=stable
   - MAIN_CMD='python setup.py'
@@ -10,33 +9,40 @@ env:
   - EVENT_TYPE='push pull_request'
   - SETUP_CMD='test'
   - CONDA_CHANNELS='conda-forge'
+  - CIBW_TEST_REQUIRES='numpy pillow'
+  - CIBW_TEST_COMMAND='python {project}/selftest.py'
+  - CIBW_BEFORE_BUILD_LINUX='yum install -y freetype-devel'
+  - TWINE_USERNAME='dhoese'
+  # TWINE_PASSWORD
+  - secure: Cmwxk41Nd+cu7l5Qhl7ZyCuwYg8WGCT53wqFBZMKIDZkNPVsnfaE8G9s1ZPTlpyoMEL5TioYTVjbjPXZD8M3z7OHHicXRP3mO53PrUDsETEl6/gR2h309ux/cWdOGgLd9s6CKT6wjtCT8Clft1cz61Y2ABOEtyTq3mrvPI0PyxE=
 matrix:
   include:
   - os: linux
-      sudo: required
-      python: 2.7
+    env:
+    - BUILDMODE=ASTROPY
+    - PYTHON_VERSION=2.7
   - os: linux
-      sudo: required
-      python: 3.6
+    env:
+    - BUILDMODE=ASTROPY
+    - PYTHON_VERSION=3.7
+  - os: osx
+    language: generic
+    env:
+    - BUILDMODE=ASTROPY
+    - PYTHON_VERSION=2.7
   - os: osx
     language: generic
-      env: PYTHON_VERSION=2.7
+    env:
+    - BUILDMODE=ASTROPY
+    - PYTHON_VERSION=3.7
+  - sudo: required
+    services:
+    - docker
+    env: BUILDMODE=CIBUILDWHEEL
   - os: osx
     language: generic
-      env: PYTHON_VERSION=3.6
+    env: BUILDMODE=CIBUILDWHEEL
 install:
-    - git clone --depth 1 git://github.com/astropy/ci-helpers.git
-    - source ci-helpers/travis/setup_conda.sh
+- source ci/travis-install.sh
 script:
-    - pip install -e .
-    - python selftest.py
-deploy:
-  provider: pypi
-  user: dhoese
-  password:
-    secure: CYnfdweDHxSlPfks5YDZp9w4i5q4m/iUbIRrt37oHWhWVpnHa19yhk4BOBig5dAVJ5L/nYI/qz5bdE7NNubaXNnJTszhgK6RNRKg0LD80zliJxtCBXPnj8fvCgRKeQieiOurjyy4t0lEfeIVhEaEut9o3CuJXpONh9Zf8oL698Y=
-  on:
-    tags: true
-    repo: pytroll/aggdraw
-    python: 3.6
-    distributions: sdist
+- source ci/travis-build.sh

README.rst

@@ -13,17 +13,10 @@ Anti-Grain Geometry library (from http://antigrain.com).
 
 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 <http://www.effbot.org/zone/aggdraw.htm>`_.
 
-Enjoy /F
-
-fredrik@pythonware.com
-http://www.pythonware.com
-
---------------------------------------------------------------------
 Build instructions (all platforms)
---------------------------------------------------------------------
+----------------------------------
 
 1. Check prerequisites.
 
@@ -33,10 +26,8 @@ Build instructions (all platforms)
 
    The following additional libraries can be used:
 
-   OpenType/TrueType    freetype2 (2.1.10 or later is recommended)
-   support
-                        http://www.freetype.org
-                        http://freetype.sourceforge.net
+   * OpenType/TrueType support - freetype2 (2.1.10 or later is recommended)
+     See http://www.freetype.org and http://freetype.sourceforge.net for details.
 
 2. Configure.
 
@@ -65,9 +56,8 @@ Build instructions (all platforms)
 
 5. Enjoy!
 
---------------------------------------------------------------------
-License
---------------------------------------------------------------------
+AGG2 License
+------------
 
 Anti-Grain Geometry - Version 2.0
 Copyright (c) 2002 Maxim Shemanarev (McSeem)
@@ -77,7 +67,8 @@ is granted provided this copyright notice appears in all copies.
 This software is provided "as is" without express or implied
 warranty, and with no claim as to its suitability for any purpose.
 
---------------------------------------------------------------------
+AggDraw License
+---------------
 
 The aggdraw interface, and associated modules and documentation are:
 
@@ -105,5 +96,3 @@ ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
---------------------------------------------------------------------

appveyor.yml

@@ -5,49 +5,63 @@ environment:
     CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci-helpers\\appveyor\\windows_sdk.cmd"
     CONDA_DEPENDENCIES: "sphinx pillow coveralls coverage"
     CONDA_CHANNELS: "conda-forge"
+    TWINE_USERNAME: "dhoese"
+    TWINE_PASSWORD:
+      secure: zws6RrJGZ5XULrqXQDF/Cw==
 
   matrix:
+
+    - CIBW_TEST_REQUIRES: "numpy pillow"
+      CIBW_TEST_COMMAND: "python {project}\\selftest.py"
+      CIBUILDWHEEL: 1
+
     - PYTHON: "C:\\Python27_32"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "32"
       NUMPY_VERSION: "stable"
+      CIBUILDWHEEL: 0
 
     - PYTHON: "C:\\Python27_64"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "64"
       NUMPY_VERSION: "stable"
+      CIBUILDWHEEL: 0
 
     - PYTHON: "C:\\Python36_32"
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "32"
       NUMPY_VERSION: "stable"
+      CIBUILDWHEEL: 0
 
     - PYTHON: "C:\\Python36_64"
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "64"
       NUMPY_VERSION: "stable"
+      CIBUILDWHEEL: 0
 
 install:
-    - "git clone --depth 1 git://github.com/astropy/ci-helpers.git"
-    - "powershell ci-helpers/appveyor/install-miniconda.ps1"
-    - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
-    - "activate test"
+  - if [%CIBUILDWHEEL%]==[0] git clone --depth 1 git://github.com/astropy/ci-helpers.git
+  - if [%CIBUILDWHEEL%]==[0] powershell ci-helpers/appveyor/install-miniconda.ps1
+  - if [%CIBUILDWHEEL%]==[0] SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
+  - if [%CIBUILDWHEEL%]==[0] call activate test
   
 build: false  # Not a C# project, build stuff at the test step instead.
 
+build_script:
+  - if [%CIBUILDWHEEL%]==[1] pip install cibuildwheel==0.10.0
+  - if [%CIBUILDWHEEL%]==[1] cibuildwheel --output-dir dist
+  - if [%CIBUILDWHEEL%]==[1] powershell ci/appveyor-twine.ps1
+
+
 test_script:
-  - "%CMD_IN_ENV% pip install -e ."
-  - "%CMD_IN_ENV% python selftest.py"
+  - if [%CIBUILDWHEEL%]==[0] conda info --envs
+  - if [%CIBUILDWHEEL%]==[0] %CMD_IN_ENV% pip install -e .
+  - if [%CIBUILDWHEEL%]==[0] %CMD_IN_ENV% python selftest.py
 
 after_test:
-  # If tests are successful, create a whl package for the project.
-  - "%CMD_IN_ENV% python setup.py bdist_wheel bdist_wininst"
+  - if [%CIBUILDWHEEL%]==[0] %CMD_IN_ENV% python setup.py bdist_wheel bdist_wininst
   - ps: "ls dist"
 
 artifacts:
   # Archive the generated wheel package in the ci.appveyor.com build report.
   - path: dist\*
-
-#on_success:
-#  - TODO: upload the content of dist/*.whl to a public wheelhouse
-#

ci/appveyor-twine.ps1

+# Small script for uploading wheels to pypi with twine
+
+if($env:appveyor_repo_tag -eq "true") {
+    python -m pip install twine
+    python -m twine upload --skip-existing dist/*.whl
+}
\ No newline at end of file

ci/travis-build.sh

+#!/usr/bin/env bash
+
+set -ex
+
+if [ "${BUILDMODE}" = "ASTROPY" ]; then
+    
+    pip install -e .
+    python selftest.py
+
+elif [ "${BUILDMODE}" = "CIBUILDWHEEL" ]; then
+
+    export PIP=pip
+    if [ $(uname) = "Darwin" ]; then
+      export PIP=pip2
+    fi
+    cibuildwheel --output-dir wheelhouse
+    if [[ $TRAVIS_TAG ]]; then
+        python -m pip install twine
+        python -m twine upload --skip-existing wheelhouse/*.whl
+        if [ $(uname) = "Darwin" ]; then # so we only do this once
+            python setup.py sdist
+            python -m twine upload --skip-existing dist/*.tar.gz
+        fi
+    fi
+fi
\ No newline at end of file

ci/travis-install.sh

+#!/usr/bin/env bash
+
+if [ "${BUILDMODE}" = "ASTROPY" ]; then
+
+    git clone --depth 1 git://github.com/astropy/ci-helpers.git
+    source ci-helpers/travis/setup_conda.sh
+
+elif [ "${BUILDMODE}" = "CIBUILDWHEEL" ]; then
+
+  export PIP=pip
+  if [ $(uname) = "Darwin" ]; then
+    export PIP=pip2
+  fi
+  $PIP install cibuildwheel==0.10.0
+
+fi
\ No newline at end of file

debian/changelog

+aggdraw (1.3.9+ds-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update debian/copyright file.
+
+ -- Antonio Valentino <antonio.valentino@tiscali.it>  Thu, 06 Dec 2018 17:04:08 +0000
+
 aggdraw (1.3.7+ds-1) unstable; urgency=medium
 
   * Initial release (Closes: #913943).

debian/copyright

@@ -13,6 +13,10 @@ Copyright: 2011-2018 AggDraw Developers
            2003      Hansruedi Baer (MacOS support)
 License: aggdraw
 
+Files: agg2/*
+Copyright: 2002 Maxim Shemanarev (McSeem)
+License: agg2
+
 Files: debian/*
 Copyright: 2018 Antonio Valentino <antonio.valentino@tiscali.it>
 License: aggdraw
@@ -44,13 +48,9 @@ License: aggdraw
  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
  OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- .
- The AggDraw repository and source distributions bundle other libraries that
- are compatibly license. We list these here.
- .
- Name: Anti-Grain Geometry - Version 2.0
- Files: agg2/*
- .
+
+License: agg2
+ Anti-Grain Geometry - Version 2.0
  Copyright (c) 2002 Maxim Shemanarev (McSeem)
  .
  Permission to copy, use, modify, sell and distribute this software

doc/Makefile

+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+SOURCEDIR     = .
+BUILDDIR      = _build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
\ No newline at end of file

doc/conf.py

+# -*- coding: utf-8 -*-
+#
+# Configuration file for the Sphinx documentation builder.
+#
+# This file does only contain a selection of the most common options. For a
+# full list see the documentation:
+# http://www.sphinx-doc.org/en/master/config
+
+# -- Path setup --------------------------------------------------------------
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+# To generate apidoc modules:
+#     sphinx-apidoc -f -T -o source/api ../aggdraw ../aggdraw/tests
+
+import os
+import sys
+sys.path.append(os.path.abspath('../../'))
+
+
+# -- Project information -----------------------------------------------------
+
+project = 'aggdraw'
+copyright = '2018, aggdraw Developers'
+author = 'aggdraw Developers'
+
+# The short X.Y version
+version = '1.3.8'
+# The full version, including alpha/beta/rc tags
+release = '1.3.8'
+
+
+# -- General configuration ---------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+    'sphinx.ext.autodoc',
+    'sphinx.ext.doctest',
+    'sphinx.ext.intersphinx',
+    'sphinx.ext.todo',
+    'sphinx.ext.imgmath',
+    'sphinx.ext.napoleon',
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The master toctree document.
+master_doc = 'index'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This pattern also affects html_static_path and html_extra_path.
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = None
+
+
+# -- Options for HTML output -------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'alabaster'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#
+# html_theme_options = {}
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Custom sidebar templates, must be a dictionary that maps document names
+# to template names.
+#
+# The default sidebars (for documents that don't match any pattern) are
+# defined by theme itself.  Builtin themes are using these templates by
+# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
+# 'searchbox.html']``.
+#
+# html_sidebars = {}
+
+
+# -- Options for HTMLHelp output ---------------------------------------------
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'aggdrawdoc'
+
+
+# -- Options for LaTeX output ------------------------------------------------
+
+latex_elements = {
+    # The paper size ('letterpaper' or 'a4paper').
+    #
+    # 'papersize': 'letterpaper',
+
+    # The font size ('10pt', '11pt' or '12pt').
+    #
+    # 'pointsize': '10pt',
+
+    # Additional stuff for the LaTeX preamble.
+    #
+    # 'preamble': '',
+
+    # Latex figure (float) alignment
+    #
+    # 'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    (master_doc, 'aggdraw.tex', 'aggdraw Documentation',
+     'aggdraw Developers', 'manual'),
+]
+
+
+# -- Options for manual page output ------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'aggdraw', 'aggdraw Documentation',
+     [author], 1)
+]
+
+
+# -- Options for Texinfo output ----------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (master_doc, 'aggdraw', 'aggdraw Documentation',
+     author, 'aggdraw', 'One line description of project.',
+     'Miscellaneous'),
+]
+
+
+# -- Options for Epub output -------------------------------------------------
+
+# Bibliographic Dublin Core info.
+epub_title = project
+
+# The unique identifier of the text. This can be a ISBN number
+# or the project homepage.
+#
+# epub_identifier = ''
+
+# A unique identification for the text.
+#
+# epub_uid = ''
+
+# A list of files that should not be packed into the epub file.
+epub_exclude_files = ['search.html']
+
+
+# -- Extension configuration -------------------------------------------------
+
+# -- Options for intersphinx extension ---------------------------------------
+
+# Example configuration for intersphinx: refer to the Python standard library.
+intersphinx_mapping = {'https://docs.python.org/': None}
+
+# -- Options for todo extension ----------------------------------------------
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = True
\ No newline at end of file

doc/index.rst

+.. aggdraw documentation master file, created by
+   sphinx-quickstart on Sun Nov 25 14:38:56 2018.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+AggDraw's documentation
+=======================
+
+.. automodule:: aggdraw
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`

doc/make.bat

+@ECHO OFF
+
+pushd %~dp0
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set SOURCEDIR=.
+set BUILDDIR=_build
+
+if "%1" == "" goto help
+
+%SPHINXBUILD% >NUL 2>NUL
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
+goto end
+
+:help
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
+
+:end
+popd

setup.py

@@ -20,7 +20,7 @@ try:
 except ImportError:
     from distutils.core import setup, Extension
 
-VERSION = "1.3.7"
+VERSION = "1.3.9"
 
 SUMMARY = "High quality drawing interface for PIL."