From 6ad3671ba3e8627b48d7b81746ec5b9b7943a20eddfab849a23be45fbae1e6ba Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 2 Dec 2019 12:17:31 +0000 Subject: [PATCH 1/3] - go back to 0.8.9, cliff (which is the only user) is not compatible with >= 0.9.0 atm - Same commit like October 23th OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cmd2?expand=0&rev=66 --- cmd2-0.8.9.tar.gz | 3 +++ cmd2-0.9.20.tar.gz | 3 --- python-cmd2.changes | 7 +++++++ python-cmd2.spec | 33 ++++++++++++++------------------- 4 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 cmd2-0.8.9.tar.gz delete mode 100644 cmd2-0.9.20.tar.gz diff --git a/cmd2-0.8.9.tar.gz b/cmd2-0.8.9.tar.gz new file mode 100644 index 0000000..d1f90ab --- /dev/null +++ b/cmd2-0.8.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:145cb677ebd0e3cae546ab81c30f6c25e0b08ba0f1071df854d53707ea792633 +size 112543 diff --git a/cmd2-0.9.20.tar.gz b/cmd2-0.9.20.tar.gz deleted file mode 100644 index 698fd0b..0000000 --- a/cmd2-0.9.20.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ba349af127f9052363972adcbcfb921f9ca5e90f2bcbfba11b117500f11a845 -size 560696 diff --git a/python-cmd2.changes b/python-cmd2.changes index 12497a5..b9ed5f3 100644 --- a/python-cmd2.changes +++ b/python-cmd2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Dec 2 12:17:09 UTC 2019 - Dirk Mueller + +- go back to 0.8.9, cliff (which is the only user) is not compatible + with >= 0.9.0 atm +- Same commit like October 23th + ------------------------------------------------------------------- Fri Nov 22 10:46:57 UTC 2019 - Tomáš Chvátal diff --git a/python-cmd2.spec b/python-cmd2.spec index 8913cd5..ca14f95 100644 --- a/python-cmd2.spec +++ b/python-cmd2.spec @@ -17,30 +17,25 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define skip_python2 1 Name: python-cmd2 -Version: 0.9.20 +# Do not update beyond what is supported by cliff! +Version: 0.8.9 Release: 0 Summary: Extra features for standard library's cmd module License: MIT URL: https://github.com/python-cmd2/cmd2 Source: https://files.pythonhosted.org/packages/source/c/cmd2/cmd2-%{version}.tar.gz -BuildRequires: %{python_module setuptools_scm} +BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module setuptools} -BuildRequires: %{pythons} -BuildRequires: fdupes +BuildRequires: %{python_module wcwidth} +BuildRequires: python-enum34 BuildRequires: python-rpm-macros -BuildRequires: vim -Requires: python -Requires: python-attrs >= 16.3.0 -Requires: python-colorama >= 0.3.7 -Requires: python-pyperclip >= 1.6 -Requires: python-wcwidth >= 0.1.7 +BuildRequires: python-subprocess32 +Requires: python-pyparsing >= 2.0.1 +Requires: python-pyperclip +Requires: python-six +Requires: python-wcwidth BuildArch: noarch -%if %{python3_version_nodots} < 35 -Requires: python-contextlib2 -Requires: python-typing -%endif # SECTION Test requirements BuildRequires: %{python_module attrs >= 16.3.0} BuildRequires: %{python_module colorama >= 0.3.7} @@ -50,10 +45,12 @@ BuildRequires: %{python_module pytest-mock} BuildRequires: %{python_module pytest} BuildRequires: %{python_module wcwidth >= 0.1.7} # Required by tests. +BuildRequires: fdupes BuildRequires: vim %if 0%{?suse_version} <= 1315 BuildRequires: %{python_module contextlib2} -BuildRequires: %{python_module typing} +Requires: python-enum34 +Requires: python-subprocess32 %endif # /SECTION %python_subpackages @@ -79,8 +76,6 @@ Drop-in replacement adds several features for command-prompt tools: %prep %setup -q -n cmd2-%{version} -# Fix non-executable-script -sed -i -e '/^#!\//, 1d' cmd2/cmd2.py # Fix spurious-executable-perm chmod a-x README.md @@ -96,7 +91,7 @@ chmod a-x README.md %files %{python_files} %license LICENSE -%doc CHANGELOG.md CODEOWNERS README.md +%doc CHANGELOG.md README.md %{python3_sitelib}/* %changelog From df7312e7405839f49f7446cd498c960b53fd603e4b36ec789c65e3c78dabd61e Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 11 Dec 2019 10:02:05 +0000 Subject: [PATCH 2/3] Accepting request 755773 from home:mcepl:branches:Cloud:OpenStack:Factory Replace the project SR with the individual requests. OBS-URL: https://build.opensuse.org/request/show/755773 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cmd2?expand=0&rev=67 --- cmd2-0.8.9.tar.gz | 3 --- cmd2-0.9.20.tar.gz | 3 +++ python-cmd2.changes | 7 ------- python-cmd2.spec | 33 +++++++++++++++++++-------------- 4 files changed, 22 insertions(+), 24 deletions(-) delete mode 100644 cmd2-0.8.9.tar.gz create mode 100644 cmd2-0.9.20.tar.gz diff --git a/cmd2-0.8.9.tar.gz b/cmd2-0.8.9.tar.gz deleted file mode 100644 index d1f90ab..0000000 --- a/cmd2-0.8.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:145cb677ebd0e3cae546ab81c30f6c25e0b08ba0f1071df854d53707ea792633 -size 112543 diff --git a/cmd2-0.9.20.tar.gz b/cmd2-0.9.20.tar.gz new file mode 100644 index 0000000..698fd0b --- /dev/null +++ b/cmd2-0.9.20.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ba349af127f9052363972adcbcfb921f9ca5e90f2bcbfba11b117500f11a845 +size 560696 diff --git a/python-cmd2.changes b/python-cmd2.changes index b9ed5f3..12497a5 100644 --- a/python-cmd2.changes +++ b/python-cmd2.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Mon Dec 2 12:17:09 UTC 2019 - Dirk Mueller - -- go back to 0.8.9, cliff (which is the only user) is not compatible - with >= 0.9.0 atm -- Same commit like October 23th - ------------------------------------------------------------------- Fri Nov 22 10:46:57 UTC 2019 - Tomáš Chvátal diff --git a/python-cmd2.spec b/python-cmd2.spec index ca14f95..8913cd5 100644 --- a/python-cmd2.spec +++ b/python-cmd2.spec @@ -17,25 +17,30 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define skip_python2 1 Name: python-cmd2 -# Do not update beyond what is supported by cliff! -Version: 0.8.9 +Version: 0.9.20 Release: 0 Summary: Extra features for standard library's cmd module License: MIT URL: https://github.com/python-cmd2/cmd2 Source: https://files.pythonhosted.org/packages/source/c/cmd2/cmd2-%{version}.tar.gz -BuildRequires: %{python_module pytest-xdist} +BuildRequires: %{python_module setuptools_scm} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module wcwidth} -BuildRequires: python-enum34 +BuildRequires: %{pythons} +BuildRequires: fdupes BuildRequires: python-rpm-macros -BuildRequires: python-subprocess32 -Requires: python-pyparsing >= 2.0.1 -Requires: python-pyperclip -Requires: python-six -Requires: python-wcwidth +BuildRequires: vim +Requires: python +Requires: python-attrs >= 16.3.0 +Requires: python-colorama >= 0.3.7 +Requires: python-pyperclip >= 1.6 +Requires: python-wcwidth >= 0.1.7 BuildArch: noarch +%if %{python3_version_nodots} < 35 +Requires: python-contextlib2 +Requires: python-typing +%endif # SECTION Test requirements BuildRequires: %{python_module attrs >= 16.3.0} BuildRequires: %{python_module colorama >= 0.3.7} @@ -45,12 +50,10 @@ BuildRequires: %{python_module pytest-mock} BuildRequires: %{python_module pytest} BuildRequires: %{python_module wcwidth >= 0.1.7} # Required by tests. -BuildRequires: fdupes BuildRequires: vim %if 0%{?suse_version} <= 1315 BuildRequires: %{python_module contextlib2} -Requires: python-enum34 -Requires: python-subprocess32 +BuildRequires: %{python_module typing} %endif # /SECTION %python_subpackages @@ -76,6 +79,8 @@ Drop-in replacement adds several features for command-prompt tools: %prep %setup -q -n cmd2-%{version} +# Fix non-executable-script +sed -i -e '/^#!\//, 1d' cmd2/cmd2.py # Fix spurious-executable-perm chmod a-x README.md @@ -91,7 +96,7 @@ chmod a-x README.md %files %{python_files} %license LICENSE -%doc CHANGELOG.md README.md +%doc CHANGELOG.md CODEOWNERS README.md %{python3_sitelib}/* %changelog From 4c3abffbfea4b4d5e6de8c98ec7d3ec50b843da5e8ecdc60da64cbc184839aee Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 3 Jan 2020 10:37:15 +0000 Subject: [PATCH 3/3] - Update to 0.9.22: - Fixed bug where a redefined ansi.style_error was not being used in all cmd2 files - Enabled line buffering when redirecting output to a file - Added align_left(), align_center(), and align_right() to utils.py. All 3 of these functions support ANSI escape sequences and characters with display widths greater than 1. They wrap align_text() which is also in utils.py. - Fixed bug where pipe processes were not being stopped by Ctrl-C - Added exception handling to account for non-standard Python environments in which readline is not loaded dynamically from a shared library file - Added read_input() function that is used to read from stdin. Unlike the Python built-in input(), it also has an argument to disable tab completion while input is being entered. - Added capability to override the argument parser class used by cmd2 built-in commands. See override_parser.py example for more details. - Added end argument to pfeedback() to be consistent with the other print functions like poutput(). - Added apply_style to pwarning(). - For consistency between all the print functions: - Made end and chop keyword-only arguments of ppaged() - end is always added to message in ppaged() OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cmd2?expand=0&rev=68 --- cmd2-0.9.20.tar.gz | 3 --- cmd2-0.9.22.tar.gz | 3 +++ python-cmd2.changes | 28 ++++++++++++++++++++++++++++ python-cmd2.spec | 4 ++-- 4 files changed, 33 insertions(+), 5 deletions(-) delete mode 100644 cmd2-0.9.20.tar.gz create mode 100644 cmd2-0.9.22.tar.gz diff --git a/cmd2-0.9.20.tar.gz b/cmd2-0.9.20.tar.gz deleted file mode 100644 index 698fd0b..0000000 --- a/cmd2-0.9.20.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ba349af127f9052363972adcbcfb921f9ca5e90f2bcbfba11b117500f11a845 -size 560696 diff --git a/cmd2-0.9.22.tar.gz b/cmd2-0.9.22.tar.gz new file mode 100644 index 0000000..8e5f822 --- /dev/null +++ b/cmd2-0.9.22.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba244b07c0b465ff54a6838dc61919599141dc92de1bf00bb0a70875189155e6 +size 565214 diff --git a/python-cmd2.changes b/python-cmd2.changes index 12497a5..ca0bf6e 100644 --- a/python-cmd2.changes +++ b/python-cmd2.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Fri Jan 3 11:34:58 CET 2020 - Matej Cepl + +- Update to 0.9.22: + - Fixed bug where a redefined ansi.style_error was not being + used in all cmd2 files + - Enabled line buffering when redirecting output to a file + - Added align_left(), align_center(), and align_right() to + utils.py. All 3 of these functions support ANSI escape + sequences and characters with display widths greater than 1. + They wrap align_text() which is also in utils.py. + - Fixed bug where pipe processes were not being stopped by Ctrl-C + - Added exception handling to account for non-standard Python + environments in which readline is not loaded dynamically from + a shared library file + - Added read_input() function that is used to read from stdin. + Unlike the Python built-in input(), it also has an argument + to disable tab completion while input is being entered. + - Added capability to override the argument parser class used + by cmd2 built-in commands. See override_parser.py example for + more details. + - Added end argument to pfeedback() to be consistent with the + other print functions like poutput(). + - Added apply_style to pwarning(). + - For consistency between all the print functions: + - Made end and chop keyword-only arguments of ppaged() + - end is always added to message in ppaged() + ------------------------------------------------------------------- Fri Nov 22 10:46:57 UTC 2019 - Tomáš Chvátal diff --git a/python-cmd2.spec b/python-cmd2.spec index 8913cd5..f880da1 100644 --- a/python-cmd2.spec +++ b/python-cmd2.spec @@ -1,7 +1,7 @@ # # spec file for package python-cmd2 # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-cmd2 -Version: 0.9.20 +Version: 0.9.22 Release: 0 Summary: Extra features for standard library's cmd module License: MIT