unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Danny Milosavljevic <dannym@scratchpost.org>
To: guix-devel@gnu.org
Subject: [PATCH v2 1/6] gnu: python-testtools: Update to 1.4.0.
Date: Wed, 18 Jan 2017 08:53:00 +0100	[thread overview]
Message-ID: <20170118075305.29573-2-dannym@scratchpost.org> (raw)
In-Reply-To: <20170118075305.29573-1-dannym@scratchpost.org>

* gnu/packages/python.scm (python-testtools): Update to 1.4.0.
  [source]: Use pypi-uri.
  [arguments]: New field.
---
 gnu/packages/python.scm | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 9a44b5881..d53a10116 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1982,17 +1982,36 @@ subprocess and see the output as well as any file modifications.")
 (define-public python-testtools
   (package
     (name "python-testtools")
-    (version "1.0.0")
+    (version "1.4.0")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append
-             "https://pypi.python.org/packages/source/t/testtools/testtools-"
-             version ".tar.gz"))
+       (uri (pypi-uri "testtools" version))
        (sha256
         (base32
-         "1dyml28ykpl5jb9khdmcdvhy1cxqingys6qvj2k04fzlaj6z3bbx"))))
+         "1vw8yljnd75d396hhw6s2hrf4cclzy845ifd5am0lxsl235z3i8c"))))
     (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-module-imports
+           (lambda _
+             (substitute* "setup.py"
+               (("'unittest2>=0.8.0',") ""))
+             (substitute* '("testtools/testcase.py"
+                            "testtools/testsuite.py"
+                            "testtools/run.py"
+                            "testtools/tests/test_run.py"
+                            "testtools/tests/test_testsuite.py"
+                            "testtools/tests/test_deferredruntest.py")
+               ;; unittest2 is a backport of Python2.7 features to Python 2.4.
+               (("import unittest2 as unittest") "import unittest")
+               (("import unittest2") "import unittest as unittest2")
+               (("from unittest2 import") "from unittest import"))
+             (substitute* "testtools/tests/test_testresult.py"
+               ;; NUL in source code is not allowed (raises ValueError).
+               (("\\x00\\x04") "\\x04"))
+             #t)))))
     (propagated-inputs
      `(("python-mimeparse" ,python-mimeparse)
        ("python-extras" ,python-extras)))

  reply	other threads:[~2017-01-18  7:53 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-04 23:30 [PATCH] guix: python-build-system: Properly inform caller about test status Danny Milosavljevic
2017-01-05 10:14 ` Hartmut Goebel
2017-01-05 13:31 ` Marius Bakke
2017-01-05 15:49   ` Leo Famulari
2017-01-05 16:06   ` python-tests: Sphinx Danny Milosavljevic
2017-01-05 16:11     ` Marius Bakke
2017-01-18  7:52       ` [PATCH v2 0/6] Make python-oslosphinx work in python-tests branch Danny Milosavljevic
2017-01-18  7:53         ` Danny Milosavljevic [this message]
2017-01-18 17:39           ` [PATCH v2 1/6] gnu: python-testtools: Update to 1.4.0 Marius Bakke
2017-01-19  9:28             ` Danny Milosavljevic
2017-01-19 12:59               ` Marius Bakke
2017-01-19 14:34                 ` python2-traceback2, python2-linecache2 Danny Milosavljevic
2017-01-19 15:01                   ` Marius Bakke
2017-01-19 17:46                     ` Marius Bakke
2017-01-20 19:56                       ` 'python-tests' merge Marius Bakke
2017-01-19 20:38                     ` python2-traceback2, python2-linecache2 Hartmut Goebel
2017-01-19 20:35                   ` Hartmut Goebel
2017-01-19 15:31           ` [PATCH v2 1/6] gnu: python-testtools: Update to 1.4.0 Danny Milosavljevic
2017-01-18  7:53         ` [PATCH v2 2/6] gnu: Add python-fastimport Danny Milosavljevic
2017-01-18 17:39           ` Marius Bakke
2017-01-18 23:43             ` Danny Milosavljevic
2017-01-18  7:53         ` [PATCH v2 3/6] gnu: Add python-dulwich Danny Milosavljevic
2017-01-18 17:48           ` Marius Bakke
2017-01-18 20:57             ` Efraim Flashner
2017-01-19  9:38               ` Danny Milosavljevic
2017-01-19  9:34             ` Danny Milosavljevic
2017-01-19 15:27             ` Danny Milosavljevic
2017-01-18  7:53         ` [PATCH v2 4/6] gnu: Add python-reno Danny Milosavljevic
2017-01-18 17:51           ` Marius Bakke
2017-01-19 15:40           ` Danny Milosavljevic
2017-01-19 16:32           ` Danny Milosavljevic
2017-01-18  7:53         ` [PATCH v2 5/6] gnu: python-mox3: Remove python-oslosphinx dependency (since the tests don't run anyway) Danny Milosavljevic
2017-01-18 17:54           ` Marius Bakke
2017-01-18 23:42             ` Danny Milosavljevic
2017-01-18  7:53         ` [PATCH v2 6/6] gnu: python-sphinx: Update to 1.5.1 and enable tests Danny Milosavljevic
2017-01-18 17:55           ` Marius Bakke
2017-01-18 23:35             ` Danny Milosavljevic

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170118075305.29573-2-dannym@scratchpost.org \
    --to=dannym@scratchpost.org \
    --cc=guix-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).