[Python-modules-commits] r32439 - in packages/cookiecutter/trunk/debian (5 files)
bernat at users.alioth.debian.org
bernat at users.alioth.debian.org
Sun Apr 26 16:19:21 UTC 2015
Date: Sunday, April 26, 2015 @ 16:19:20
Author: bernat
Revision: 32439
New upstream version.
Added:
packages/cookiecutter/trunk/debian/patches/0001-tests-ensure-to-use-an-existing-command-to-test-whic.patch
Modified:
packages/cookiecutter/trunk/debian/changelog
packages/cookiecutter/trunk/debian/control
packages/cookiecutter/trunk/debian/patches/series
packages/cookiecutter/trunk/debian/patches/test-dont-expect-ds-store.patch
Modified: packages/cookiecutter/trunk/debian/changelog
===================================================================
--- packages/cookiecutter/trunk/debian/changelog 2015-04-26 14:11:22 UTC (rev 32438)
+++ packages/cookiecutter/trunk/debian/changelog 2015-04-26 16:19:20 UTC (rev 32439)
@@ -1,3 +1,13 @@
+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
Modified: packages/cookiecutter/trunk/debian/control
===================================================================
--- packages/cookiecutter/trunk/debian/control 2015-04-26 14:11:22 UTC (rev 32438)
+++ packages/cookiecutter/trunk/debian/control 2015-04-26 16:19:20 UTC (rev 32439)
@@ -4,14 +4,17 @@
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
-Standards-Version: 3.9.5
+ 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/
Added: packages/cookiecutter/trunk/debian/patches/0001-tests-ensure-to-use-an-existing-command-to-test-whic.patch
===================================================================
--- packages/cookiecutter/trunk/debian/patches/0001-tests-ensure-to-use-an-existing-command-to-test-whic.patch (rev 0)
+++ packages/cookiecutter/trunk/debian/patches/0001-tests-ensure-to-use-an-existing-command-to-test-whic.patch 2015-04-26 16:19:20 UTC (rev 32439)
@@ -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
+
Modified: packages/cookiecutter/trunk/debian/patches/series
===================================================================
--- packages/cookiecutter/trunk/debian/patches/series 2015-04-26 14:11:22 UTC (rev 32438)
+++ packages/cookiecutter/trunk/debian/patches/series 2015-04-26 16:19:20 UTC (rev 32439)
@@ -1 +1,2 @@
test-dont-expect-ds-store.patch
+0001-tests-ensure-to-use-an-existing-command-to-test-whic.patch
Modified: packages/cookiecutter/trunk/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/trunk/debian/patches/test-dont-expect-ds-store.patch 2015-04-26 16:19:20 UTC (rev 32439)
@@ -2,25 +2,19 @@
Author: Vincent Bernat
Forwarded: no
-Index: cookiecutter-0.7.2/tests/test_generate.py
+Index: cookiecutter-1.0.0/tests/test_generate_files.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(
+--- 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