[Python-modules-commits] r25986 - in packages/cookiecutter/tags (16 files)
bernat at users.alioth.debian.org
bernat at users.alioth.debian.org
Sun Sep 29 11:15:19 UTC 2013
Date: Sunday, September 29, 2013 @ 11:15:18
Author: bernat
Revision: 25986
[svn-buildpackage] Tagging cookiecutter 0.6.4-1
Added:
packages/cookiecutter/tags/0.6.4-1/
packages/cookiecutter/tags/0.6.4-1/debian/changelog
(from rev 25984, packages/cookiecutter/trunk/debian/changelog)
packages/cookiecutter/tags/0.6.4-1/debian/control
(from rev 25782, packages/cookiecutter/trunk/debian/control)
packages/cookiecutter/tags/0.6.4-1/debian/cookiecutter.1
(from rev 25620, packages/cookiecutter/trunk/debian/cookiecutter.1)
packages/cookiecutter/tags/0.6.4-1/debian/cookiecutter.manpages
(from rev 25620, packages/cookiecutter/trunk/debian/cookiecutter.manpages)
packages/cookiecutter/tags/0.6.4-1/debian/patches/dont-do-git-clone.patch
(from rev 25985, packages/cookiecutter/trunk/debian/patches/dont-do-git-clone.patch)
packages/cookiecutter/tags/0.6.4-1/debian/patches/dont-test-with-dstore-files.patch
(from rev 25985, packages/cookiecutter/trunk/debian/patches/dont-test-with-dstore-files.patch)
packages/cookiecutter/tags/0.6.4-1/debian/patches/series
(from rev 25985, packages/cookiecutter/trunk/debian/patches/series)
packages/cookiecutter/tags/0.6.4-1/debian/rules
(from rev 25803, packages/cookiecutter/trunk/debian/rules)
Deleted:
packages/cookiecutter/tags/0.6.4-1/debian/changelog
packages/cookiecutter/tags/0.6.4-1/debian/control
packages/cookiecutter/tags/0.6.4-1/debian/patches/dont-do-git-clone.patch
packages/cookiecutter/tags/0.6.4-1/debian/patches/fix-unicode-open-python-3.patch
packages/cookiecutter/tags/0.6.4-1/debian/patches/relax-jinja-dep.patch
packages/cookiecutter/tags/0.6.4-1/debian/patches/series
packages/cookiecutter/tags/0.6.4-1/debian/rules
Deleted: packages/cookiecutter/tags/0.6.4-1/debian/changelog
===================================================================
--- packages/cookiecutter/trunk/debian/changelog 2013-08-17 22:01:10 UTC (rev 25619)
+++ packages/cookiecutter/tags/0.6.4-1/debian/changelog 2013-09-29 11:15:18 UTC (rev 25986)
@@ -1,5 +0,0 @@
-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/0.6.4-1/debian/changelog (from rev 25984, packages/cookiecutter/trunk/debian/changelog)
===================================================================
--- packages/cookiecutter/tags/0.6.4-1/debian/changelog (rev 0)
+++ packages/cookiecutter/tags/0.6.4-1/debian/changelog 2013-09-29 11:15:18 UTC (rev 25986)
@@ -0,0 +1,14 @@
+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/0.6.4-1/debian/control
===================================================================
--- packages/cookiecutter/trunk/debian/control 2013-08-17 22:01:10 UTC (rev 25619)
+++ packages/cookiecutter/tags/0.6.4-1/debian/control 2013-09-29 11:15:18 UTC (rev 25986)
@@ -1,75 +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
-Standards-Version: 3.9.4
-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/0.6.4-1/debian/control (from rev 25782, packages/cookiecutter/trunk/debian/control)
===================================================================
--- packages/cookiecutter/tags/0.6.4-1/debian/control (rev 0)
+++ packages/cookiecutter/tags/0.6.4-1/debian/control 2013-09-29 11:15:18 UTC (rev 25986)
@@ -0,0 +1,76 @@
+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
+Standards-Version: 3.9.4
+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/0.6.4-1/debian/cookiecutter.1 (from rev 25620, packages/cookiecutter/trunk/debian/cookiecutter.1)
===================================================================
--- packages/cookiecutter/tags/0.6.4-1/debian/cookiecutter.1 (rev 0)
+++ packages/cookiecutter/tags/0.6.4-1/debian/cookiecutter.1 2013-09-29 11:15:18 UTC (rev 25986)
@@ -0,0 +1,23 @@
+.Dd $Mdocdate: August 18 2013 $
+.Dt COOKIECUTTER 1
+.Os
+.Sh NAME
+.Nm cookiecutter
+.Nd create projects from project templates
+.Sh SYNOPSIS
+.Nm
+.Op Fl h
+.Ar input
+.Sh DESCRIPTION
+.Nm
+is a command-line tool to create projects from project templates. It
+takes as input a template which is either a local directory or an URL
+to a repository.
+.Nm
+will then generate the project from the template. It may ask questions
+to fill in some values.
+.Sh SEE ALSO
+For more documentation about
+.Nm ,
+have a look at
+.Pa /usr/share/doc/python-cookiecutter-doc/html/index.html .
Copied: packages/cookiecutter/tags/0.6.4-1/debian/cookiecutter.manpages (from rev 25620, packages/cookiecutter/trunk/debian/cookiecutter.manpages)
===================================================================
--- packages/cookiecutter/tags/0.6.4-1/debian/cookiecutter.manpages (rev 0)
+++ packages/cookiecutter/tags/0.6.4-1/debian/cookiecutter.manpages 2013-09-29 11:15:18 UTC (rev 25986)
@@ -0,0 +1 @@
+debian/cookiecutter.1
Deleted: packages/cookiecutter/tags/0.6.4-1/debian/patches/dont-do-git-clone.patch
===================================================================
--- packages/cookiecutter/trunk/debian/patches/dont-do-git-clone.patch 2013-08-17 22:01:10 UTC (rev 25619)
+++ packages/cookiecutter/tags/0.6.4-1/debian/patches/dont-do-git-clone.patch 2013-09-29 11:15:18 UTC (rev 25986)
@@ -1,16 +0,0 @@
-Description: Builders don't have access to network, skip this test
-Author: Vincent Bernat <bernat at debian.org>
-Forwarded: no
-
-Index: cookiecutter-0.6.1/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 @@
-
- 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')
Copied: packages/cookiecutter/tags/0.6.4-1/debian/patches/dont-do-git-clone.patch (from rev 25985, packages/cookiecutter/trunk/debian/patches/dont-do-git-clone.patch)
===================================================================
--- packages/cookiecutter/tags/0.6.4-1/debian/patches/dont-do-git-clone.patch (rev 0)
+++ packages/cookiecutter/tags/0.6.4-1/debian/patches/dont-do-git-clone.patch 2013-09-29 11:15:18 UTC (rev 25986)
@@ -0,0 +1,44 @@
+Description: Builders don't have access to network, skip this test
+Author: Vincent Bernat <bernat at debian.org>
+Forwarded: no
+
+Index: cookiecutter-0.6.4/tests/test_vcs.py
+===================================================================
+--- cookiecutter-0.6.4.orig/tests/test_vcs.py 2013-09-29 13:00:09.586944734 +0200
++++ cookiecutter-0.6.4/tests/test_vcs.py 2013-09-29 13:01:05.696038267 +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'
+@@ -50,6 +51,7 @@
+ shutil.rmtree('cookiecutter-pypackage')
+ os.mkdir('cookiecutter-pypackage/')
+
++ @unittest.skip("disabled, no network")
+ @patch(input_str, lambda: 'y')
+ def test_git_clone_overwrite(self):
+ if not PY3:
+@@ -60,6 +62,7 @@
+ self.assertEqual(repo_dir, 'cookiecutter-pypackage')
+ self.assertTrue(os.path.isfile('cookiecutter-pypackage/README.rst'))
+
++ @unittest.skip("disabled, no network")
+ @patch(input_str, lambda: 'n')
+ def test_git_clone_cancel(self):
+ if not PY3:
+Index: cookiecutter-0.6.4/tests/test_main.py
+===================================================================
+--- cookiecutter-0.6.4.orig/tests/test_main.py 2013-08-21 12:33:41.000000000 +0200
++++ cookiecutter-0.6.4/tests/test_main.py 2013-09-29 13:01:55.521009341 +0200
+@@ -66,6 +66,7 @@
+
+ class TestCookiecutterRepoArg(unittest.TestCase):
+
++ @unittest.skip("disabled, no network")
+ @patch(input_str, lambda x: '')
+ def test_cookiecutter_git(self):
+ if not PY3:
Copied: packages/cookiecutter/tags/0.6.4-1/debian/patches/dont-test-with-dstore-files.patch (from rev 25985, packages/cookiecutter/trunk/debian/patches/dont-test-with-dstore-files.patch)
===================================================================
--- packages/cookiecutter/tags/0.6.4-1/debian/patches/dont-test-with-dstore-files.patch (rev 0)
+++ packages/cookiecutter/tags/0.6.4-1/debian/patches/dont-test-with-dstore-files.patch 2013-09-29 11:15:18 UTC (rev 25986)
@@ -0,0 +1,24 @@
+Description: .DS_Store files are stripped out by dh_clean.
+Author: Vincent Bernat <bernat at debian.org>
+Forwarded: no
+
+Index: cookiecutter-0.6.4/tests/test_generate.py
+===================================================================
+--- cookiecutter-0.6.4.orig/tests/test_generate.py 2013-08-21 12:33:41.000000000 +0200
++++ cookiecutter-0.6.4/tests/test_generate.py 2013-09-29 13:05:13.552869050 +0200
+@@ -67,7 +67,6 @@
+ template_dir='tests/input{{binary_test}}'
+ )
+ self.assertTrue(os.path.isfile('tests/inputbinary_files/logo.png'))
+- self.assertTrue(os.path.isfile('tests/inputbinary_files/.DS_Store'))
+ self.assertTrue(os.path.isfile('tests/inputbinary_files/readme.txt'))
+ self.assertTrue(
+ os.path.isfile('tests/inputbinary_files/some_font.otf')
+@@ -79,7 +78,6 @@
+ template_dir='tests/input{{binary_test}}'
+ )
+ expected = ['tests/inputbinary_files/binary_files/logo.png',
+- "tests/inputbinary_files/binary_files/.DS_Store",
+ "tests/inputbinary_files/binary_files/readme.txt"]
+ for each in expected:
+ self.assertTrue(os.path.isfile(each))
Deleted: packages/cookiecutter/tags/0.6.4-1/debian/patches/fix-unicode-open-python-3.patch
===================================================================
--- packages/cookiecutter/trunk/debian/patches/fix-unicode-open-python-3.patch 2013-08-17 22:01:10 UTC (rev 25619)
+++ packages/cookiecutter/tags/0.6.4-1/debian/patches/fix-unicode-open-python-3.patch 2013-09-29 11:15:18 UTC (rev 25986)
@@ -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/tags/0.6.4-1/debian/patches/relax-jinja-dep.patch
===================================================================
--- packages/cookiecutter/trunk/debian/patches/relax-jinja-dep.patch 2013-08-17 22:01:10 UTC (rev 25619)
+++ packages/cookiecutter/tags/0.6.4-1/debian/patches/relax-jinja-dep.patch 2013-09-29 11:15:18 UTC (rev 25986)
@@ -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')
Deleted: packages/cookiecutter/tags/0.6.4-1/debian/patches/series
===================================================================
--- packages/cookiecutter/trunk/debian/patches/series 2013-08-17 22:01:10 UTC (rev 25619)
+++ packages/cookiecutter/tags/0.6.4-1/debian/patches/series 2013-09-29 11:15:18 UTC (rev 25986)
@@ -1,3 +0,0 @@
-relax-jinja-dep.patch
-dont-do-git-clone.patch
-fix-unicode-open-python-3.patch
Copied: packages/cookiecutter/tags/0.6.4-1/debian/patches/series (from rev 25985, packages/cookiecutter/trunk/debian/patches/series)
===================================================================
--- packages/cookiecutter/tags/0.6.4-1/debian/patches/series (rev 0)
+++ packages/cookiecutter/tags/0.6.4-1/debian/patches/series 2013-09-29 11:15:18 UTC (rev 25986)
@@ -0,0 +1,2 @@
+dont-do-git-clone.patch
+dont-test-with-dstore-files.patch
Deleted: packages/cookiecutter/tags/0.6.4-1/debian/rules
===================================================================
--- packages/cookiecutter/trunk/debian/rules 2013-08-17 22:01:10 UTC (rev 25619)
+++ packages/cookiecutter/tags/0.6.4-1/debian/rules 2013-09-29 11:15:18 UTC (rev 25986)
@@ -1,25 +0,0 @@
-#!/usr/bin/make -f
-# -*- mode: makefile; coding: utf-8 -*-
-
-export PYBUILD_DESTDIR_python2=debian/python-cookiecutter/
-export PYBUILD_DESTDIR_python3=debian/python3-cookiecutter/
-
-%:
- dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
-
-override_dh_installdocs:
- dh_installdocs
- PYTHONPATH=. sphinx-build -N -q -E -b html docs/ \
- debian/python-cookiecutter-doc/usr/share/doc/python-cookiecutter-doc/html/
-
-override_dh_auto_clean:
- dh_auto_clean
- find . \( -name '*.py[co]' -or -name '\._*' -or -name '\.DS_Store' \) -delete
-
-override_dh_install:
- dh_install
- # Move cookiecutter executable in its dedicated package
- mkdir debian/cookiecutter/usr
- mv debian/python-cookiecutter/usr/bin debian/cookiecutter/usr/.
- rm -rf debian/python-cookiecutter/usr/bin
- rm -rf debian/python3-cookiecutter/usr/bin
Copied: packages/cookiecutter/tags/0.6.4-1/debian/rules (from rev 25803, packages/cookiecutter/trunk/debian/rules)
===================================================================
--- packages/cookiecutter/tags/0.6.4-1/debian/rules (rev 0)
+++ packages/cookiecutter/tags/0.6.4-1/debian/rules 2013-09-29 11:15:18 UTC (rev 25986)
@@ -0,0 +1,26 @@
+#!/usr/bin/make -f
+# -*- mode: makefile; coding: utf-8 -*-
+
+export PYBUILD_DESTDIR_python2=debian/python-cookiecutter/
+export PYBUILD_DESTDIR_python3=debian/python3-cookiecutter/
+export LC_ALL=C.UTF-8
+
+%:
+ dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+
+override_dh_installdocs:
+ dh_installdocs
+ PYTHONPATH=. sphinx-build -N -q -E -b html docs/ \
+ debian/python-cookiecutter-doc/usr/share/doc/python-cookiecutter-doc/html/
+
+override_dh_auto_clean:
+ dh_auto_clean
+ find . \( -name '*.py[co]' -or -name '\._*' -or -name '\.DS_Store' \) -delete
+
+override_dh_install:
+ dh_install
+ # Move cookiecutter executable in its dedicated package
+ mkdir debian/cookiecutter/usr
+ mv debian/python-cookiecutter/usr/bin debian/cookiecutter/usr/.
+ rm -rf debian/python-cookiecutter/usr/bin
+ rm -rf debian/python3-cookiecutter/usr/bin
More information about the Python-modules-commits
mailing list