[Python-modules-commits] r33464 - in packages/cookiecutter/tags (11 files)

bernat at users.alioth.debian.org bernat at users.alioth.debian.org
Fri Jul 24 20:23:04 UTC 2015


    Date: Friday, July 24, 2015 @ 20:23:04
  Author: bernat
Revision: 33464

[svn-buildpackage] Tagging cookiecutter 1.0.0-2

Added:
  packages/cookiecutter/tags/1.0.0-2/
  packages/cookiecutter/tags/1.0.0-2/debian/changelog
    (from rev 33462, packages/cookiecutter/trunk/debian/changelog)
  packages/cookiecutter/tags/1.0.0-2/debian/control
    (from rev 32439, packages/cookiecutter/trunk/debian/control)
  packages/cookiecutter/tags/1.0.0-2/debian/patches/0001-tests-ensure-to-use-an-existing-command-to-test-whic.patch
    (from rev 32439, packages/cookiecutter/trunk/debian/patches/0001-tests-ensure-to-use-an-existing-command-to-test-whic.patch)
  packages/cookiecutter/tags/1.0.0-2/debian/patches/accept-click-4.x.patch
    (from rev 33463, packages/cookiecutter/trunk/debian/patches/accept-click-4.x.patch)
  packages/cookiecutter/tags/1.0.0-2/debian/patches/series
    (from rev 33462, packages/cookiecutter/trunk/debian/patches/series)
  packages/cookiecutter/tags/1.0.0-2/debian/patches/test-dont-expect-ds-store.patch
    (from rev 32439, packages/cookiecutter/trunk/debian/patches/test-dont-expect-ds-store.patch)
Deleted:
  packages/cookiecutter/tags/1.0.0-2/debian/changelog
  packages/cookiecutter/tags/1.0.0-2/debian/control
  packages/cookiecutter/tags/1.0.0-2/debian/patches/series
  packages/cookiecutter/tags/1.0.0-2/debian/patches/test-dont-expect-ds-store.patch

Deleted: packages/cookiecutter/tags/1.0.0-2/debian/changelog
===================================================================
--- packages/cookiecutter/trunk/debian/changelog	2015-04-26 14:11:22 UTC (rev 32438)
+++ packages/cookiecutter/tags/1.0.0-2/debian/changelog	2015-07-24 20:23:04 UTC (rev 33464)
@@ -1,31 +0,0 @@
-cookiecutter (0.7.2-1) unstable; urgency=medium
-
-  * New upstream release
-     + Drop network related patch, not needed anymore.
-
- -- Vincent Bernat <bernat at debian.org>  Sun, 28 Sep 2014 10:00:14 +0200
-
-cookiecutter (0.7.1-1) unstable; urgency=low
-
-  * New upstream release. Closes: #733567.
-     + Drop all patches are that are not needed any more.
-     + Build-Depends on python{,3}-yaml.
-  * Add patch to disable network tests.
-  * Add patch to handle .DS_Store (stripped by svn-upgrade).
-
- -- Vincent Bernat <bernat at debian.org>  Sun, 27 Apr 2014 12:01:02 +0200
-
-cookiecutter (0.6.4-1) unstable; urgency=low
-
-  * New upstream version.
-     + Drop patch fixing jinja2 requirement.
-     + Drop patch fixing unicode open with Python3.
-  * Add python-binaryornot as a build-dep.
-
- -- Vincent Bernat <bernat at debian.org>  Sun, 08 Sep 2013 16:25:50 +0200
-
-cookiecutter (0.6.1-1) unstable; urgency=low
-
-  * Initial release. Closes: #720024.
-
- -- Vincent Bernat <bernat at debian.org>  Sat, 17 Aug 2013 22:01:52 +0200

Copied: packages/cookiecutter/tags/1.0.0-2/debian/changelog (from rev 33462, packages/cookiecutter/trunk/debian/changelog)
===================================================================
--- packages/cookiecutter/tags/1.0.0-2/debian/changelog	                        (rev 0)
+++ packages/cookiecutter/tags/1.0.0-2/debian/changelog	2015-07-24 20:23:04 UTC (rev 33464)
@@ -0,0 +1,47 @@
+cookiecutter (1.0.0-2) UNRELEASED; urgency=medium
+
+  * Add a patch for compatibility with click 4.x. Closes: #793525.
+
+ -- Vincent Bernat <bernat at debian.org>  Fri, 24 Jul 2015 22:17:54 +0200
+
+cookiecutter (1.0.0-1) unstable; urgency=medium
+
+  * New upstream release
+     + Refresh patch.
+     + Depends on pytest to run tests.
+     + Depends on python-click for CLI. Install git as well.
+  * Bump Standards-Version. No changes.
+
+ -- Vincent Bernat <bernat at debian.org>  Sun, 26 Apr 2015 17:36:13 +0200
+
+cookiecutter (0.7.2-1) unstable; urgency=medium
+
+  * New upstream release
+     + Drop network related patch, not needed anymore.
+
+ -- Vincent Bernat <bernat at debian.org>  Sun, 28 Sep 2014 10:00:14 +0200
+
+cookiecutter (0.7.1-1) unstable; urgency=low
+
+  * New upstream release. Closes: #733567.
+     + Drop all patches are that are not needed any more.
+     + Build-Depends on python{,3}-yaml.
+  * Add patch to disable network tests.
+  * Add patch to handle .DS_Store (stripped by svn-upgrade).
+
+ -- Vincent Bernat <bernat at debian.org>  Sun, 27 Apr 2014 12:01:02 +0200
+
+cookiecutter (0.6.4-1) unstable; urgency=low
+
+  * New upstream version.
+     + Drop patch fixing jinja2 requirement.
+     + Drop patch fixing unicode open with Python3.
+  * Add python-binaryornot as a build-dep.
+
+ -- Vincent Bernat <bernat at debian.org>  Sun, 08 Sep 2013 16:25:50 +0200
+
+cookiecutter (0.6.1-1) unstable; urgency=low
+
+  * Initial release. Closes: #720024.
+
+ -- Vincent Bernat <bernat at debian.org>  Sat, 17 Aug 2013 22:01:52 +0200

Deleted: packages/cookiecutter/tags/1.0.0-2/debian/control
===================================================================
--- packages/cookiecutter/trunk/debian/control	2015-04-26 14:11:22 UTC (rev 32438)
+++ packages/cookiecutter/tags/1.0.0-2/debian/control	2015-07-24 20:23:04 UTC (rev 33464)
@@ -1,77 +0,0 @@
-Source: cookiecutter
-Section: python
-Priority: optional
-Maintainer: Vincent Bernat <bernat at debian.org>
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50~), dh-python,
-               python-all, python3-all,
-               python-sphinx (>= 1.0.7+dfsg),
-               python-setuptools, python3-setuptools,
-               python-jinja2, python3-jinja2,
-               python-mock, python3-mock,
-               python-binaryornot, python3-binaryornot,
-               python-yaml, python3-yaml
-Standards-Version: 3.9.5
-Homepage: https://github.com/audreyr/cookiecutter
-Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/cookiecutter/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/cookiecutter/trunk/
-
-Package: cookiecutter
-Architecture: all
-Depends: ${python:Depends}, ${misc:Depends},
-         python-cookiecutter (= ${binary:Version})
-Description: create projects from project templates
- Cookiecutter is command-line utility that creates projects from
- project templates, e.g. creating a Python package project from a
- Python package project template.
- .
- It can also be used as a Python module. It supports local and remote
- templates. The templating is done with Jinja2 and there is no
- limitation on the language used by the templated projects (Python,
- Ruby, Javascript, C, HTML, Postscript...).
-
-Package: python-cookiecutter
-Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
-Description: create projects from project templates (Python 2 module)
- Cookiecutter is command-line utility that creates projects from
- project templates, e.g. creating a Python package project from a
- Python package project template.
- .
- It can also be used as a Python module. It supports local and remote
- templates. The templating is done with Jinja2 and there is no
- limitation on the language used by the templated projects (Python,
- Ruby, Javascript, C, HTML, Postscript...).
- .
- This package contains the Python 2 module.
-
-Package: python3-cookiecutter
-Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}
-Description: create projects from project templates (Python 3 module)
- Cookiecutter is command-line utility that creates projects from
- project templates, e.g. creating a Python package project from a
- Python package project template.
- .
- It can also be used as a Python module. It supports local and remote
- templates. The templating is done with Jinja2 and there is no
- limitation on the language used by the templated projects (Python,
- Ruby, Javascript, C, HTML, Postscript...).
- .
- This package contains the Python 3 module.
-
-Package: python-cookiecutter-doc
-Section: doc
-Architecture: all
-Depends: ${sphinxdoc:Depends}, ${misc:Depends}
-Description: create projects from project templates (documentation)
- Cookiecutter is command-line utility that creates projects from
- project templates, e.g. creating a Python package project from a
- Python package project template.
- .
- It can also be used as a Python module. It supports local and remote
- templates. The templating is done with Jinja2 and there is no
- limitation on the language used by the templated projects (Python,
- Ruby, Javascript, C, HTML, Postscript...).
- .
- This package contains the documentation.

Copied: packages/cookiecutter/tags/1.0.0-2/debian/control (from rev 32439, packages/cookiecutter/trunk/debian/control)
===================================================================
--- packages/cookiecutter/tags/1.0.0-2/debian/control	                        (rev 0)
+++ packages/cookiecutter/tags/1.0.0-2/debian/control	2015-07-24 20:23:04 UTC (rev 33464)
@@ -0,0 +1,80 @@
+Source: cookiecutter
+Section: python
+Priority: optional
+Maintainer: Vincent Bernat <bernat at debian.org>
+Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Build-Depends: debhelper (>= 7.0.50~), dh-python,
+               git,
+               python-all, python3-all,
+               python-sphinx (>= 1.0.7+dfsg),
+               python-setuptools, python3-setuptools,
+               python-jinja2, python3-jinja2,
+               python-mock, python3-mock,
+               python-binaryornot, python3-binaryornot,
+               python-yaml, python3-yaml,
+               python-pytest, python3-pytest,
+               python-click, python3-click
+Standards-Version: 3.9.6
+Homepage: https://github.com/audreyr/cookiecutter
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/cookiecutter/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/cookiecutter/trunk/
+
+Package: cookiecutter
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends},
+         python-cookiecutter (= ${binary:Version})
+Description: create projects from project templates
+ Cookiecutter is command-line utility that creates projects from
+ project templates, e.g. creating a Python package project from a
+ Python package project template.
+ .
+ It can also be used as a Python module. It supports local and remote
+ templates. The templating is done with Jinja2 and there is no
+ limitation on the language used by the templated projects (Python,
+ Ruby, Javascript, C, HTML, Postscript...).
+
+Package: python-cookiecutter
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}
+Description: create projects from project templates (Python 2 module)
+ Cookiecutter is command-line utility that creates projects from
+ project templates, e.g. creating a Python package project from a
+ Python package project template.
+ .
+ It can also be used as a Python module. It supports local and remote
+ templates. The templating is done with Jinja2 and there is no
+ limitation on the language used by the templated projects (Python,
+ Ruby, Javascript, C, HTML, Postscript...).
+ .
+ This package contains the Python 2 module.
+
+Package: python3-cookiecutter
+Architecture: all
+Depends: ${python3:Depends}, ${misc:Depends}
+Description: create projects from project templates (Python 3 module)
+ Cookiecutter is command-line utility that creates projects from
+ project templates, e.g. creating a Python package project from a
+ Python package project template.
+ .
+ It can also be used as a Python module. It supports local and remote
+ templates. The templating is done with Jinja2 and there is no
+ limitation on the language used by the templated projects (Python,
+ Ruby, Javascript, C, HTML, Postscript...).
+ .
+ This package contains the Python 3 module.
+
+Package: python-cookiecutter-doc
+Section: doc
+Architecture: all
+Depends: ${sphinxdoc:Depends}, ${misc:Depends}
+Description: create projects from project templates (documentation)
+ Cookiecutter is command-line utility that creates projects from
+ project templates, e.g. creating a Python package project from a
+ Python package project template.
+ .
+ It can also be used as a Python module. It supports local and remote
+ templates. The templating is done with Jinja2 and there is no
+ limitation on the language used by the templated projects (Python,
+ Ruby, Javascript, C, HTML, Postscript...).
+ .
+ This package contains the documentation.

Copied: packages/cookiecutter/tags/1.0.0-2/debian/patches/0001-tests-ensure-to-use-an-existing-command-to-test-whic.patch (from rev 32439, packages/cookiecutter/trunk/debian/patches/0001-tests-ensure-to-use-an-existing-command-to-test-whic.patch)
===================================================================
--- packages/cookiecutter/tags/1.0.0-2/debian/patches/0001-tests-ensure-to-use-an-existing-command-to-test-whic.patch	                        (rev 0)
+++ packages/cookiecutter/tags/1.0.0-2/debian/patches/0001-tests-ensure-to-use-an-existing-command-to-test-whic.patch	2015-07-24 20:23:04 UTC (rev 33464)
@@ -0,0 +1,41 @@
+From f11016b94d281552d71eb3c75bb81609829751a4 Mon Sep 17 00:00:00 2001
+From: Vincent Bernat <vincent at bernat.im>
+Date: Sun, 26 Apr 2015 18:04:42 +0200
+Subject: [PATCH] tests: ensure to use an existing command to test `which`
+
+When testing cookiecutter while not having it installed, we get this
+failure:
+
+    =================================== FAILURES ===================================
+    ____________________________ test_existing_command _____________________________
+
+        def test_existing_command():
+    >       assert which('cookiecutter')
+    E       assert None
+    E        +  where None = which('cookiecutter')
+
+    tests/test_compat.py:15: AssertionError
+    =============== 1 failed, 74 passed, 16 skipped in 0.43 seconds ================
+
+A command that is almost guaranteed to exist is `date` (both on Unix and
+Windows systems).
+---
+ tests/test_compat.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_compat.py b/tests/test_compat.py
+index d2b2b4a612fa..05a3bfb93143 100644
+--- a/tests/test_compat.py
++++ b/tests/test_compat.py
+@@ -12,7 +12,7 @@ from cookiecutter.compat import which
+ 
+ 
+ def test_existing_command():
+-    assert which('cookiecutter')
++    assert which('date')
+ 
+ 
+ def test_non_existing_command():
+-- 
+2.1.4
+

Copied: packages/cookiecutter/tags/1.0.0-2/debian/patches/accept-click-4.x.patch (from rev 33463, packages/cookiecutter/trunk/debian/patches/accept-click-4.x.patch)
===================================================================
--- packages/cookiecutter/tags/1.0.0-2/debian/patches/accept-click-4.x.patch	                        (rev 0)
+++ packages/cookiecutter/tags/1.0.0-2/debian/patches/accept-click-4.x.patch	2015-07-24 20:23:04 UTC (rev 33464)
@@ -0,0 +1,16 @@
+Description: Cookiecutter works fine with click 4.x.
+Forwarded: not-needed
+
+Index: cookiecutter-1.0.0/setup.py
+===================================================================
+--- cookiecutter-1.0.0.orig/setup.py
++++ cookiecutter-1.0.0/setup.py
+@@ -23,7 +23,7 @@ if sys.argv[-1] == 'tag':
+ readme = open('README.rst').read()
+ history = open('HISTORY.rst').read().replace('.. :changelog:', '')
+ 
+-requirements = ['binaryornot>=0.2.0', 'jinja2>=2.7', 'PyYAML>=3.10', 'click<4.0']
++requirements = ['binaryornot>=0.2.0', 'jinja2>=2.7', 'PyYAML>=3.10', 'click<5.0']
+ test_requirements = ['pytest']
+ 
+ # Add Python 2.6-specific dependencies

Deleted: packages/cookiecutter/tags/1.0.0-2/debian/patches/series
===================================================================
--- packages/cookiecutter/trunk/debian/patches/series	2015-04-26 14:11:22 UTC (rev 32438)
+++ packages/cookiecutter/tags/1.0.0-2/debian/patches/series	2015-07-24 20:23:04 UTC (rev 33464)
@@ -1 +0,0 @@
-test-dont-expect-ds-store.patch

Copied: packages/cookiecutter/tags/1.0.0-2/debian/patches/series (from rev 33462, packages/cookiecutter/trunk/debian/patches/series)
===================================================================
--- packages/cookiecutter/tags/1.0.0-2/debian/patches/series	                        (rev 0)
+++ packages/cookiecutter/tags/1.0.0-2/debian/patches/series	2015-07-24 20:23:04 UTC (rev 33464)
@@ -0,0 +1,3 @@
+test-dont-expect-ds-store.patch
+0001-tests-ensure-to-use-an-existing-command-to-test-whic.patch
+accept-click-4.x.patch

Deleted: packages/cookiecutter/tags/1.0.0-2/debian/patches/test-dont-expect-ds-store.patch
===================================================================
--- packages/cookiecutter/trunk/debian/patches/test-dont-expect-ds-store.patch	2015-04-26 14:11:22 UTC (rev 32438)
+++ packages/cookiecutter/tags/1.0.0-2/debian/patches/test-dont-expect-ds-store.patch	2015-07-24 20:23:04 UTC (rev 33464)
@@ -1,26 +0,0 @@
-Subject: .DS_Store is stripped out by SVN, don't expect it
-Author: Vincent Bernat
-Forwarded: no
-
-Index: cookiecutter-0.7.2/tests/test_generate.py
-===================================================================
---- cookiecutter-0.7.2.orig/tests/test_generate.py
-+++ cookiecutter-0.7.2/tests/test_generate.py
-@@ -118,7 +118,6 @@ class TestGenerateFiles(CookiecutterClea
-             repo_dir='tests/test-generate-binaries'
-         )
-         self.assertTrue(os.path.isfile('inputbinary_files/logo.png'))
--        self.assertTrue(os.path.isfile('inputbinary_files/.DS_Store'))
-         self.assertTrue(os.path.isfile('inputbinary_files/readme.txt'))
-         self.assertTrue(
-             os.path.isfile('inputbinary_files/some_font.otf')
-@@ -127,9 +126,6 @@ class TestGenerateFiles(CookiecutterClea
-             os.path.isfile('inputbinary_files/binary_files/logo.png')
-         )
-         self.assertTrue(
--            os.path.isfile('inputbinary_files/binary_files/.DS_Store')
--        )
--        self.assertTrue(
-             os.path.isfile('inputbinary_files/binary_files/readme.txt')
-         )
-         self.assertTrue(

Copied: packages/cookiecutter/tags/1.0.0-2/debian/patches/test-dont-expect-ds-store.patch (from rev 32439, packages/cookiecutter/trunk/debian/patches/test-dont-expect-ds-store.patch)
===================================================================
--- packages/cookiecutter/tags/1.0.0-2/debian/patches/test-dont-expect-ds-store.patch	                        (rev 0)
+++ packages/cookiecutter/tags/1.0.0-2/debian/patches/test-dont-expect-ds-store.patch	2015-07-24 20:23:04 UTC (rev 33464)
@@ -0,0 +1,20 @@
+Subject: .DS_Store is stripped out by SVN, don't expect it
+Author: Vincent Bernat
+Forwarded: no
+
+Index: cookiecutter-1.0.0/tests/test_generate_files.py
+===================================================================
+--- cookiecutter-1.0.0.orig/tests/test_generate_files.py
++++ cookiecutter-1.0.0/tests/test_generate_files.py
+@@ -107,11 +107,9 @@ def test_generate_files_binaries():
+     )
+ 
+     assert os.path.isfile('inputbinary_files/logo.png')
+-    assert os.path.isfile('inputbinary_files/.DS_Store')
+     assert os.path.isfile('inputbinary_files/readme.txt')
+     assert os.path.isfile('inputbinary_files/some_font.otf')
+     assert os.path.isfile('inputbinary_files/binary_files/logo.png')
+-    assert os.path.isfile('inputbinary_files/binary_files/.DS_Store')
+     assert os.path.isfile('inputbinary_files/binary_files/readme.txt')
+     assert os.path.isfile('inputbinary_files/binary_files/some_font.otf')
+     assert os.path.isfile(




More information about the Python-modules-commits mailing list