From 928aaa9bb2d0b639265259e1e30069da38344ccf231552b1c3fd8f6d2baf48f0 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 23 Oct 2019 07:38:43 +0000 Subject: [PATCH 1/6] - go back to 0.8.9, cliff (which is the only user) is not compatible with >= 0.9.0 atm OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cmd2?expand=0&rev=57 --- cmd2-0.8.9.tar.gz | 3 +++ cmd2-0.9.16.tar.gz | 3 --- python-cmd2.changes | 6 +++++ python-cmd2.spec | 63 ++++++++++++++++++--------------------------- 4 files changed, 34 insertions(+), 41 deletions(-) create mode 100644 cmd2-0.8.9.tar.gz delete mode 100644 cmd2-0.9.16.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.16.tar.gz b/cmd2-0.9.16.tar.gz deleted file mode 100644 index 52e3d69..0000000 --- a/cmd2-0.9.16.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b78379d53aff811d1deac720bbe71661769822a5fb2d830cd730656d180fb3d -size 550919 diff --git a/python-cmd2.changes b/python-cmd2.changes index 8e9b05a..0b863f3 100644 --- a/python-cmd2.changes +++ b/python-cmd2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 23 07:35:49 UTC 2019 - Dirk Mueller + +- go back to 0.8.9, cliff (which is the only user) is not compatible + with >= 0.9.0 atm + ------------------------------------------------------------------- Fri Sep 13 10:57:37 UTC 2019 - Tomáš Chvátal diff --git a/python-cmd2.spec b/python-cmd2.spec index 53db859..3addb46 100644 --- a/python-cmd2.spec +++ b/python-cmd2.spec @@ -17,44 +17,36 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define skip_python2 1 Name: python-cmd2 -Version: 0.9.16 +# 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 Group: Development/Languages/Python -URL: https://github.com/python-cmd2/cmd2 +Url: http://packages.python.org/cmd2/ Source: https://files.pythonhosted.org/packages/source/c/cmd2/cmd2-%{version}.tar.gz -BuildRequires: %{python_module setuptools_scm} -BuildRequires: %{python_module setuptools} -BuildRequires: fdupes -BuildRequires: python-rpm-macros -BuildRequires: vim -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} -BuildRequires: %{python_module mock} -BuildRequires: %{python_module pyperclip >= 1.6} -BuildRequires: %{python_module pytest-mock} -BuildRequires: %{python_module pytest} -BuildRequires: %{python_module wcwidth >= 0.1.7} -# Required by tests. -BuildRequires: vim -%if 0%{?suse_version} <= 1315 BuildRequires: %{python_module contextlib2} -BuildRequires: %{python_module typing} +BuildRequires: %{python_module mock} +BuildRequires: %{python_module pyperclip} +BuildRequires: %{python_module pytest-xdist} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wcwidth} +BuildRequires: python-enum34 +BuildRequires: python-rpm-macros +BuildRequires: python-subprocess32 +Requires: python-pyparsing >= 2.0.1 +Requires: python-pyperclip +Requires: python-six +Requires: python-wcwidth +%ifpython2 +Requires: python-contextlib2 +Requires: python-enum34 +Requires: python-subprocess32 %endif -# /SECTION +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch + %python_subpackages %description @@ -78,24 +70,19 @@ 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 %build %python_build %install %python_install -%python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%pytest +%python_exec setup.py test %files %{python_files} %license LICENSE -%doc CHANGELOG.md CODEOWNERS README.md -%{python3_sitelib}/* +%doc README.md +%{python_sitelib}/* %changelog From 9c4cbe60cf8af1054e106e19fd53546e39e854e1c25062078cf9b3f0d9b8b84b Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 23 Oct 2019 07:46:36 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cmd2?expand=0&rev=58 --- python-cmd2.spec | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/python-cmd2.spec b/python-cmd2.spec index 3addb46..dcead14 100644 --- a/python-cmd2.spec +++ b/python-cmd2.spec @@ -24,7 +24,7 @@ Release: 0 Summary: Extra features for standard library's cmd module License: MIT Group: Development/Languages/Python -Url: http://packages.python.org/cmd2/ +URL: https://github.com/python-cmd2/cmd2 Source: https://files.pythonhosted.org/packages/source/c/cmd2/cmd2-%{version}.tar.gz BuildRequires: %{python_module contextlib2} BuildRequires: %{python_module mock} @@ -35,16 +35,27 @@ BuildRequires: %{python_module wcwidth} BuildRequires: python-enum34 BuildRequires: python-rpm-macros BuildRequires: python-subprocess32 +# SECTION Test requirements +BuildRequires: %{python_module attrs >= 16.3.0} +BuildRequires: %{python_module colorama >= 0.3.7} +BuildRequires: %{python_module mock} +BuildRequires: %{python_module pyperclip >= 1.6} +BuildRequires: %{python_module pytest-mock} +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module wcwidth >= 0.1.7} +# Required by tests. +BuildRequires: vim +%if 0%{?suse_version} <= 1315 +BuildRequires: %{python_module contextlib2} +BuildRequires: %{python_module typing} +Requires: python-enum34 +Requires: python-subprocess32 +%endif +# /SECTION Requires: python-pyparsing >= 2.0.1 Requires: python-pyperclip Requires: python-six Requires: python-wcwidth -%ifpython2 -Requires: python-contextlib2 -Requires: python-enum34 -Requires: python-subprocess32 -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %python_subpackages @@ -76,13 +87,14 @@ Drop-in replacement adds several features for command-prompt tools: %install %python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%python_exec setup.py test +%pytest %files %{python_files} %license LICENSE -%doc README.md -%{python_sitelib}/* +%doc CHANGELOG.md README.md +%{python3_sitelib}/* %changelog From fa493121aa9b131977ad040da0b02b8be71fdf44f821a34375de9b8fff0bca46 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 23 Oct 2019 07:47:05 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cmd2?expand=0&rev=59 --- python-cmd2.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/python-cmd2.spec b/python-cmd2.spec index dcead14..2dccbd0 100644 --- a/python-cmd2.spec +++ b/python-cmd2.spec @@ -23,7 +23,6 @@ Version: 0.8.9 Release: 0 Summary: Extra features for standard library's cmd module License: MIT -Group: Development/Languages/Python URL: https://github.com/python-cmd2/cmd2 Source: https://files.pythonhosted.org/packages/source/c/cmd2/cmd2-%{version}.tar.gz BuildRequires: %{python_module contextlib2} @@ -35,6 +34,11 @@ BuildRequires: %{python_module wcwidth} BuildRequires: python-enum34 BuildRequires: python-rpm-macros BuildRequires: python-subprocess32 +Requires: python-pyparsing >= 2.0.1 +Requires: python-pyperclip +Requires: python-six +Requires: python-wcwidth +BuildArch: noarch # SECTION Test requirements BuildRequires: %{python_module attrs >= 16.3.0} BuildRequires: %{python_module colorama >= 0.3.7} @@ -52,12 +56,6 @@ Requires: python-enum34 Requires: python-subprocess32 %endif # /SECTION -Requires: python-pyparsing >= 2.0.1 -Requires: python-pyperclip -Requires: python-six -Requires: python-wcwidth -BuildArch: noarch - %python_subpackages %description From 8ce9f82d0e3f6bffd853e7510995b312abbc09a66c69f3b0dacbfceb9ad66448 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 23 Oct 2019 07:55:25 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cmd2?expand=0&rev=60 --- python-cmd2.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/python-cmd2.spec b/python-cmd2.spec index 2dccbd0..3d433cc 100644 --- a/python-cmd2.spec +++ b/python-cmd2.spec @@ -25,9 +25,6 @@ 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 contextlib2} -BuildRequires: %{python_module mock} -BuildRequires: %{python_module pyperclip} BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wcwidth} @@ -51,7 +48,6 @@ BuildRequires: %{python_module wcwidth >= 0.1.7} BuildRequires: vim %if 0%{?suse_version} <= 1315 BuildRequires: %{python_module contextlib2} -BuildRequires: %{python_module typing} Requires: python-enum34 Requires: python-subprocess32 %endif @@ -79,6 +75,8 @@ Drop-in replacement adds several features for command-prompt tools: %prep %setup -q -n cmd2-%{version} +# Fix spurious-executable-perm +chmod a-x README.md %build %python_build From b091360f50f02880884db61cc6cd9579ccb169309b96a43d6c0a9473b951a27c Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 28 Oct 2019 12:12:22 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cmd2?expand=0&rev=61 --- python-cmd2.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-cmd2.spec b/python-cmd2.spec index 3d433cc..a61e3e3 100644 --- a/python-cmd2.spec +++ b/python-cmd2.spec @@ -45,6 +45,7 @@ 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} From 9c13c82210cb6915f720d7da653a88fc676b2bed4b58fa6dfc6572d37b9bf3e1 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 14 Nov 2019 15:52:45 +0000 Subject: [PATCH 6/6] - Update to 0.9.20: - the list of changes is too long, complete changelog is in CHANGELOG.md included in this package. - Package is python3-only now. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cmd2?expand=0&rev=62 --- cmd2-0.8.9.tar.gz | 3 --- cmd2-0.9.20.tar.gz | 3 +++ python-cmd2.changes | 8 ++++++++ python-cmd2.spec | 10 ++++++++-- 4 files changed, 19 insertions(+), 5 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 0b863f3..2af5357 100644 --- a/python-cmd2.changes +++ b/python-cmd2.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Nov 14 15:18:49 CET 2019 - Matej Cepl + +- Update to 0.9.20: + - the list of changes is too long, complete changelog is in + CHANGELOG.md included in this package. +- Package is python3-only now. + ------------------------------------------------------------------- Wed Oct 23 07:35:49 UTC 2019 - Dirk Mueller diff --git a/python-cmd2.spec b/python-cmd2.spec index a61e3e3..7a22db9 100644 --- a/python-cmd2.spec +++ b/python-cmd2.spec @@ -1,7 +1,7 @@ # # spec file for package python-cmd2 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,20 +17,23 @@ %{?!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: python-rpm-macros BuildRequires: python-subprocess32 +BuildRequires: python3 Requires: python-pyparsing >= 2.0.1 Requires: python-pyperclip Requires: python-six @@ -79,6 +82,9 @@ Drop-in replacement adds several features for command-prompt tools: # Fix spurious-executable-perm chmod a-x README.md +# Remove spurious shebang +sed -i -e '/^#!\/usr\/bin\/env python/d' cmd2/cmd2.py + %build %python_build