Accepting request 972398 from home:bnavigator:branches:devel:languages:python

- update fix-setup-version.patch to cookiecutter-fix-setup.patch
  gh#cookiecutter/cookiecutter#1656
- Sync rpm requirements metadata to setuptools generated metadata

OBS-URL: https://build.opensuse.org/request/show/972398
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/cookiecutter?expand=0&rev=21
This commit is contained in:
Sebastian Wagner 2022-04-24 18:13:21 +00:00 committed by Git OBS Bridge
parent a5d44a8a5e
commit 5f54199a6f
3 changed files with 30 additions and 14 deletions

View File

@ -9,10 +9,10 @@ to wrong version numbers on the local installation
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index d703c3c2..23a948ab 100644
--- a/setup.py
+++ b/setup.py
Index: cookiecutter-2.0.2/setup.py
===================================================================
--- cookiecutter-2.0.2.orig/setup.py
+++ cookiecutter-2.0.2/setup.py
@@ -2,7 +2,7 @@
"""cookiecutter distutils configuration."""
from setuptools import setup
@ -22,3 +22,12 @@ index d703c3c2..23a948ab 100644
with open('README.md', encoding='utf-8') as readme_file:
readme = readme_file.read()
@@ -10,7 +10,7 @@ with open('README.md', encoding='utf-8')
requirements = [
'binaryornot>=0.4.4',
'Jinja2>=2.7,<4.0.0',
- 'click>=7.0,<8.0.0',
+ 'click>=7.0,<9.0.0',
'pyyaml>=5.3.1',
'jinja2-time>=0.2.0',
'python-slugify>=4.0.0',

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Apr 24 16:57:17 UTC 2022 - Ben Greiner <code@bnavigator.de>
- update fix-setup-version.patch to cookiecutter-fix-setup.patch
gh#cookiecutter/cookiecutter#1656
- Sync rpm requirements metadata to setuptools generated metadata
-------------------------------------------------------------------
Mon Apr 4 10:07:33 UTC 2022 - Sebastian Wagner <sebix+novell.com@sebix.at>

View File

@ -27,13 +27,13 @@ Group: Development/Languages/Python
URL: https://github.com/audreyr/cookiecutter
Source: https://github.com/cookiecutter/cookiecutter/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
# recent versions are not published on PyPI: https://github.com/cookiecutter/cookiecutter/issues/1636
#Source: https://files.pythonhosted.org/packages/source/c/cookiecutter/cookiecutter-%{version}.tar.gz
#Source: https://files.pythonhosted.org/packages/source/c/cookiecutter/cookiecutter-%%{version}.tar.gz
Source1: ccext.py
# PATCH-FIX-UPSTREAM -- fix-setup-version.patch https://github.com/cookiecutter/cookiecutter/pull/1656
Patch0: https://github.com/cookiecutter/cookiecutter/pull/1656.patch#/fix-setup-version.patch
BuildRequires: %{python_module Jinja2 >= 2.7}
# PATCH-FIX-UPSTREAM -- cookiecutter-fix-setup.patch https://github.com/cookiecutter/cookiecutter/pull/1656
Patch0: cookiecutter-fix-setup.patch
BuildRequires: %{python_module Jinja2 >= 2.7 with %python-Jinja2 < 4}
BuildRequires: %{python_module binaryornot >= 0.2.0}
BuildRequires: %{python_module click >= 7.0}
BuildRequires: %{python_module click >= 7 with %python-click < 9}
BuildRequires: %{python_module future >= 0.15.2}
BuildRequires: %{python_module jinja2-time >= 0.1.0}
BuildRequires: %{python_module poyo >= 0.1.0}
@ -44,16 +44,16 @@ BuildRequires: fdupes
BuildRequires: git-core
BuildRequires: python-rpm-macros
Requires: git-core
Requires: python-Jinja2 >= 2.7
Requires: python-PyYAML
Requires: python-binaryornot >= 0.2.0
Requires: python-click >= 7.0
Requires: python-future >= 0.15.2
Requires: python-jinja2-time >= 0.1.0
Requires: python-poyo >= 0.1.0
Requires: python-python-slugify
Requires: python-requests >= 2.18.0
Requires: python-whichcraft >= 0.4.0
Requires: (python-Jinja2 >= 2.7 with python-Jinja2 < 4)
Requires: (python-click >= 7 with python-click < 9)
Requires(post): update-alternatives
Requires(postun):update-alternatives
BuildArch: noarch
@ -98,8 +98,7 @@ project template.
This package contains the documentation for cookiecutter.
%prep
%setup -q -n cookiecutter-%{version}
%patch0 -p1
%autosetup -p1 -n cookiecutter-%{version}
cp %{SOURCE1} docs
# Remove pytest addopts:
rm setup.cfg
@ -139,7 +138,8 @@ export LANG=en_US.UTF-8
%files %{python_files}
%license LICENSE
%python_alternative cookiecutter
%{python_sitelib}/cookiecutter*
%{python_sitelib}/cookiecutter
%{python_sitelib}/cookiecutter-%{version}*-info
%files -n cookiecutter-doc
%license LICENSE