Run of fresh-snapshots for cram

Try this locally (using silver-platter):

debian-svp new-upstream --snapshot cram 

Merge these changes:

git pull https://janitor.debian.net/git/cram fresh-snapshots/main

Summary

Merged new upstream version: 0.7+git20160224.59c164d (was: 0.7).

Diff

diff --git a/.hgtags b/.hgtags
index 8fd57d1..dacb1c9 100644
--- a/.hgtags
+++ b/.hgtags
@@ -6,3 +6,4 @@
 3ba61fadf306c63ec4bc3254522f286a27ac974a 0.4
 112e96e43892344954a98b0f05a32819f2b6c20d 0.5
 05669fd0420dc0cd52f48bc2f2379a61732d14e0 0.6
+e230eb00d4668508766fc32da154ba46c358ff5f 0.7
diff --git a/README.rst b/README.rst
index 4dbfc79..d19b83b 100644
--- a/README.rst
+++ b/README.rst
@@ -76,7 +76,7 @@ The format in a nutshell:
 
 * Anything else is a comment.
 
-.. _Cram's own test suite: https://bitbucket.org/brodie/cram/src/default/tests/cram.t
+.. _Cram's own test suite: https://bitbucket.org/brodie/cram/src/0.6/tests/cram.t
 .. _Perl-compatible regular expressions: https://en.wikipedia.org/wiki/Perl_Compatible_Regular_Expressions
 
 
diff --git a/TODO.md b/TODO.md
index d33a45a..d044190 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,5 +1,7 @@
 * Add more comments explaining how different parts of the code work.
 
+* Add a man page.
+
 * Implement string substitutions (e.g., --substitute=FOOPORT=123).
 
 * Conditionals (e.g., --define=windows=1, #if windows ... #else ...
@@ -7,6 +9,10 @@
 
 * Support #!/usr/bin/env cram
 
+* Support .cramrc in test directories. Though, if I do this, what happens
+  when there are multiple .cramrc files? Does the deepest one completely
+  override the others? Do they merge together?
+
 * Homebrew formula.
 
 * Debian, Ubuntu, CentOS/RHEL repos.
diff --git a/contrib/PKGBUILD b/contrib/PKGBUILD
index 3b9fd2b..48e8e84 100644
--- a/contrib/PKGBUILD
+++ b/contrib/PKGBUILD
@@ -1,18 +1,17 @@
 # Maintainer: Andrey Vlasovskikh <andrey.vlasovskikh@gmail.com>
 
 pkgname=cram
-pkgver=0.6
+pkgver=0.7
 pkgrel=1
-pkgdesc="A simple testing framework for command line applications"
+pkgdesc="Functional tests for command line applications"
 arch=(any)
 url="https://bitheap.org/cram/"
 license=('GPL')
-depends=('python2')
+depends=('python')
 source=("https://pypi.python.org/packages/source/c/cram/cram-$pkgver.tar.gz")
-md5sums=('3808e3e7812c68ca962c4db9abac9069')
+md5sums=('2ea37ada5190526b9bcaac5e4099221c')
 
 build() {
     cd "$srcdir/$pkgname-$pkgver"
-    python2 setup.py build || return 1
-    python2 setup.py install --root=$pkgdir --optimize=1 || return 1
+    python setup.py install --root="$pkgdir/" --optimize=1
 }
diff --git a/debian/changelog b/debian/changelog
index c0440c7..a006d11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-cram (0.7-5) UNRELEASED; urgency=medium
+cram (0.7+git20160224.59c164d-1) UNRELEASED; urgency=medium
 
   * Bump debhelper from old 9 to 12.
   * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
     Repository-Browse.
+  * New upstream snapshot.
 
- -- Debian Janitor <janitor@jelmer.uk>  Sat, 18 Jan 2020 22:41:05 +0000
+ -- Debian Janitor <janitor@jelmer.uk>  Sat, 25 Jan 2020 22:55:01 +0000
 
 cram (0.7-4) unstable; urgency=medium
 
diff --git a/debian/patches/make_testable.patch b/debian/patches/make_testable.patch
index 8ac6c7a..04f3a62 100644
--- a/debian/patches/make_testable.patch
+++ b/debian/patches/make_testable.patch
@@ -5,8 +5,10 @@ Last-Update: 2016-03-04
 
 ---
 
---- cram-0.7.orig/Makefile
-+++ cram-0.7/Makefile
+Index: cram/Makefile
+===================================================================
+--- cram.orig/Makefile
++++ cram/Makefile
 @@ -1,7 +1,7 @@
 -COVERAGE=coverage
 +COVERAGE?=python-coverage
diff --git a/debian/patches/relax_test_criterion.patch b/debian/patches/relax_test_criterion.patch
index 9397861..b4ba2d8 100644
--- a/debian/patches/relax_test_criterion.patch
+++ b/debian/patches/relax_test_criterion.patch
@@ -6,8 +6,10 @@ Bug-Debian: https://bugs.debian.org/897516
 Author: Andreas Tille <tille@debian.org>
 Last-Update: Sun, 20 May 2018 12:55:37 +0200
 
---- a/Makefile
-+++ b/Makefile
+Index: cram/Makefile
+===================================================================
+--- cram.orig/Makefile
++++ cram/Makefile
 @@ -33,6 +33,6 @@ test:
  	$(COVERAGE) erase
  	COVERAGE=$(COVERAGE) PYTHON=$(PYTHON) PYTHONPATH=`pwd` scripts/cram \
diff --git a/setup.py b/setup.py
index bcaa0b1..e02112a 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@ setup(
         'Topic :: Software Development :: Testing',
     ],
     cmdclass=COMMANDS,
-    description='A simple testing framework for command line applications',
+    description='Functional tests for command line applications',
     download_url='https://bitheap.org/cram/cram-0.7.tar.gz',
     keywords='automatic functional test framework',
     license='GNU GPLv2 or any later version',

Full worker log Full build log