From 5c5ea839e329769fffd6dd534d99b8759f07e84b05008bcb811a18bc045dd7dc Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 8 Oct 2020 18:08:40 +0000 Subject: [PATCH 1/2] Accepting request 840311 from home:bnavigator:branches:devel:languages:python - dephell incorrectly converts the typing-extension dependency marker. Use upstreams install method pip with poetry.core backend instead poetry does not work with incorrect clikit metadata when typing-extensions is not installed (which is not needed for py >= 3.5.4) OBS-URL: https://build.opensuse.org/request/show/840311 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-clikit?expand=0&rev=16 --- python-clikit.changes | 7 +++++++ python-clikit.spec | 15 +++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/python-clikit.changes b/python-clikit.changes index 0f90056..a19d2e0 100644 --- a/python-clikit.changes +++ b/python-clikit.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Oct 8 15:52:41 UTC 2020 - Benjamin Greiner + +- dephell incorrectly converts the typing-extension dependency + marker. Use upstreams install method pip with poetry.core backend + instead + ------------------------------------------------------------------- Sun Jul 12 07:50:09 UTC 2020 - John Vandenberg diff --git a/python-clikit.spec b/python-clikit.spec index 9342ad0..7d1d873 100644 --- a/python-clikit.spec +++ b/python-clikit.spec @@ -1,7 +1,7 @@ # # spec file for package python-clikit # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# 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 @@ -27,15 +27,14 @@ URL: https://github.com/sdispater/clikit Source: https://github.com/sdispater/clikit/archive/%{version}.tar.gz#/clikit-%{version}.tar.gz BuildRequires: %{python_module crashtest} BuildRequires: %{python_module pastel >= 0.2.0} +BuildRequires: %{python_module pip} +BuildRequires: %{python_module poetry-core} BuildRequires: %{python_module pylev >= 1.3} BuildRequires: %{python_module pytest >= 4.0} BuildRequires: %{python_module pytest-mock >= 2.0.0} -BuildRequires: %{python_module setuptools} BuildRequires: %{python_module typing >= 3.6} BuildRequires: fdupes -BuildRequires: python-dephell-rpm-macros BuildRequires: python-rpm-macros -BuildRequires: python3-dephell Requires: python-crashtest Requires: python-pastel >= 0.2.0 Requires: python-pylev >= 1.3 @@ -55,13 +54,12 @@ command line interfaces. %prep %setup -q -n clikit-%{version} -%dephell_gensetup %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %check @@ -70,6 +68,7 @@ command line interfaces. %files %{python_files} %doc README.md %license LICENSE -%{python_sitelib}/* +%{python_sitelib}/clikit +%{python_sitelib}/clikit-%{version}.dist-info %changelog From 239af6f283d95f94e919fe43041d4149983b0ee3aaecb07df8c4157b83026202 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 21 Oct 2020 10:21:55 +0000 Subject: [PATCH 2/2] Accepting request 842832 from home:dancermak:branches:devel:languages:python Submission of python-clikit OBS-URL: https://build.opensuse.org/request/show/842832 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-clikit?expand=0&rev=17 --- python-clikit.changes | 5 +++++ python-clikit.spec | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/python-clikit.changes b/python-clikit.changes index a19d2e0..e2e8a77 100644 --- a/python-clikit.changes +++ b/python-clikit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 20 13:36:23 UTC 2020 - Dan Čermák + +Skip python2: poetry no longer works with python2 thereby breaking this package on Leap. + ------------------------------------------------------------------- Thu Oct 8 15:52:41 UTC 2020 - Benjamin Greiner diff --git a/python-clikit.spec b/python-clikit.spec index 7d1d873..9f3dd49 100644 --- a/python-clikit.spec +++ b/python-clikit.spec @@ -16,15 +16,15 @@ # +%define skip_python2 1 %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%bcond_without python2 Name: python-clikit Version: 0.6.2 Release: 0 Summary: Helper to build testable command line interfaces License: MIT URL: https://github.com/sdispater/clikit -Source: https://github.com/sdispater/clikit/archive/%{version}.tar.gz#/clikit-%{version}.tar.gz +Source: %{URL}/archive/%{version}.tar.gz#/clikit-%{version}.tar.gz BuildRequires: %{python_module crashtest} BuildRequires: %{python_module pastel >= 0.2.0} BuildRequires: %{python_module pip} @@ -32,13 +32,11 @@ BuildRequires: %{python_module poetry-core} BuildRequires: %{python_module pylev >= 1.3} BuildRequires: %{python_module pytest >= 4.0} BuildRequires: %{python_module pytest-mock >= 2.0.0} -BuildRequires: %{python_module typing >= 3.6} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-crashtest Requires: python-pastel >= 0.2.0 Requires: python-pylev >= 1.3 -Requires: python-typing >= 3.6 BuildArch: noarch %if %{with python2} BuildRequires: python-enum34 >= 1.1