Update changelog for 0.5.0-2~bpo11+1~evo release

Gbp-Dch: Ignore

.travis.yml

@@ -1,11 +1,11 @@
 language: python
 
 python:
-    - 2.7
-    - pypy
-    - 3.3
-    - 3.4
+    - 3.6
+    - 3.7
+    - 3.8
+    - 3.9
 
 install:
-   - pip install -U tox setuptools wheel $(python -V |& grep -q 'Python 3.2' && echo 'pip<8.0 virtualenv<14.0')
+   - pip install -U tox setuptools wheel
 script: tox

click_threading/__init__.py

@@ -21,7 +21,7 @@ try:
 except ImportError:
     from futures import Future as _Future
 
-__version__ = '0.4.3'
+__version__ = '0.5.0'
 
 _CTX_WORKER_KEY = __name__ + '.uiworker'
 

click_threading/_compat.py

@@ -1,12 +1,15 @@
 # -*- coding: utf-8 -*-
 
+import inspect
 import sys
 
 PY2 = sys.version_info[0] == 2
 
 if PY2:
+    getargspec = inspect.getargspec
     exec('def reraise(tp, value, tb=None):\n raise tp, value, tb')
 else:
+    getargspec = inspect.getfullargspec
     def reraise(tp, value, tb=None):
         if value.__traceback__ is not tb:
             raise value.with_traceback(tb)

click_threading/monkey.py

@@ -4,7 +4,7 @@ import types
 import contextlib
 import inspect
 
-from ._compat import PY2
+from ._compat import PY2, getargspec
 
 
 class FunctionInfo(object):
@@ -40,12 +40,16 @@ def patch_ui_functions(wrapper):
 
         new_f = wrapper(_copy_fn(f), info)
 
-        argspec = inspect.getargspec(f)
-        signature = inspect.formatargspec(*argspec) \
-            .lstrip('(') \
-            .rstrip(')')
-        args = ', '.join(arg.split('=')[0].split(':')[0].strip()
-                         for arg in signature.split(','))
+        orig_sig_obj = inspect.signature(f)
+        sig_obj = orig_sig_obj.replace(
+            parameters=[
+                p.replace(annotation=inspect.Parameter.empty)
+                for p in orig_sig_obj.parameters.values()
+            ],
+            return_annotation=inspect.Signature.empty,
+        )
+        signature = str(sig_obj).lstrip('(').rstrip(')')
+        args = ', '.join(p for p in sig_obj.parameters.keys())
 
         stub_f = eval('lambda {s}: {n}._real_click_fn({a})'
                       .format(n=f.__name__, s=signature, a=args))

debian/.gitlab-ci.yml

@@ -0,0 +1,7 @@
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
+variables:
+ # no compiled code
+ SALSA_CI_DISABLE_BLHC: 'true'

debian/changelog

@@ -0,0 +1,79 @@
+python-click-threading (0.5.0-2~bpo11+1~evo) bullseye-backports; urgency=medium
+
+  * Rebuild for bullseye-backports.
+
+ -- David Prévot <taffit@debian.org>  Fri, 03 Mar 2023 14:24:40 +0100
+
+python-click-threading (0.5.0-2) unstable; urgency=medium
+
+  [ Debian Janitor ]
+  * Remove constraints unnecessary since buster:
+    + Build-Depends: Drop versioned constraint on python3-click.
+
+ -- Jelmer Vernooij <jelmer@debian.org>  Mon, 17 Oct 2022 03:29:37 +0100
+
+python-click-threading (0.5.0-1) unstable; urgency=medium
+
+  * Team upload.
+  [ Ondřej Nový ]
+  * d/control: Update Maintainer field with new Debian Python Team
+    contact address.
+  * d/control: Update Vcs-* fields with new Debian Python Team Salsa
+    layout.
+
+  [ Debian Janitor ]
+  * Remove constraints unnecessary since stretch:
+    + Build-Depends: Drop versioned constraint on dh-python.
+  * Bump debhelper from old 9 to 13.
+  * Set upstream metadata fields: Bug-Database, Repository, Repository-
+    Browse, Bug-Submit.
+
+  [ Håvard Flaget Aasen ]
+  * New upstream version 0.5.0.
+    New upstream release is compatible with python3-click version 8.0.
+    Closes: #996337, #997480, #1000732
+  * Drop patch, no longer needed.
+  * d/watch: Update to version 4.
+  * Add upstream testsuite as autopkgtest.
+  * d/copyright: Add upstream-contact.
+  * Add rules-requires-root.
+  * Update Standards-Version to 4.6.0.
+
+ -- Håvard Flaget Aasen <haavard_aasen@yahoo.no>  Mon, 29 Nov 2021 08:05:38 +0000
+
+python-click-threading (0.4.4-2) unstable; urgency=medium
+
+  * Team upload.
+  * d/control: Set Vcs-* to salsa.debian.org
+  * d/copyright: Use https protocol in Format field
+  * Convert git repository from git-dpm to gbp layout
+  * Use debhelper-compat instead of debian/compat.
+  * Drop Python 2 support.
+
+ -- Ondřej Nový <onovy@debian.org>  Sat, 27 Jul 2019 01:27:19 +0200
+
+python-click-threading (0.4.4-1) unstable; urgency=medium
+
+  * New upstream version
+  * Bump standards version to 4.1.2 (no changes)
+
+ -- Filip Pytloun <filip@pytloun.cz>  Mon, 11 Dec 2017 17:33:58 +0100
+
+python-click-threading (0.4.3-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Filip Pytloun <filip@pytloun.cz>  Tue, 17 Jan 2017 19:50:15 +0100
+
+python-click-threading (0.4.2-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+
+ -- Ondřej Nový <onovy@debian.org>  Wed, 28 Dec 2016 23:04:51 +0100
+
+python-click-threading (0.4.0-1) unstable; urgency=low
+
+  * initial release (Closes: #833996)
+
+ -- Filip Pytloun <filip@pytloun.cz>  Thu, 11 Aug 2016 11:46:20 +0200

debian/control

@@ -0,0 +1,29 @@
+Source: python-click-threading
+Maintainer: Debian Python Team <team+python@tracker.debian.org>
+Uploaders: Filip Pytloun <filip@pytloun.cz>
+Section: python
+Priority: optional
+Build-Depends: debhelper-compat (= 13),
+               dh-python,
+               python3-all,
+               python3-click,
+               python3-pytest,
+               python3-setuptools
+Standards-Version: 4.6.0
+Testsuite: autopkgtest-pkg-python
+Rules-Requires-Root: no
+Homepage: https://github.com/click-contrib/click-threading
+Vcs-Browser: https://salsa.debian.org/python-team/packages/python-click-threading
+Vcs-Git: https://salsa.debian.org/python-team/packages/python-click-threading.git
+
+Package: python3-click-threading
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+Description: Utilities for multithreading in click - Python 3.x
+ Library for easier multithreaded development with Click.
+ Click is a Python package for creating beautiful command line interfaces in a
+ composable way with as little code as necessary. It’s the “Command Line
+ Interface Creation Kit”. It’s highly configurable but comes with sensible
+ defaults out of the box.
+ .
+ This package contains the Python 3.x module.

debian/copyright

@@ -0,0 +1,31 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: click-threading
+Upstream-Contact: Markus Unterwaditzer <markus@unterwaditzer.net>
+Source: https://github.com/click-contrib/click-threading
+
+Files: *
+Copyright: 2014-2015 Markus Unterwaditzer & contributors
+License: Expat
+
+Files: debian/*
+Copyright: 2016 Filip Pytloun <filip@pytloun.cz>
+License: Expat
+
+License: Expat
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  .
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  .
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.

debian/rules

@@ -0,0 +1,9 @@
+#!/usr/bin/make -f
+
+export PYBUILD_NAME=click-threading
+
+%:
+	dh $@ --with python3 --buildsystem=pybuild
+
+override_dh_auto_test:
+	LC_ALL=C.UTF-8 dh_auto_test

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/source/options

@@ -0,0 +1 @@
+extend-diff-ignore = "^[^/]*[.]egg-info/"

debian/tests/control

@@ -0,0 +1,4 @@
+Tests: upstream
+Depends: @,
+         python3-all,
+         python3-pytest,

debian/tests/upstream

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -efu
+
+cp -rv tests "${AUTOPKGTEST_TMP}"
+cd "${AUTOPKGTEST_TMP}"
+
+for py in $(py3versions -s); do
+    echo "[*] testing $py:"
+    $py -m pytest
+done

debian/upstream/metadata

@@ -0,0 +1,4 @@
+Bug-Database: https://github.com/click-contrib/click-threading/issues
+Bug-Submit: https://github.com/click-contrib/click-threading/issues/new
+Repository: https://github.com/click-contrib/click-threading.git
+Repository-Browse: https://github.com/click-contrib/click-threading

debian/watch

@@ -0,0 +1,3 @@
+version=4
+opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/python-click-threading-$1\.tar\.gz/ \
+  https://github.com/click-contrib/click-threading/tags .*/v?(\d\S*)\.tar\.gz

setup.py

@@ -23,7 +23,12 @@ setup(
     install_requires=[
         'click>=5.0',
     ],
-    extras_require={
-        ':python_version < "3.2"': 'futures'
-    }
+    python_requires=">=3.6",
+    classifiers=[
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+    ],
 )

tox.ini

@@ -2,5 +2,5 @@
 passenv = LANG
 deps =
     pytest
-    git+https://github.com/mitsuhiko/click
+    click
 commands = py.test