Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cookiecutter for openSUSE:Factory checked in at 2021-05-18 18:26:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cookiecutter (Old) and /work/SRC/openSUSE:Factory/.cookiecutter.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cookiecutter" Tue May 18 18:26:59 2021 rev:7 rq:893844 version:1.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/cookiecutter/cookiecutter.changes 2021-01-20 18:29:23.295625737 +0100 +++ /work/SRC/openSUSE:Factory/.cookiecutter.new.2988/cookiecutter.changes 2021-05-18 18:27:24.798709939 +0200 @@ -1,0 +2,11 @@ +Sat May 15 11:11:51 UTC 2021 - Ben Greiner <[email protected]> + +- Make cookiecutter usable by all python3X flavors + +------------------------------------------------------------------- +Fri May 14 16:19:48 UTC 2021 - Sebastian Wagner <[email protected]> + +- update to version 1.7.3: + - Fixed jinja2 and markupsafe dependencies + +------------------------------------------------------------------- Old: ---- cookiecutter-1.7.2.tar.gz New: ---- cookiecutter-1.7.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cookiecutter.spec ++++++ --- /var/tmp/diff_new_pack.LHgkYe/_old 2021-05-18 18:27:25.270707894 +0200 +++ /var/tmp/diff_new_pack.LHgkYe/_new 2021-05-18 18:27:25.270707894 +0200 @@ -1,7 +1,7 @@ # # spec file for package cookiecutter # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2017 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties @@ -17,8 +17,9 @@ # +%define skip_python2 1 Name: cookiecutter -Version: 1.7.2 +Version: 1.7.3 Release: 0 Summary: A command-line utility that creates projects from project templates License: BSD-3-Clause @@ -26,43 +27,49 @@ URL: https://github.com/audreyr/cookiecutter Source: https://files.pythonhosted.org/packages/source/c/cookiecutter/cookiecutter-%{version}.tar.gz Source1: ccext.py +BuildRequires: %{python_module Jinja2 >= 2.7} +BuildRequires: %{python_module binaryornot >= 0.2.0} +BuildRequires: %{python_module click >= 7.0} +BuildRequires: %{python_module future >= 0.15.2} +BuildRequires: %{python_module jinja2-time >= 0.1.0} +BuildRequires: %{python_module poyo >= 0.1.0} +BuildRequires: %{python_module python-slugify} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module whichcraft >= 0.4.0} BuildRequires: fdupes BuildRequires: git-core -BuildRequires: python3-Jinja2 >= 2.7 -BuildRequires: python3-binaryornot >= 0.2.0 -BuildRequires: python3-click >= 7.0 -BuildRequires: python3-future >= 0.15.2 -BuildRequires: python3-jinja2-time >= 0.1.0 -BuildRequires: python3-poyo >= 0.1.0 -BuildRequires: python3-python-slugify -BuildRequires: python3-setuptools -BuildRequires: python3-whichcraft >= 0.4.0 +BuildRequires: python-rpm-macros Requires: git-core -Requires: python3-Jinja2 >= 2.7 -Requires: python3-binaryornot >= 0.2.0 -Requires: python3-click >= 7.0 -Requires: python3-future >= 0.15.2 -Requires: python3-jinja2-time >= 0.1.0 -Requires: python3-poyo >= 0.1.0 -Requires: python3-python-slugify -Requires: python3-requests >= 2.18.0 -Requires: python3-whichcraft >= 0.4.0 +Requires: python-Jinja2 >= 2.7 +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(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives BuildArch: noarch # SECTION Testing requirements -BuildRequires: python3-chardet >= 2.0.0 -BuildRequires: python3-freezegun -BuildRequires: python3-pytest -BuildRequires: python3-pytest-mock -BuildRequires: python3-requests >= 2.18.0 +BuildRequires: %{python_module chardet >= 2.0.0} +BuildRequires: %{python_module freezegun} +BuildRequires: %{python_module pytest-mock} +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module requests >= 2.18.0} # /SECTION # SECTION Documentation requirements BuildRequires: python3-Sphinx BuildRequires: python3-recommonmark # /SECTION +%if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3" +Provides: cookiecutter = %{version}-%{release} +Obsoletes: cookiecutter < %{version}-%{release} +%endif +%python_subpackages -%package doc +%package -n cookiecutter-doc Summary: Documentation files for %{name} Group: Documentation/HTML @@ -73,7 +80,7 @@ Project templates can be in any programming language or markup format. -%description doc +%description -n cookiecutter-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. @@ -82,50 +89,49 @@ %prep %setup -q -n cookiecutter-%{version} -sed -i "s/cookiecutter =/cookiecutter-%{py3_ver} =/" setup.py cp %{SOURCE1} docs # Remove pytest addopts: rm setup.cfg %build -python3 setup.py build +%python_build pushd docs make %{?_smp_mflags} html rm _build/html/.buildinfo popd %install -python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} -mkdir -p %{buildroot}%{_sysconfdir}/alternatives -touch %{buildroot}%{_sysconfdir}/alternatives/cookiecutter -ln -sf %{_sysconfdir}/alternatives/cookiecutter %{buildroot}%{_bindir}/cookiecutter -%fdupes %{buildroot}%{python3_sitelib} +%python_install +%python_clone -a %{buildroot}%{_bindir}/cookiecutter +%python_expand %fdupes %{buildroot}%{$python_sitelib} +# the doc directive in the files section cannot deduplicate, so do it manually +mkdir -p %{buildroot}%{_docdir}/cookiecutter-doc +cp -r docs/_build/html %{buildroot}%{_docdir}/cookiecutter-doc/ +%fdupes %{buildroot}%{_docdir}/cookiecutter-doc %check export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 -PYTHONPATH=%{buildroot}%{python3_sitelib} py.test tests +%pytest tests %pre +# delete command if the old package was not update-alternatives controlled [ -h %{_bindir}/cookiecutter ] || rm -f %{_bindir}/cookiecutter %post -update-alternatives --install %{_bindir}/cookiecutter cookiecutter %{_bindir}/cookiecutter-%{py3_ver} 30 +%python_install_alternative cookiecutter %postun -if [ $1 -eq 0 ] ; then - update-alternatives --remove cookiecutter %{_bindir}/cookiecutter-%{py3_ver} -fi +%python_uninstall_alternative cookiecutter -%files +%files %{python_files} %license LICENSE -%ghost %{_sysconfdir}/alternatives/cookiecutter -%{_bindir}/cookiecutter -%{_bindir}/cookiecutter-%{py3_ver} -%{python3_sitelib}/* +%python_alternative cookiecutter +%{python_sitelib}/cookiecutter +%{python_sitelib}/cookiecutter-%{version}*-info -%files doc -%doc docs/_build/html +%files -n cookiecutter-doc %license LICENSE +%doc %{_docdir}/cookiecutter-doc %changelog ++++++ cookiecutter-1.7.2.tar.gz -> cookiecutter-1.7.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cookiecutter-1.7.2/PKG-INFO new/cookiecutter-1.7.3/PKG-INFO --- old/cookiecutter-1.7.2/PKG-INFO 2020-04-21 05:33:43.407650700 +0200 +++ new/cookiecutter-1.7.3/PKG-INFO 2021-05-14 11:48:45.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: cookiecutter -Version: 1.7.2 +Version: 1.7.3 Summary: A command-line utility that creates projects from project templates, e.g. creating a Python package project from a Python package project template. Home-page: https://github.com/cookiecutter/cookiecutter Author: Audrey Roy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cookiecutter-1.7.2/cookiecutter/__init__.py new/cookiecutter-1.7.3/cookiecutter/__init__.py --- old/cookiecutter-1.7.2/cookiecutter/__init__.py 2020-04-21 05:27:02.000000000 +0200 +++ new/cookiecutter-1.7.3/cookiecutter/__init__.py 2021-05-14 11:48:35.000000000 +0200 @@ -2,4 +2,4 @@ """Main package for Cookiecutter.""" -__version__ = '1.7.2' +__version__ = '1.7.3' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cookiecutter-1.7.2/cookiecutter.egg-info/PKG-INFO new/cookiecutter-1.7.3/cookiecutter.egg-info/PKG-INFO --- old/cookiecutter-1.7.2/cookiecutter.egg-info/PKG-INFO 2020-04-21 05:33:43.000000000 +0200 +++ new/cookiecutter-1.7.3/cookiecutter.egg-info/PKG-INFO 2021-05-14 11:48:45.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: cookiecutter -Version: 1.7.2 +Version: 1.7.3 Summary: A command-line utility that creates projects from project templates, e.g. creating a Python package project from a Python package project template. Home-page: https://github.com/cookiecutter/cookiecutter Author: Audrey Roy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cookiecutter-1.7.2/cookiecutter.egg-info/SOURCES.txt new/cookiecutter-1.7.3/cookiecutter.egg-info/SOURCES.txt --- old/cookiecutter-1.7.2/cookiecutter.egg-info/SOURCES.txt 2020-04-21 05:33:43.000000000 +0200 +++ new/cookiecutter-1.7.3/cookiecutter.egg-info/SOURCES.txt 2021-05-14 11:48:45.000000000 +0200 @@ -43,7 +43,6 @@ docs/tutorial2.rst docs/tutorials.rst docs/usage.rst -docs/HelloCookieCutter1/Readme.rst docs/advanced/calling_from_python.rst docs/advanced/choice_variables.rst docs/advanced/cli_options.rst @@ -58,7 +57,6 @@ docs/advanced/template_extensions.rst docs/advanced/templates_in_context.rst docs/advanced/user_config.rst -tests/.coverage tests/__init__.py tests/conftest.py tests/test_abort_generate_on_hook_error.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cookiecutter-1.7.2/cookiecutter.egg-info/requires.txt new/cookiecutter-1.7.3/cookiecutter.egg-info/requires.txt --- old/cookiecutter-1.7.2/cookiecutter.egg-info/requires.txt 2020-04-21 05:33:43.000000000 +0200 +++ new/cookiecutter-1.7.3/cookiecutter.egg-info/requires.txt 2021-05-14 11:48:45.000000000 +0200 @@ -1,12 +1,11 @@ binaryornot>=0.4.4 -Jinja2<3.0.0 +Jinja2<4.0.0,>=2.7 click>=7.0 poyo>=0.5.0 jinja2-time>=0.2.0 python-slugify>=4.0.0 requests>=2.23.0 six>=1.10 -MarkupSafe<2.0.0 [:python_version<"3.3"] whichcraft>=0.4.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cookiecutter-1.7.2/docs/HelloCookieCutter1/Readme.rst new/cookiecutter-1.7.3/docs/HelloCookieCutter1/Readme.rst --- old/cookiecutter-1.7.2/docs/HelloCookieCutter1/Readme.rst 2020-04-17 05:54:33.000000000 +0200 +++ new/cookiecutter-1.7.3/docs/HelloCookieCutter1/Readme.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,159 +0,0 @@ -=========================================================== -Learn the Basics of Cookiecutter by Creating a Cookiecutter -=========================================================== - -The easiest way to understand what Cookiecutter does is to create a simple one -and see how it works. - -Cookiecutter takes a source directory tree and copies it into your new -project. It replaces all the names that it finds surrounded by *templating -tags* ``{{`` and ``}}`` with names that it finds in the file -``cookiecutter.json``. That's basically it. [1]_ - -The replaced names can be file names, directory names, and strings inside -files. - -With Cookiecutter, you can easily bootstrap a new project from a standard -form, which means you skip all the usual mistakes when starting a new -project. - -Before you can do anything in this example, you must have Python installed on -your machine. Go to the `Python Website <https://www.python.org/>`_ and follow -the instructions there. This includes the ``pip`` installer tool. Now run: - -.. code-block:: bash - - $ pip install cookiecutter - -Your First Cookiecutter ------------------------ - -To get started, create a directory somewhere on your computer. The name of -this directory will be the name of your Cookiecutter template, but it doesn't -constrain anything else---the generated project doesn't need to use the -template name, for example. Our project will be called ``HelloCookieCutter1``: - -.. code-block:: bash - - $ mkdir HelloCookieCutter1 - $ cd HelloCookieCutter1 - -Inside this directory, we create the directory tree to be copied into the -generated project. We want to generate a name for this directory, so we put -the directory name in templating tags ``{{`` and ``}}`` (yes, you type the -double-curly-braces onto the command line, just as you see them here): - -.. code-block:: bash - - $ mkdir {{cookiecutter.directory_name}} - $ cd {{cookiecutter.directory_name}} - -Anything inside templating tags can be placed inside a *namespace*. Here, by -putting ``directory_name`` inside the ``cookiecutter`` namespace, -``cookiecutter.directory_name`` will be looked up from the ``cookiecutter.json`` -file as the project is generated by Cookiecutter. - -Now we are inside the directory tree that will be copied. For the simplest -possible Cookiecutter template, we'll just include a single file. Again, we -want the file name to be looked up from ``cookiecutter.json``, so we name it -appropriately: - -.. code-block:: bash - - $ touch {{cookiecutter.file_name}}.py - -(``touch`` creates an empty file; you can just open it up in your editor). Now -edit the file so it contains: - -.. code-block:: python - - print("Hello, {{cookiecutter.greeting_recipient}}!") - -To finish, we create the ``cookiecutter.json`` file itself, so that -Cookiecutter can look up all our templated items. This file goes in our -``HelloCookieCutter1`` directory, and contains all the names we've used: - -.. code-block:: json - - { - "directory_name": "Hello", - "file_name": "Howdy", - "greeting_recipient": "Julie" - } - -Now we can actually run Cookiecutter and create a new project from our -template. Move to a directory where you want to create the new project. Then -run Cookiecutter and hand it the directory where the template lives. On my -(Windows, so the slashes go back instead of forward) machine, this happens to -be under the ``Git`` directory: - -.. code-block:: bash - - $ cookiecutter C:\Users\bruce\Documents\Git\HelloCookieCutter1 - directory_name [Hello]: - file_name [Howdy]: - greeting_recipient [Julie]: - -Cookiecutter tells us what the default name for each item is, and gives us the -option of replacing that name with something new. In this case, I just pressed -``Return`` for each one, to accept all the defaults. - -Now we have a generated directory called ``Hello``, containing a file -``Howdy.py``. When we run it: - -.. code-block:: bash - - $ cd Hello - $ python Howdy.py - Hello, Julie! - -Voila! Instant generated project! - -**Note**: The project we've created here happens to be Python, but -Cookiecutter is just replacing templated items with names it looks up in -``cookiecutter.json``, so you can produce projects of any kind, including -projects that aren't programs. - -This is nice, but what if you want to share your Cookiecutter template with -everyone on the Internet? The easiest way is to upload it to a version control -repository. As you might have guessed by the ``Git`` subdirectory, this -example is on GitHub. Conveniently, Cookiecutter can build a project directly -from an internet repository, like the one for this very example. For variety, -this time we'll replace the values from ``cookiecutter.json`` with our own: - -.. code-block:: bash - - $ cookiecutter https://github.com/BruceEckel/HelloCookieCutter1 - Cloning into 'HelloCookieCutter1'... - remote: Counting objects: 37, done. - Unpacking objects: 21% (8/37) - remote: Total 37 (delta 19), reused 21 (delta 3), pack-reused 0 - Unpacking objects: 100% (37/37), done. - Checking connectivity... done. - directory_name [Hello]: Fabulous - file_name [Howdy]: Zing - greeting_recipient [Julie]: Roscoe - - $ cd Fabulous - - $ python Zing.py - Hello, Roscoe! - -Same effect, but this time produced from the Internet! You'll notice that even -though it says ``Cloning into 'HelloCookieCutter1'...``, you don't see any -directory called ``HelloCookieCutter1`` in your local directory. Cookiecutter -has its own storage area for cookiecutters, which is in your home directory -in a subdirectory called ``.cookiecutters`` (the leading ``.`` hides the directory -on most operating systems). You don't need to do anything with this directory -but it can sometimes be useful to know where it is. - -Now if you ever find yourself duplicating effort when starting new projects, -you'll know how to eliminate that duplication using cookiecutter. But even -better, lots of people have created and published cookiecutters, so when you -are starting a new project, make sure you look at the `list of pre-defined -cookiecutters -<https://cookiecutter.readthedocs.io/en/latest/README.html #categories-of-cookiecutters>`_ -first! - -.. [1] You can also run *hooks* before and/or after generation, but that's - more complex than what we want to cover here. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cookiecutter-1.7.2/setup.py new/cookiecutter-1.7.3/setup.py --- old/cookiecutter-1.7.2/setup.py 2020-04-21 05:27:02.000000000 +0200 +++ new/cookiecutter-1.7.3/setup.py 2021-05-14 11:48:35.000000000 +0200 @@ -9,7 +9,7 @@ from setuptools import setup -version = "1.7.2" +version = "1.7.3" if sys.argv[-1] == 'publish': os.system('python setup.py sdist upload') @@ -26,14 +26,13 @@ requirements = [ 'binaryornot>=0.4.4', - 'Jinja2<3.0.0', + 'Jinja2>=2.7,<4.0.0', 'click>=7.0', 'poyo>=0.5.0', 'jinja2-time>=0.2.0', 'python-slugify>=4.0.0', 'requests>=2.23.0', 'six>=1.10', - 'MarkupSafe<2.0.0', ] if sys.argv[-1] == 'readme': Binary files old/cookiecutter-1.7.2/tests/.coverage and new/cookiecutter-1.7.3/tests/.coverage differ
