From ff0efc8f6c35606878ca009f3582f5257db2c9e3 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 10 Oct 2019 19:13:15 +0200
Subject: gnu: python-bleach: Update to 3.1.0.

* gnu/packages/check.scm (python-pytest-runner-2, python2-pytest-runner-2):
New public variables.
* gnu/packages/python-xyz.scm (python-bleach): Update to 3.1.0.
[propagated-inputs]: Remove PYTHON-HTML5LIB-0.9.  Add PYTHON-WEBENCODINGS.
[native-inputs]: Remove PYTHON-NOSE.  Add PYTHON-PYTEST and PYTHON-PYTEST-RUNNER-2.
---
 gnu/packages/check.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'gnu/packages/check.scm')

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index dab0bd39c3..c7d8615b0b 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -816,6 +816,22 @@ supports coverage of subprocesses.")
 (define-public python2-pytest-runner
   (package-with-python2 python-pytest-runner))
 
+;; python-bleach 3.1.0 requires this ancient version of pytest-runner.
+;; Remove once no longer needed.
+(define-public python-pytest-runner-2
+  (package/inherit
+   python-pytest-runner
+   (version "2.12.2")
+   (source (origin
+             (method url-fetch)
+             (uri (pypi-uri "pytest-runner" version))
+             (sha256
+              (base32
+               "11ivjj9hfphkv4yfb2g74av4yy86y8gcbf7gbif0p1hcdfnxg3w6"))))))
+
+(define-public python2-pytest-runner-2
+  (package-with-python2 python-pytest-runner-2))
+
 (define-public python-pytest-mock
   (package
     (name "python-pytest-mock")
-- 
cgit 1.4.1


From e14d8dcff3e2882a5d0896c164f5bbde4f7a74fd Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sat, 12 Oct 2019 16:10:28 +0200
Subject: gnu: Add doctest.

* gnu/packages/check.scm (doctest): New public variable.
---
 gnu/packages/check.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'gnu/packages/check.scm')

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index c7d8615b0b..6a48c08064 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -354,6 +354,25 @@ a CxxTest testing library, it employs no advanced features of C++ (e.g. RTTI)
 and it supports a very flexible form of test discovery.")
     (license license:lgpl3+)))
 
+(define-public doctest
+  (package
+    (name "doctest")
+    (version "2.3.5")
+    (home-page "https://github.com/onqtam/doctest")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference (url home-page) (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0rddlzhnv0f5036q0m0p019pismka7sx6x8cnzk65sk77b1dsbhg"))))
+    (build-system cmake-build-system)
+    (synopsis "C++ test framework")
+    (description
+     "doctest is a single-header testing framework for C++11 and later.  It
+has been designed to be fast, light and unintrusive.")
+    (license license:expat)))
+
 (define-public go-gopkg.in-check.v1
   (let ((commit "788fd78401277ebd861206a03c884797c6ec5541")
         (revision "1"))
-- 
cgit 1.4.1