From 739ddaddb36294711609610f90fe87661e7f44948e6369a04b98b290850c0d09 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 14 Jan 2022 16:09:26 +0000 Subject: [PATCH] Accepting request 946382 from home:bnavigator:branches:devel:languages:python - Extend package description - Remove python2 workarounds - Update to 1.3.0post2 * Export pyclipper.__version__ string (#40). * Removed long-deprecated SCALING_FACTOR global variable. - Relese 1.2.0 * Release the Global Interpreter Lock (GIL) while doing more CPU intensive calls to ClipperLib (union, difference, intersection, minkowski, offset, etc), to allow Python apps to better parallelize when using threading (#29, #30). - Drop python-pyclipper-no-unittest2.patch OBS-URL: https://build.opensuse.org/request/show/946382 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyclipper?expand=0&rev=8 --- pyclipper-1.1.0.post3.zip | 3 --- pyclipper-1.3.0.post2.tar.gz | 3 +++ python-pyclipper-no-unittest2.patch | 16 --------------- python-pyclipper.changes | 19 ++++++++++++++++++ python-pyclipper.spec | 31 ++++++++++++++--------------- 5 files changed, 37 insertions(+), 35 deletions(-) delete mode 100644 pyclipper-1.1.0.post3.zip create mode 100644 pyclipper-1.3.0.post2.tar.gz delete mode 100644 python-pyclipper-no-unittest2.patch diff --git a/pyclipper-1.1.0.post3.zip b/pyclipper-1.1.0.post3.zip deleted file mode 100644 index 06cf1a5..0000000 --- a/pyclipper-1.1.0.post3.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f1acd74bdb8c114fea2eab0bcf76460d1ef4b4120953e410fc7c638eb79e9e98 -size 138035 diff --git a/pyclipper-1.3.0.post2.tar.gz b/pyclipper-1.3.0.post2.tar.gz new file mode 100644 index 0000000..24bc555 --- /dev/null +++ b/pyclipper-1.3.0.post2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c096703dc32f2e4700a1f7054e8b58c29fe86212fa7a2c2adecb0102cb639fb2 +size 132899 diff --git a/python-pyclipper-no-unittest2.patch b/python-pyclipper-no-unittest2.patch deleted file mode 100644 index 3007954..0000000 --- a/python-pyclipper-no-unittest2.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: pyclipper-1.1.0.post3/tests/test_pyclipper.py -=================================================================== ---- pyclipper-1.1.0.post3.orig/tests/test_pyclipper.py 2019-11-29 17:53:00.000000000 +0100 -+++ pyclipper-1.1.0.post3/tests/test_pyclipper.py 2020-06-02 16:53:28.959317899 +0200 -@@ -4,7 +4,10 @@ Tests for Pyclipper wrapper library. - """ - - from __future__ import print_function --from unittest2 import TestCase, main -+try: -+ from unittest2 import TestCase, main -+except ImportError: -+ from unittest import TestCase, main - import sys - - if sys.version_info < (3,): diff --git a/python-pyclipper.changes b/python-pyclipper.changes index 5642fdf..6badddd 100644 --- a/python-pyclipper.changes +++ b/python-pyclipper.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Jan 14 09:37:10 UTC 2022 - Ben Greiner + +- Extend package description +- Remove python2 workarounds + +------------------------------------------------------------------- +Thu Jan 13 21:58:08 UTC 2022 - Ben Greiner + +- Update to 1.3.0post2 + * Export pyclipper.__version__ string (#40). + * Removed long-deprecated SCALING_FACTOR global variable. +- Relese 1.2.0 + * Release the Global Interpreter Lock (GIL) while doing more CPU + intensive calls to ClipperLib (union, difference, intersection, + minkowski, offset, etc), to allow Python apps to better + parallelize when using threading (#29, #30). +- Drop python-pyclipper-no-unittest2.patch + ------------------------------------------------------------------- Wed Jun 10 16:20:24 UTC 2020 - Matej Cepl diff --git a/python-pyclipper.spec b/python-pyclipper.spec index e9e3099..a4124ca 100644 --- a/python-pyclipper.spec +++ b/python-pyclipper.spec @@ -1,7 +1,7 @@ # # spec file for package python-pyclipper # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2020 Xu Zhao (i@xuzhao.net). # # All modifications and additions to the file contributed by third parties @@ -17,26 +17,21 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%bcond_without python2 +%{?!python_module:%define python_module() python3-%{**}} +%define skip_python2 1 Name: python-pyclipper -Version: 1.1.0.post3 +Version: 1.3.0.post2 Release: 0 -Summary: Cython wrapper for the Clipper library +Summary: Cython wrapper for the Clipper library for clipping lines and polygons License: MIT URL: https://github.com/fonttools/pyclipper -Source: https://files.pythonhosted.org/packages/source/p/pyclipper/pyclipper-%{version}.zip -# https://github.com/fonttools/pyclipper/pull/32 -Patch0: python-pyclipper-no-unittest2.patch +Source: https://files.pythonhosted.org/packages/source/p/pyclipper/pyclipper-%{version}.tar.gz BuildRequires: %{python_module Cython} BuildRequires: %{python_module devel} BuildRequires: %{python_module pytest} +BuildRequires: %{python_module setuptools_scm_git_archive} BuildRequires: %{python_module setuptools_scm} BuildRequires: %{python_module setuptools} -%if %{with python2} -# Required because of otherwise missing assertWarns -BuildRequires: python2-unittest2 -%endif BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: python-rpm-macros @@ -45,12 +40,15 @@ BuildRequires: unzip %description Pyclipper is a Cython wrapper exposing public functions and classes of -the C++ translation of the `Angus Johnson's Clipper library (ver. -6.4.2) `__. +the C++ translation of the `Angus Johnson's Clipper library`, a library +for clipping and offsetting lines and polygons. + +The Clipper library performs line & polygon clipping - intersection, +union, difference & exclusive-or, and line & polygon offsetting. The +library is based on Vatti's clipping algorithm. %prep %setup -q -n pyclipper-%{version} -%patch0 -p1 %build %python_build @@ -65,6 +63,7 @@ the C++ translation of the `Angus Johnson's Clipper library (ver. %files %{python_files} %doc README.rst %license LICENSE -%{python_sitearch}/* +%{python_sitearch}/pyclipper +%{python_sitearch}/pyclipper-%{version}*-info %changelog