[Python-modules-commits] r25782 - in packages/cookiecutter/trunk/debian (6 files)

[bernat at users.alioth.debian.org]

    Date: Sunday, September 8, 2013 @ 14:32:26
  Author: bernat
Revision: 25782

New upstream version.

Does not compile yet, due to a missing dependency.

Modified:
  packages/cookiecutter/trunk/debian/changelog
  packages/cookiecutter/trunk/debian/control
  packages/cookiecutter/trunk/debian/patches/dont-do-git-clone.patch
  packages/cookiecutter/trunk/debian/patches/series
Deleted:
  packages/cookiecutter/trunk/debian/patches/fix-unicode-open-python-3.patch
  packages/cookiecutter/trunk/debian/patches/relax-jinja-dep.patch

Modified: packages/cookiecutter/trunk/debian/changelog
===================================================================
--- packages/cookiecutter/trunk/debian/changelog	2013-09-08 13:25:17 UTC (rev 25781)
+++ packages/cookiecutter/trunk/debian/changelog	2013-09-08 14:32:26 UTC (rev 25782)
@@ -1,3 +1,12 @@
+cookiecutter (0.6.4-1) UNRELEASED; 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.

Modified: packages/cookiecutter/trunk/debian/control
===================================================================
--- packages/cookiecutter/trunk/debian/control	2013-09-08 13:25:17 UTC (rev 25781)
+++ packages/cookiecutter/trunk/debian/control	2013-09-08 14:32:26 UTC (rev 25782)
@@ -8,7 +8,8 @@
                python-sphinx (>= 1.0.7+dfsg),
                python-setuptools, python3-setuptools,
                python-jinja2, python3-jinja2,
-               python-mock, python3-mock
+               python-mock, python3-mock,
+               python-binaryornot, python3-binaryornot
 Standards-Version: 3.9.4
 Homepage: https://github.com/audreyr/cookiecutter
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/cookiecutter/trunk/

Modified: packages/cookiecutter/trunk/debian/patches/dont-do-git-clone.patch
===================================================================
--- packages/cookiecutter/trunk/debian/patches/dont-do-git-clone.patch	2013-09-08 13:25:17 UTC (rev 25781)
+++ packages/cookiecutter/trunk/debian/patches/dont-do-git-clone.patch	2013-09-08 14:32:26 UTC (rev 25782)
@@ -2,15 +2,15 @@
 Author: Vincent Bernat <bernat at debian.org>
 Forwarded: no
 
-Index: cookiecutter-0.6.1/tests/test_vcs.py
+Index: cookiecutter-0.6.4/tests/test_vcs.py
 ===================================================================
---- cookiecutter-0.6.1.orig/tests/test_vcs.py	2013-08-12 14:57:35.000000000 +0200
-+++ cookiecutter-0.6.1/tests/test_vcs.py	2013-08-17 22:36:17.415114975 +0200
-@@ -21,6 +21,7 @@
+--- cookiecutter-0.6.4.orig/tests/test_vcs.py	2013-09-08 16:28:04.351120333 +0200
++++ cookiecutter-0.6.4/tests/test_vcs.py	2013-09-08 16:28:04.343120172 +0200
+@@ -33,6 +33,7 @@
  
  class TestVCS(unittest.TestCase):
  
 +    @unittest.skip("disabled, no network")
      def test_git_clone(self):
-         repo_dir = vcs.git_clone('https://github.com/audreyr/cookiecutter-pypackage.git')
-         self.assertEqual(repo_dir, 'cookiecutter-pypackage')
+         repo_dir = vcs.git_clone(
+             'https://github.com/audreyr/cookiecutter-pypackage.git'

Deleted: packages/cookiecutter/trunk/debian/patches/fix-unicode-open-python-3.patch
===================================================================
--- packages/cookiecutter/trunk/debian/patches/fix-unicode-open-python-3.patch	2013-09-08 13:25:17 UTC (rev 25781)
+++ packages/cookiecutter/trunk/debian/patches/fix-unicode-open-python-3.patch	2013-09-08 14:32:26 UTC (rev 25782)
@@ -1,18 +0,0 @@
-Description: Fix a bug when opening UTF-8 files in Python3: encoding
-  needs to be specified.
-Author: Vincent Bernat <bernat at debian.org>
-Forwarded: https://github.com/audreyr/cookiecutter/issues/27
-
-Index: cookiecutter-0.6.1/cookiecutter/utils.py
-===================================================================
---- cookiecutter-0.6.1.orig/cookiecutter/utils.py	2013-08-12 14:57:35.000000000 +0200
-+++ cookiecutter-0.6.1/cookiecutter/utils.py	2013-08-17 23:44:29.835285535 +0200
-@@ -37,7 +37,7 @@
-     Opens a file as usual on Python 3, and with UTF-8 encoding on Python 2.
-     :param filename: Name of file to open.
-     """
-+    kwargs['encoding'] = "utf-8"
-     if PY3:
-         return open(filename, *args, **kwargs)
--    kwargs['encoding'] = "utf-8"
-     return codecs.open(filename, *args, **kwargs)

Deleted: packages/cookiecutter/trunk/debian/patches/relax-jinja-dep.patch
===================================================================
--- packages/cookiecutter/trunk/debian/patches/relax-jinja-dep.patch	2013-09-08 13:25:17 UTC (rev 25781)
+++ packages/cookiecutter/trunk/debian/patches/relax-jinja-dep.patch	2013-09-08 14:32:26 UTC (rev 25782)
@@ -1,17 +0,0 @@
-Description: Relax dependency on Jinja2 for tests
-Author: Vincent Bernat <bernat at debian.org>
-Forwarded: no
-
-Index: cookiecutter-0.6.1/setup.py
-===================================================================
---- cookiecutter-0.6.1.orig/setup.py	2013-08-12 14:57:35.000000000 +0200
-+++ cookiecutter-0.6.1/setup.py	2013-08-17 22:24:45.267301311 +0200
-@@ -17,7 +17,7 @@
- readme = open('README.rst').read()
- history = open('HISTORY.rst').read().replace('.. :changelog:', '')
- 
--requirements = ['jinja2==2.7']
-+requirements = ['jinja2>=2.7']
- 
- if sys.version_info[:2] < (2, 7):
-     requirements.append('argparse')

Modified: packages/cookiecutter/trunk/debian/patches/series
===================================================================
--- packages/cookiecutter/trunk/debian/patches/series	2013-09-08 13:25:17 UTC (rev 25781)
+++ packages/cookiecutter/trunk/debian/patches/series	2013-09-08 14:32:26 UTC (rev 25782)
@@ -1,3 +1 @@
-relax-jinja-dep.patch
 dont-do-git-clone.patch
-fix-unicode-open-python-3.patch