From 3226ad8b6791edbf73f18635acd29aac934390051d44f96876281a56585f8d4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 25 Feb 2019 08:27:22 +0000 Subject: [PATCH] Accepting request 678632 from home:jayvdb:coala - Trim unnecessary build dependencies using trim-test-deps.patch - Simplify skip_tcsh_tests.patch so it is easier to read and update - Update to v1.9.4 * Use the correct interpreter when checking wrappers * Provide shellcode as a module function (#237) - from v1.9.3 * Fix handling of COMP\_POINT * Fix crash when writing unicode to debug\_stream in Python 2 OBS-URL: https://build.opensuse.org/request/show/678632 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-argcomplete?expand=0&rev=21 --- argcomplete-1.9.2.tar.gz | 3 --- argcomplete-1.9.4.tar.gz | 3 +++ python-argcomplete.changes | 12 ++++++++++++ python-argcomplete.spec | 11 ++++------- skip_tcsh_tests.patch | 40 ++++++++++---------------------------- trim-test-deps.patch | 11 +++++++++++ 6 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 argcomplete-1.9.2.tar.gz create mode 100644 argcomplete-1.9.4.tar.gz create mode 100644 trim-test-deps.patch diff --git a/argcomplete-1.9.2.tar.gz b/argcomplete-1.9.2.tar.gz deleted file mode 100644 index 27b68b5..0000000 --- a/argcomplete-1.9.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d6ea272a93bb0387f758def836e73c36fff0c54170258c212de3e84f7db8d5ed -size 46445 diff --git a/argcomplete-1.9.4.tar.gz b/argcomplete-1.9.4.tar.gz new file mode 100644 index 0000000..bfbde82 --- /dev/null +++ b/argcomplete-1.9.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06c8a54ffaa6bfc9006314498742ec8843601206a3b94212f82657673662ecf1 +size 47471 diff --git a/python-argcomplete.changes b/python-argcomplete.changes index 0595bea..7b291e7 100644 --- a/python-argcomplete.changes +++ b/python-argcomplete.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Feb 25 05:52:03 UTC 2019 - John Vandenberg + +- Trim unnecessary build dependencies using trim-test-deps.patch +- Simplify skip_tcsh_tests.patch so it is easier to read and update +- Update to v1.9.4 + * Use the correct interpreter when checking wrappers + * Provide shellcode as a module function (#237) +- from v1.9.3 + * Fix handling of COMP\_POINT + * Fix crash when writing unicode to debug\_stream in Python 2 + ------------------------------------------------------------------- Tue Dec 4 12:45:38 UTC 2018 - Matej Cepl diff --git a/python-argcomplete.spec b/python-argcomplete.spec index 2353b07..32ce4ce 100644 --- a/python-argcomplete.spec +++ b/python-argcomplete.spec @@ -1,7 +1,7 @@ # # spec file for package python-argcomplete # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2013 Darin Perusich. # # All modifications and additions to the file contributed by third parties @@ -20,7 +20,7 @@ %{!?license: %global license %doc} %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-argcomplete -Version: 1.9.2 +Version: 1.9.4 Release: 0 Summary: Bash tab completion for argparse License: Apache-2.0 @@ -28,15 +28,12 @@ Group: Development/Languages/Python Url: https://github.com/kislyuk/argcomplete Source: https://files.pythonhosted.org/packages/source/a/argcomplete/argcomplete-%{version}.tar.gz Patch0: skip_tcsh_tests.patch +Patch1: trim-test-deps.patch BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros # SECTION tests -BuildRequires: %{python_module coverage} -BuildRequires: %{python_module flake8} BuildRequires: %{python_module pexpect} -BuildRequires: %{python_module wheel} # END SECTIONS tests -Requires: python-wheel BuildArch: noarch %python_subpackages @@ -57,6 +54,7 @@ resources over the network). %prep %setup -q -n argcomplete-%{version} %patch0 -p1 +%patch1 -p1 %build %python_build @@ -77,7 +75,6 @@ export LANG=en_US.UTF-8 %python_exec setup.py test %files %{python_files} -%defattr(-,root,root) %doc README.rst %license LICENSE.rst %{python_sitelib}/argcomplete-%{version}-py%{python_version}.egg-info diff --git a/skip_tcsh_tests.patch b/skip_tcsh_tests.patch index eda967a..4f22eb8 100644 --- a/skip_tcsh_tests.patch +++ b/skip_tcsh_tests.patch @@ -1,7 +1,7 @@ -diff -Nru argcomplete-1.9.2.orig/test/test.py argcomplete-1.9.2/test/test.py ---- argcomplete-1.9.2.orig/test/test.py 2017-08-23 19:29:25.000000000 +0200 -+++ argcomplete-1.9.2/test/test.py 2017-09-15 11:55:27.264394475 +0200 -@@ -1149,30 +1149,30 @@ +diff -ur argcomplete-1.9.4.orig/test/test.py argcomplete-1.9.4/test/test.py +--- argcomplete-1.9.4.orig/test/test.py 2018-02-13 22:40:04.000000000 +0700 ++++ argcomplete-1.9.4/test/test.py 2019-02-10 21:45:44.370237665 +0700 +@@ -1170,34 +1170,6 @@ self.assertEqual(self.sh.run_command('python -m package.prog basic f\t'), 'foo\r\n') @@ -12,6 +12,8 @@ diff -Nru argcomplete-1.9.2.orig/test/test.py argcomplete-1.9.2/test/test.py - 'test_continuation', - 'test_parse_special_characters', - 'test_parse_special_characters_dollar', +- # Test case doesn't work under tcsh, could be fixed. +- 'test_comp_point', - ] - - def setUp(self): @@ -29,30 +31,8 @@ diff -Nru argcomplete-1.9.2.orig/test/test.py argcomplete-1.9.2/test/test.py - with self.assertRaises((pexpect.EOF, OSError)): - self.sh.run_command('exit') - self.sh.run_command('') -+# class TestTcsh(_TestSh, unittest.TestCase): -+# expected_failures = [ -+# 'test_unquoted_space', -+# 'test_quoted_space', -+# 'test_continuation', -+# 'test_parse_special_characters', -+# 'test_parse_special_characters_dollar', -+# ] -+ -+# def setUp(self): -+# sh = Shell('tcsh') -+# path = ' '.join([os.path.join(BASE_DIR, 'scripts'), TEST_DIR, '$path']) -+# sh.run_command('set path = ({0})'.format(path)) -+# sh.run_command('setenv PYTHONPATH {0}'.format(BASE_DIR)) -+# output = sh.run_command('eval `register-python-argcomplete --shell tcsh prog`') -+# self.assertEqual(output, '') -+# self.sh = sh -+ -+# def tearDown(self): -+# # The shell wrapper is fragile; exactly which exception is raised -+# # differs depending on environment. -+# with self.assertRaises((pexpect.EOF, OSError)): -+# self.sh.run_command('exit') -+# self.sh.run_command('') - - +- +- class Shell(object): + def __init__(self, shell): + self.child = pexpect.spawn(shell, encoding='utf-8') diff --git a/trim-test-deps.patch b/trim-test-deps.patch new file mode 100644 index 0000000..3aafbe0 --- /dev/null +++ b/trim-test-deps.patch @@ -0,0 +1,11 @@ +--- argcomplete-1.9.2.orig/setup.py 2017-08-24 00:37:12.000000000 +0700 ++++ argcomplete-1.9.2/setup.py 2019-02-10 21:22:50.518878293 +0700 +@@ -4,7 +4,7 @@ + from setuptools import setup, find_packages + + install_requires = [] +-tests_require = ["coverage", "flake8", "pexpect", "wheel"] ++tests_require = ["pexpect"] + + setup( + name='argcomplete',