[Git][debian-gis-team/aggdraw][master] 5 commits: New upstream version 1.3.13
Antonio Valentino (@antonio.valentino)
gitlab at salsa.debian.org
Fri Jan 28 07:13:29 GMT 2022
Antonio Valentino pushed to branch master at Debian GIS Project / aggdraw
Commits:
cb1835cd by Antonio Valentino at 2022-01-28T07:05:14+00:00
New upstream version 1.3.13
- - - - -
2aee1523 by Antonio Valentino at 2022-01-28T07:05:18+00:00
Update upstream source from tag 'upstream/1.3.13'
Update to upstream version '1.3.13'
with Debian dir bd602a6b85bc1f5a5f619a7238c087539bbc204a
- - - - -
2a6ac9b9 by Antonio Valentino at 2022-01-28T07:06:14+00:00
New upstream release
- - - - -
757710b6 by Antonio Valentino at 2022-01-28T07:09:04+00:00
Update d/copyright
- - - - -
3cc849f3 by Antonio Valentino at 2022-01-28T07:09:40+00:00
Set distribution to unstable
- - - - -
12 changed files:
- + .github/workflows/ci.yml
- − .travis.yml
- CHANGELOG.md
- README.rst
- − appveyor.yml
- − ci/appveyor-twine.ps1
- + ci/environment.yaml
- − ci/travis-build.sh
- − ci/travis-install.sh
- debian/changelog
- debian/copyright
- setup.py
Changes:
=====================================
.github/workflows/ci.yml
=====================================
@@ -0,0 +1,81 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+ build:
+ runs-on: ${{ matrix.os }}
+ strategy:
+ matrix:
+ os: [ubuntu-latest, macos-latest]
+ BUILDMODE: [CIBUILDWHEEL, ASTROPY]
+
+ 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
+
+ - name: Setup Conda Environment
+ if: ${{ matrix.BUILDMODE == 'ASTROPY' }}
+ uses: conda-incubator/setup-miniconda at 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: pp* *-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 at v2
+ with:
+ name: wheelhouse
+ path: "wheelhouse/*.whl"
+
+ publish:
+ runs-on: ubuntu-latest
+ needs:
+ - build
+ steps:
+ - uses: actions/checkout at v2
+
+ - uses: actions/setup-python at v2
+
+ - name: sdist
+ run: python setup.py sdist
+
+ - name: download
+ uses: actions/download-artifact at v2
+
+ - name: Install dependencies
+ run: python -m pip install twine
+
+ - 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
+ with:
+ user: __token__
+ password: ${{ secrets.pypi_password }}
=====================================
.travis.yml deleted
=====================================
@@ -1,47 +0,0 @@
-language: generic
-env:
- global:
- - NUMPY_VERSION=stable
- - MAIN_CMD='python setup.py'
- - CONDA_DEPENDENCIES='sphinx pillow coveralls coverage pytest'
- - SETUP_XVFB=False
- - EVENT_TYPE='push pull_request'
- - SETUP_CMD='test'
- - CONDA_CHANNELS='conda-forge'
- - CONDA_CHANNEL_PRIORITY='True'
- - CIBW_TEST_REQUIRES='numpy pillow pytest'
- - CIBW_TEST_COMMAND='python {project}/selftest.py'
- - CIBW_BEFORE_BUILD_LINUX='yum install -y freetype-devel'
- - CIBW_SKIP='cp34-* cp35-* cp39-* pp27-* pp36-*'
- - TWINE_USERNAME='dhoese'
- # TWINE_PASSWORD
- - secure: Cmwxk41Nd+cu7l5Qhl7ZyCuwYg8WGCT53wqFBZMKIDZkNPVsnfaE8G9s1ZPTlpyoMEL5TioYTVjbjPXZD8M3z7OHHicXRP3mO53PrUDsETEl6/gR2h309ux/cWdOGgLd9s6CKT6wjtCT8Clft1cz61Y2ABOEtyTq3mrvPI0PyxE=
-matrix:
- include:
- - os: linux
- env:
- - BUILDMODE=ASTROPY
- - PYTHON_VERSION=2.7
- - os: linux
- env:
- - BUILDMODE=ASTROPY
- - PYTHON_VERSION=3.7
- - os: osx
- env:
- - BUILDMODE=ASTROPY
- - PYTHON_VERSION=2.7
- - os: osx
- env:
- - BUILDMODE=ASTROPY
- - PYTHON_VERSION=3.7
- - sudo: required
- language: python
- services:
- - docker
- env: BUILDMODE=CIBUILDWHEEL
- - os: osx
- env: BUILDMODE=CIBUILDWHEEL
-install:
-- source ci/travis-install.sh
-script:
-- ci/travis-build.sh
=====================================
CHANGELOG.md
=====================================
@@ -1,5 +1,9 @@
# 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
=====================================
README.rst
=====================================
@@ -2,11 +2,8 @@
The aggdraw module
==================
-.. image:: https://travis-ci.org/pytroll/aggdraw.svg?branch=master
- :target: https://travis-ci.org/pytroll/aggdraw
-
-.. image:: https://ci.appveyor.com/api/projects/status/9g7qt1kitwxya7u4/branch/master?svg=true
- :target: https://ci.appveyor.com/project/pytroll/aggdraw/branch/master
+.. image:: https://github.com/pytroll/aggdraw/workflows/CI/badge.svg?branch=main
+ :target: https://github.com/pytroll/aggdraw/actions?query=workflow%3A%22CI%22
A high-quality graphics engine for PIL, based on Maxim Shemanarev's
Anti-Grain Geometry library (from http://antigrain.com).
=====================================
appveyor.yml deleted
=====================================
@@ -1,56 +0,0 @@
-environment:
- global:
- PYTHON: "C:\\conda"
- MINICONDA_VERSION: "latest"
- CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci-helpers\\appveyor\\windows_sdk.cmd"
- CONDA_DEPENDENCIES: "sphinx pillow coveralls coverage pytest"
- CONDA_CHANNELS: "conda-forge"
- CONDA_CHANNEL_PRIORITY: "True"
- TWINE_USERNAME: "dhoese"
- TWINE_PASSWORD:
- secure: zws6RrJGZ5XULrqXQDF/Cw==
-
- matrix:
-
- - CIBW_TEST_REQUIRES: "numpy pillow pytest"
- CIBW_TEST_COMMAND: "python {project}\\selftest.py"
- CIBUILDWHEEL: 1
-
- - 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:
- - 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
- - if [%CIBUILDWHEEL%]==[1] cibuildwheel --output-dir dist
- - if [%CIBUILDWHEEL%]==[1] powershell ci/appveyor-twine.ps1
-
-
-test_script:
- - 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 [%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\*
=====================================
ci/appveyor-twine.ps1 deleted
=====================================
@@ -1,6 +0,0 @@
-# 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/environment.yaml
=====================================
@@ -0,0 +1,7 @@
+name: test-environment
+channels:
+ - conda-forge
+dependencies:
+ - numpy
+ - pillow
+ - pytest
=====================================
ci/travis-build.sh deleted
=====================================
@@ -1,38 +0,0 @@
-#!/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 [ $(uname) = "Darwin" ]; then
- # Re-do delocate with patched version that actually works for aggdraw
- $PIP install -U git+https://github.com/natefoo/delocate.git@top-level-fix-squash
- export PATH="$PATH:/Library/Frameworks/Python.framework/Versions/2.7/bin"
- WHEELS=wheelhouse/*.whl
- for w in $WHEELS
- do
- delocate-wheel -v $w
- done
- fi
-
- 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
=====================================
ci/travis-install.sh deleted
=====================================
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-if [[ "${BUILDMODE}" == "ASTROPY" ]]; then
- git clone --depth 1 https://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
-fi
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+aggdraw (1.3.13-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update d/copyright.
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it> Fri, 28 Jan 2022 07:09:31 +0000
+
aggdraw (1.3.12-2) unstable; urgency=medium
[ Bas Couwenberg ]
=====================================
debian/copyright
=====================================
@@ -16,7 +16,7 @@ Copyright: 2002 Maxim Shemanarev (McSeem)
License: agg2
Files: debian/*
-Copyright: 2018 Antonio Valentino <antonio.valentino at tiscali.it>
+Copyright: 2018-2022 Antonio Valentino <antonio.valentino at tiscali.it>
License: aggdraw
License: aggdraw
=====================================
setup.py
=====================================
@@ -24,7 +24,7 @@ try:
except ImportError:
from distutils.core import setup, Extension
-VERSION = "1.3.12"
+VERSION = "1.3.13"
SUMMARY = "High quality drawing interface for PIL."
View it on GitLab: https://salsa.debian.org/debian-gis-team/aggdraw/-/compare/694accdb64591d5c15a4b79e728cb06c99cbf69c...3cc849f3e49aaac8056dbd2a4a5f3066006027ec
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/aggdraw/-/compare/694accdb64591d5c15a4b79e728cb06c99cbf69c...3cc849f3e49aaac8056dbd2a4a5f3066006027ec
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/20220128/de447509/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list