[Git][debian-gis-team/aggdraw][master] 4 commits: New upstream version 1.3.17
Antonio Valentino (@antonio.valentino)
gitlab at salsa.debian.org
Thu Oct 12 06:14:59 BST 2023
Antonio Valentino pushed to branch master at Debian GIS Project / aggdraw
Commits:
b0af4555 by Antonio Valentino at 2023-10-12T05:06:35+00:00
New upstream version 1.3.17
- - - - -
d4fb9edf by Antonio Valentino at 2023-10-12T05:06:38+00:00
Update upstream source from tag 'upstream/1.3.17'
Update to upstream version '1.3.17'
with Debian dir 28ae6655d61d6eefa34243995cab72c636385eae
- - - - -
1d88a6d6 by Antonio Valentino at 2023-10-12T05:07:28+00:00
New upstream release
- - - - -
9cd13f0a by Antonio Valentino at 2023-10-12T05:10:22+00:00
Switch to autopkgtest-pkg-pybuild
- - - - -
8 changed files:
- + .github/dependabot.yml
- .github/workflows/ci.yml
- aggdraw.cxx
- debian/changelog
- debian/control
- − debian/tests/control
- − debian/tests/python3
- setup.py
Changes:
=====================================
.github/dependabot.yml
=====================================
@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+ - package-ecosystem: "github-actions" # See documentation for possible values
+ directory: "/" # Location of package manifests
+ schedule:
+ interval: "weekly"
=====================================
.github/workflows/ci.yml
=====================================
@@ -3,25 +3,17 @@ name: CI
on: [push, pull_request]
jobs:
- build:
+ test:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
- BUILDMODE: [CIBUILDWHEEL, UNITTEST]
+ python-version: ["3.9", "3.10", "3.11", "3.12"]
steps:
- - uses: actions/checkout at v2
-
- - uses: actions/setup-python at v2
-
- - name: Set up QEMU
- if: ${{ matrix.os == 'ubuntu-latest' && matrix.BUILDMODE == 'CIBUILDWHEEL' }}
- id: qemu
- uses: docker/setup-qemu-action at v1
+ - uses: actions/checkout at v4
- name: Setup Conda Environment
- if: ${{ matrix.BUILDMODE == 'UNITTEST' }}
uses: conda-incubator/setup-miniconda at v2
with:
miniforge-variant: Mambaforge
@@ -32,39 +24,61 @@ jobs:
activate-environment: test-environment
- name: Run tests
- if: ${{ matrix.BUILDMODE == 'UNITTEST' }}
shell: bash -l {0}
run: |
pip install -e .
python selftest.py
- - name: Build wheel
- if: ${{ matrix.BUILDMODE == 'CIBUILDWHEEL' }}
+
+ build:
+ name: "Build wheels on ${{ matrix.os }} ${{ matrix.cibw_archs }}"
+ runs-on: ${{ matrix.os }}
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - os: windows-2019
+ cibw_archs: "AMD64 ARM64"
+ - os: macos-11
+ cibw_archs: "x86_64 arm64"
+ - os: "ubuntu-20.04"
+ cibw_archs: "aarch64"
+ - os: "ubuntu-20.04"
+ cibw_archs: "x86_64"
+
+ steps:
+ - uses: actions/checkout at v4
+
+ - name: Set up QEMU
+ if: runner.os == 'Linux'
+ uses: docker/setup-qemu-action at v3
+ with:
+ platforms: all
+
+ - name: Build wheels
+ uses: pypa/cibuildwheel at v2.16.2
env:
CIBW_TEST_COMMAND: python {project}/selftest.py
CIBW_BEFORE_BUILD_LINUX: yum install -y freetype-devel
- CIBW_SKIP: "cp36-* pp* *-win32 *-manylinux_i686 *-musllinux*"
+ CIBW_SKIP: "cp36-* cp37-* cp38-* pp* *-win32 *-manylinux_i686 *-musllinux*"
CIBW_TEST_REQUIRES: numpy pillow pytest
- CIBW_ARCHS_LINUX: auto aarch64
+ CIBW_TEST_SKIP: "*_arm64 *_universal2:arm64"
+ CIBW_ARCHS: "${{ matrix.cibw_archs }}"
# disable finding unintended freetype installations
CIBW_ENVIRONMENT_WINDOWS: "AGGDRAW_FREETYPE_ROOT=''"
- run: |
- python -m pip install cibuildwheel
- cibuildwheel --output-dir wheelhouse
- name: upload
- if: ${{ matrix.BUILDMODE == 'CIBUILDWHEEL' }}
- uses: actions/upload-artifact at v2
+ uses: actions/upload-artifact at v3
with:
name: wheelhouse
- path: "wheelhouse/*.whl"
+ path: "./wheelhouse/*.whl"
publish:
runs-on: ubuntu-latest
needs:
- build
steps:
- - uses: actions/checkout at v2
+ - uses: actions/checkout at v4
- - uses: actions/setup-python at v2
+ - uses: actions/setup-python at v4
- name: sdist
run: |
@@ -72,14 +86,14 @@ jobs:
python -m build -s
- name: download
- uses: actions/download-artifact at v2
+ uses: actions/download-artifact at v3
with:
name: wheelhouse
path: dist
- name: Publish package to PyPI
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
- uses: pypa/gh-action-pypi-publish at v1.4.1
+ uses: pypa/gh-action-pypi-publish at v1.8.10
with:
user: __token__
password: ${{ secrets.pypi_password }}
=====================================
aggdraw.cxx
=====================================
@@ -335,11 +335,11 @@ text_getchar(PyObject* string, int index, unsigned long* char_out)
{
#if defined(HAVE_UNICODE)
if (PyUnicode_Check(string)) {
- Py_UNICODE* p = PyUnicode_AS_UNICODE(string);
- int size = PyUnicode_GET_SIZE(string);
- if (index >= size)
+ Py_ssize_t str_len = PyUnicode_GetLength(string);
+ if (index >= str_len)
return 0;
- *char_out = p[index];
+ Py_UCS4 this_char = PyUnicode_READ_CHAR(string, index);
+ *char_out = this_char;
return 1;
}
#endif
=====================================
debian/changelog
=====================================
@@ -1,7 +1,10 @@
-aggdraw (1.3.16-3) UNRELEASED; urgency=medium
+aggdraw (1.3.17-1) UNRELEASED; urgency=medium
[ Antonio Valentino ]
+ * New upstream release.
* Improve lintian-overrides.
+ * Switch to autopkgtest-pkg-pybuild and remove the
+ no longer needed d/tests folder.
[ Bas Couwenberg ]
* Switch to dh-sequence-*.
=====================================
debian/control
=====================================
@@ -3,7 +3,7 @@ Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Uploaders: Antonio Valentino <antonio.valentino at tiscali.it>
Section: python
Rules-Requires-Root: no
-Testsuite: autopkgtest-pkg-python
+Testsuite: autopkgtest-pkg-pybuild
Priority: optional
Build-Depends: debhelper-compat (= 13),
dh-python,
=====================================
debian/tests/control deleted
=====================================
@@ -1,2 +0,0 @@
-Tests: python3
-Depends: @, python3-all, python3-numpy, python3-pil, python3-pytest
=====================================
debian/tests/python3 deleted
=====================================
@@ -1,13 +0,0 @@
-#!/bin/sh
-set -efu
-
-PYS=${PYS:-"$(py3versions -s 2>/dev/null)"}
-
-TESTDIR=${PWD}
-
-cd "$AUTOPKGTEST_TMP"
-
-for py in $PYS; do
- echo "=== $py ==="
- $py -m pytest -v ${TESTDIR}/selftest.py
-done
=====================================
setup.py
=====================================
@@ -21,7 +21,7 @@ from sysconfig import get_config_var
from packaging.version import Version
from setuptools import setup, Extension
-VERSION = "1.3.16"
+VERSION = "1.3.17"
SUMMARY = "High quality drawing interface for PIL."
@@ -160,7 +160,6 @@ setup(
download_url="http://www.effbot.org/downloads#aggdraw",
license="Python (MIT style)",
long_description=DESCRIPTION.strip(),
- platforms="Python 2.7 and later.",
url="https://github.com/pytroll/aggdraw",
ext_modules=[
Extension("aggdraw", ["aggdraw.cxx"] + sources,
@@ -169,6 +168,6 @@ setup(
library_dirs=library_dirs, libraries=libraries
)
],
- python_requires='>=3.7',
+ python_requires='>=3.9',
tests_require=['pillow', 'pytest'],
)
View it on GitLab: https://salsa.debian.org/debian-gis-team/aggdraw/-/compare/bf77a99bc1114523af5461c325f527f7c21c6aba...9cd13f0aaa3f4f8aa0b6e2e139528d9be43277d5
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/aggdraw/-/compare/bf77a99bc1114523af5461c325f527f7c21c6aba...9cd13f0aaa3f4f8aa0b6e2e139528d9be43277d5
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20231012/9a0ae3ef/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list