From 665e99ae2e7a8344d317e1138397b080496975e90b591f7e5da0aeb83520e596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Tue, 27 Feb 2018 08:20:02 +0000 Subject: [PATCH] Accepting request 578660 from home:sebix:branches:devel:languages:python can also maintain it - update to version 1.6.0: - update to version 1.5.1: - remove fix-caplog-tests.diff, it broke the tests - remove separate specfile for docs, use one combined OBS-URL: https://build.opensuse.org/request/show/578660 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/cookiecutter?expand=0&rev=3 --- cookiecutter-1.5.0.tar.gz | 3 -- cookiecutter-1.6.0.tar.gz | 3 ++ cookiecutter-doc.changes | 5 --- cookiecutter-doc.spec | 62 -------------------------- cookiecutter.changes | 13 ++++++ cookiecutter.spec | 93 +++++++++++++++++++-------------------- fix-caplog-tests.diff | 26 ----------- series | 2 - 8 files changed, 62 insertions(+), 145 deletions(-) delete mode 100644 cookiecutter-1.5.0.tar.gz create mode 100644 cookiecutter-1.6.0.tar.gz delete mode 100644 cookiecutter-doc.changes delete mode 100644 cookiecutter-doc.spec delete mode 100644 fix-caplog-tests.diff delete mode 100644 series diff --git a/cookiecutter-1.5.0.tar.gz b/cookiecutter-1.5.0.tar.gz deleted file mode 100644 index 23f393d..0000000 --- a/cookiecutter-1.5.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ffe041891781615b06cb2c231029333eb6fca85562f7190661cb25e08e4fab61 -size 165783 diff --git a/cookiecutter-1.6.0.tar.gz b/cookiecutter-1.6.0.tar.gz new file mode 100644 index 0000000..139e242 --- /dev/null +++ b/cookiecutter-1.6.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1316a52e1c1f08db0c9efbf7d876dbc01463a74b155a0d83e722be88beda9a3e +size 181753 diff --git a/cookiecutter-doc.changes b/cookiecutter-doc.changes deleted file mode 100644 index 123d80c..0000000 --- a/cookiecutter-doc.changes +++ /dev/null @@ -1,5 +0,0 @@ -------------------------------------------------------------------- -Fri Feb 3 19:44:14 UTC 2017 - hpj@urpla.net - -- version 1.5.0: initial build - diff --git a/cookiecutter-doc.spec b/cookiecutter-doc.spec deleted file mode 100644 index 6e71545..0000000 --- a/cookiecutter-doc.spec +++ /dev/null @@ -1,62 +0,0 @@ -# -# spec file for package cookiecutter-doc -# -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2017 LISA GmbH, Bingen, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ - - -Name: cookiecutter-doc -Version: 1.5.0 -Release: 0 -License: BSD-3-Clause -Summary: A command-line utility that creates projects from project templates -Url: https://github.com/audreyr/cookiecutter -Group: Development/Languages/Python -Source: https://pypi.io/packages/source/c/cookiecutter/cookiecutter-%{version}.tar.gz -Source1: ccext.py -BuildRequires: python3-Sphinx -BuildRequires: python3-binaryornot >= 0.2.0 -BuildRequires: python3-click >= 5.0 -BuildRequires: python3-future >= 0.15.2 -BuildRequires: python3-Jinja2 >= 2.7 -BuildRequires: python3-jinja2-time >= 0.1.0 -BuildRequires: python3-poyo >= 0.1.0 -BuildRequires: python3-whichcraft >= 0.4.0 - -#BuildRequires: cookiecutter -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch - -%description -A command-line utility that creates projects from **cookiecutters** (project -templates), e.g. creating a Python package project from a Python package -project template. - -This package contains the documentation for cookiecutter. - -%prep -%setup -q -n cookiecutter-%{version} -cp %{SOURCE1} docs - -%build -python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo - -%install -# Only building documentation - -%files -%defattr(-,root,root,-) -%doc LICENSE build/sphinx/html - -%changelog diff --git a/cookiecutter.changes b/cookiecutter.changes index e7a4613..d1718d5 100644 --- a/cookiecutter.changes +++ b/cookiecutter.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Feb 21 10:37:20 UTC 2018 - sebix+novell.com@sebix.at + +- update to version 1.6.0: + * Include template path or template URL in cookiecutter context under _template + * Add a URL abbreviation for GitLab template projects + * Add option to use templates from Zip files or Zip URLs + * bugfixes +- update to version 1.5.1: + * bugfixes +- remove fix-caplog-tests.diff, it broke the tests +- remove separate specfile for docs, use one combined + ------------------------------------------------------------------- Fri Feb 3 19:13:47 UTC 2017 - hpj@urpla.net diff --git a/cookiecutter.spec b/cookiecutter.spec index 82c61e6..3e4e785 100644 --- a/cookiecutter.spec +++ b/cookiecutter.spec @@ -1,7 +1,7 @@ # # spec file for package cookiecutter # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties @@ -14,87 +14,82 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Name: cookiecutter -Version: 1.5.0 +Version: 1.6.0 Release: 0 -License: BSD-3-Clause Summary: A command-line utility that creates projects from project templates -Url: https://github.com/audreyr/cookiecutter +License: BSD-3-Clause Group: Development/Languages/Python -Source: https://pypi.io/packages/source/c/cookiecutter/cookiecutter-%{version}.tar.gz +Url: https://github.com/audreyr/cookiecutter +Source: https://files.pythonhosted.org/packages/source/c/cookiecutter/cookiecutter-%{version}.tar.gz +Source1: ccext.py # PATCH-FIX-OPENSUSE fix-python-invocation-tests.diff hpj@urpla.net Patch0: fix-python-invocation-tests.diff -# PATCH-FIX-UPSTREAM fix-caplog-tests.diff hpj@urpla.net -Patch1: fix-caplog-tests.diff -BuildRequires: python3-devel -BuildRequires: python3-setuptools +BuildRequires: git +BuildRequires: python3-Jinja2 >= 2.7 +BuildRequires: python3-Sphinx BuildRequires: python3-binaryornot >= 0.2.0 BuildRequires: python3-click >= 5.0 +BuildRequires: python3-devel BuildRequires: python3-future >= 0.15.2 -BuildRequires: python3-Jinja2 >= 2.7 BuildRequires: python3-jinja2-time >= 0.1.0 BuildRequires: python3-poyo >= 0.1.0 +BuildRequires: python3-setuptools BuildRequires: python3-whichcraft >= 0.4.0 -BuildRequires: git -# Testing requirements -BuildRequires: python3-chardet >= 2.0.0 -BuildRequires: python3-freezegun -BuildRequires: python3-pytest -BuildRequires: python3-pytest-mock -BuildRequires: python3-pytest-capturelog +Requires: git +Requires: python3-Jinja2 >= 2.7 Requires: python3-binaryornot >= 0.2.0 Requires: python3-click >= 5.0 Requires: python3-future >= 0.15.2 -Requires: python3-Jinja2 >= 2.7 Requires: python3-jinja2-time >= 0.1.0 Requires: python3-poyo >= 0.1.0 +Requires: python3-requests >= 2.18.0 Requires: python3-whichcraft >= 0.4.0 -Requires: git Requires(post): update-alternatives Requires(postun): update-alternatives -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +# SECTION Testing requirements +BuildRequires: python3-chardet >= 2.0.0 +BuildRequires: python3-freezegun +BuildRequires: python3-pytest +BuildRequires: python3-pytest-cov +BuildRequires: python3-pytest-mock +BuildRequires: python3-requests >= 2.18.0 +# /SECTION + +%package doc +Summary: Documentation files for %{name} +Group: Documentation/HTML %description -A command-line utility that creates projects from **cookiecutters** (project +A command-line utility that creates projects from cookiecutters (project templates), e.g. creating a Python package project from a Python package project template. -* Cross-platform: Windows, Mac, and Linux are officially supported. +Project templates can be in any programming language or markup format. -* Works with Python 2.7, 3.3, 3.4, 3.5, and PyPy. *(But you don't have to -* know/write Python - code to use Cookiecutter.)* +%description doc +A command-line utility that creates projects from cookiecutters (project +templates), e.g. creating a Python package project from a Python package +project template. -* Project templates can be in any programming language or markup format: - Python, JavaScript, Ruby, CoffeeScript, RST, Markdown, CSS, HTML, you name -it. You can use multiple languages in the same project template. - -* Simple command line usage: - - # Create project from the cookiecutter-pypackage.git repo template - # You'll be prompted to enter values. Then it'll create your Python - # package in the current working directory, based on those values. - $ cookiecutter https://github.com/audreyr/cookiecutter-pypackage - # For the sake of brevity, repos on GitHub can just use the 'gh' prefix - $ cookiecutter gh:audreyr/cookiecutter-pypackage - -* Use it at the command line with a local template: - - # Create project in the current working directory, from the local - # cookiecutter-pypackage/ template - $ cookiecutter cookiecutter-pypackage/ +This package contains the documentation for cookiecutter. %prep %setup -q -n cookiecutter-%{version} %patch0 -p1 -%patch1 -p1 sed -i "s/cookiecutter =/cookiecutter-%{py3_ver} =/" setup.py +cp %{SOURCE1} docs %build python3 setup.py build +pushd docs +make %{?_smp_mflags} html +rm _build/html/.buildinfo +popd %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} @@ -105,7 +100,7 @@ ln -sf %{_sysconfdir}/alternatives/cookiecutter %{buildroot}%{_bindir}/cookiecut %check export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 -PYTHONPATH=%{buildroot}%{python3_sitelib} py.test +PYTHONPATH=%{buildroot}%{python3_sitelib} py.test tests %pre [ -h %{_bindir}/cookiecutter ] || rm -f %{_bindir}/cookiecutter @@ -119,11 +114,15 @@ if [ $1 -eq 0 ] ; then fi %files -%defattr(-,root,root,-) -%doc AUTHORS.rst LICENSE README.rst +%doc AUTHORS.rst README.rst +%license LICENSE %ghost %{_sysconfdir}/alternatives/cookiecutter %{_bindir}/cookiecutter %{_bindir}/cookiecutter-%{py3_ver} %{python3_sitelib}/* +%files doc +%doc docs/_build/html +%license LICENSE + %changelog diff --git a/fix-caplog-tests.diff b/fix-caplog-tests.diff deleted file mode 100644 index 64aca5a..0000000 --- a/fix-caplog-tests.diff +++ /dev/null @@ -1,26 +0,0 @@ -From: Hans-Peter Jansen -Date: 2017-02-14 23:47:40+0100 -Subject: fix bug: caplog.records is a method - -Index: b/tests/test_log.py -=================================================================== ---- a/tests/test_log.py -+++ b/tests/test_log.py -@@ -89,7 +89,7 @@ def test_info_stdout_logging(caplog, inf - - stream_messages = [ - stream_handler.format(r) -- for r in caplog.records -+ for r in caplog.records() - if r.levelno >= stream_handler.level - ] - -@@ -106,7 +106,7 @@ def test_debug_stdout_logging(caplog, de - - stream_messages = [ - stream_handler.format(r) -- for r in caplog.records -+ for r in caplog.records() - if r.levelno >= stream_handler.level - ] - diff --git a/series b/series deleted file mode 100644 index 4914331..0000000 --- a/series +++ /dev/null @@ -1,2 +0,0 @@ -fix-python-invocation-tests.diff -fix-caplog-tests.diff