From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 16:04:37 2017 Received: (at submit) by debbugs.gnu.org; 31 Jul 2017 20:04:37 +0000 Received: from localhost ([127.0.0.1]:35659 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGvd-0004gF-AX for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:04:37 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35618) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGvZ-0004fz-FV for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:04:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dcGvT-0000DD-9t for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:04:28 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:58499) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dcGvT-0000D7-6l for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:04:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dcGvP-0008CS-UM for guix-patches@gnu.org; Mon, 31 Jul 2017 16:04:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dcGvK-00007c-Nm for guix-patches@gnu.org; Mon, 31 Jul 2017 16:04:23 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:51595) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dcGvK-00006X-Fb for guix-patches@gnu.org; Mon, 31 Jul 2017 16:04:18 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id E1FF620BE9; Mon, 31 Jul 2017 16:04:17 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 31 Jul 2017 16:04:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc:x-sasl-enc; s=fm1; bh=FexvQiEVQODbPGfgsAeAtzm7ztneUE pDfHGh4sqCWx8=; b=NxEzqNET5qTeTv85LnbyQVXxxcgdp5CZKo9/E2KUoFk5Cd upUjxYT3sXn5y4j9TGUT1C0mH5guLi1PB3E6NMYkW/yPcrFcL+d42SN8VGDOXEWJ YPiGZUMfHhIuepHJaAnMEt0L/P82IgTyF4TQYFZ10X2wNraVC+cLnPk2nAMt9V5Z 7h5LG5a0qy74Uz6JP5NpUUtlg/eqfGdWoG0PMyOWmrH2HinAom1444IE9u3vW81Y uxXGv5zhfC3CJvoPpHQdOoCv6cRlI4FgfQJpTsUyx8rClyc7bxv5SmTQx+U0OLNa HkSgaHKT96bjSXBSK9/eOBe1zsoSoZo/opUb8Pww== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=FexvQi EVQODbPGfgsAeAtzm7ztneUEpDfHGh4sqCWx8=; b=J9hIPU6pe4wBW9F5rJtKmO WCa64XuVszukHk924luIwuLd2dKy4KQquOtSrWbqkTlOdTvRlh3nYSYwHEmbvtck dhhLu9x2wsz6qR491wMW46nVZNaXjpYf4dm7R/vY5aqhwvJfcODMgfthRT+Bjprs of4N7lbJNnTGlsqPl3na3Numv7rB/oE7J5w1BpjM1rCHO9XaXh4tJ6/iePPIqrEH eZvJ535wNEp1p6/vk3NG3V70AixTXw/jrzGIPI4xPTf8zhuMpmO8aA29X/wP/4zz 7C21JMmyWvBH+vCXKsSXf4bnW/FwaAxrJ9H/LcQ1JQVxYsJjvbDe58cR3NbUURIg == X-ME-Sender: X-Sasl-enc: h4NymqYuC5VBXqLfvC1GGDFjhmBZoMQcm9BQtsoRgeeQ 1501531457 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 7F9227E525; Mon, 31 Jul 2017 16:04:17 -0400 (EDT) From: Marius Bakke To: guix-patches@gnu.org Subject: [PATCH 00/18] Python updates Date: Mon, 31 Jul 2017 22:04:13 +0200 Message-Id: <20170731200413.27588-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.3 (----) X-Debbugs-Envelope-To: submit Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.3 (----) This is the beginning of a new 'python-updates' branch. It updates to Python 3.6, as well as pulling in the latest versions of some popular libraries (mostly the pytest closure). More to come! 'python-pytest' gains a dependency on 'hypothesis' and 'setuptools_scm' which complicates the dependency tree somewhat. Currently I'm working around it by using a minimal 'python-pytest-bootstrap' variant in all packages required for pytest itself. It works, for now, but don't tell anyone that the tests for 'py' and 'setuptools_scm' are actually not running and also require 'pytest'. Not sure how to solve that one, but won't spend any more time on it this round unless someone has strong objections/suggestions. It's not like they are running tests now, anyway! Considering a new (gnu packages python-bootstrap) module to make it more manageable in the long run. The patches are on 'core-updates'. Feedback very welcome. I may or may not improve bootstrapping comments and descriptions of new packages before pushing ;-) If there is no feedback, I will push this to Savannah in a few days, destroying the older 'python-updates' branch. NB: The very last patch actually (inexplicably) breaks 'python-pytest' and is included only for visibility. No idea what's up, yet. Marius Bakke (18): gnu: python@3: Update to 3.6.2. gnu: python-py: Update to 1.4.34. gnu: python-six: Really enable tests. gnu: Remove python-pytest@2. gnu: python-pytest: Add a minimal variant for bootstrapping. gnu: python-setuptools-scm: Update to 1.15.6. gnu: python-pytest: Update to 3.1.3. gnu: python-pyflakes: Update to 1.5.0. gnu: python-mccabe: Update to 0.6.1. gnu: python-mock@2: Add dependency on python-six. gnu: Add python2-enum. gnu: python-flake8: Update to 3.4.1. gnu: Add python-linecache2. gnu: Add python-traceback2. gnu: python-unittest2: Update to 1.1.0. gnu: Add python2-funcsigs. gnu: python-mock: Make 2.0 the default package. gnu: python-hypothesis: Update to 3.14.0. gnu/local.mk | 4 +- gnu/packages/backup.scm | 4 +- gnu/packages/calendar.scm | 3 +- gnu/packages/patches/python-3-fix-tests.patch | 130 ++++ gnu/packages/patches/python-3.5-fix-tests.patch | 69 -- .../python-3.5-getentropy-on-old-kernels.patch | 720 --------------------- .../patches/python-unittest2-python3-compat.patch | 34 + gnu/packages/python.scm | 350 ++++++---- gnu/packages/tls.scm | 4 +- gnu/packages/web.scm | 2 +- 10 files changed, 394 insertions(+), 926 deletions(-) create mode 100644 gnu/packages/patches/python-3-fix-tests.patch delete mode 100644 gnu/packages/patches/python-3.5-fix-tests.patch delete mode 100644 gnu/packages/patches/python-3.5-getentropy-on-old-kernels.patch create mode 100644 gnu/packages/patches/python-unittest2-python3-compat.patch -- 2.13.3 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 16:07:43 2017 Received: (at 27888) by debbugs.gnu.org; 31 Jul 2017 20:07:43 +0000 Received: from localhost ([127.0.0.1]:35669 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyc-0004l3-RA for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:07:43 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:55155) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyb-0004kv-9g for 27888@debbugs.gnu.org; Mon, 31 Jul 2017 16:07:41 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 360E520BE9; Mon, 31 Jul 2017 16:07:41 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 31 Jul 2017 16:07:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=U9xmHZ DzZOIjdPKNAhWzErZ1th3CFAov9T84eSS+Yd0=; b=NMklJCri0jeTxMQsQMp2HZ 0u3X3EASwOomEpUfyP46HQzOAekDgOUKQlzU2+afvkANwmz3onWL90V37B2rJGvN +g6Ul+MAU2bl+RT09+UBXqByy9N9xvrIjDsTqSy9u+dTPgzj1+KT+xMgvhR5hEqx jEvd+lYTp8Z0+uIw0k1+9rOHIIOT8k63mhcQPyI7fa1cwaq8pj6WkTGUQetUpzxx mRNLi2mZbY/QBIEh5pK0eBg2u833nG4pbUzd9YR1AmZDwkQODBHq3RlqDzxcOKwi nShSHamefjP25ekKNNUO7u52CTcY3evKxyc5bfGVSLHstE/zl9nuKJQX21bxhe1Q == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=U9xmHZDzZOIjdPKNAhWzErZ1th3CFAov9T84eSS+Y d0=; b=lcHXESsNscUqydepGbd1wl8ZRDt4ekPQswqtmwtDZ+ClxSXTF8aTQSeJv teegZXRSk7lufqGDaGhcI+ve5cfGkoZ46TOlnHKdSVCWtCks+hSivP7+mSbZF1kd nCoT4fVwjfAIY+ZBPQcaxEDE6WaaB85dS4tMpuA2CRk961pHAmBoUGvvwsUaUM6Y Z7ypcUxLRs22ljQmQioCT3BF5NRcGkiSXIn7YnpkvJ8ot8BTycWUzeGOg1WdqJoM 9L1k8j3SfhptFft57Hcxg9EBAvwXi5HE8/DpL5YpOXNgzeFqxoQwoLoG1W5wh8xM n9dmY4wERxClMWYCJy1Uib/roqbgQ== X-ME-Sender: X-Sasl-enc: yZsRLBj/5wvUO0nVbP3lcMtLF57A/wcULhO14DJxzyzO 1501531660 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id C15A17E12A; Mon, 31 Jul 2017 16:07:40 -0400 (EDT) From: Marius Bakke To: 27888@debbugs.gnu.org Subject: [PATCH 02/18] gnu: python-py: Update to 1.4.34. Date: Mon, 31 Jul 2017 22:07:19 +0200 Message-Id: <20170731200735.28019-2-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170731200735.28019-1-mbakke@fastmail.com> References: <20170731200735.28019-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/python.scm (python-py, python2-py): Update to 1.4.34. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a047b617c..42f5d0472 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1855,14 +1855,14 @@ standard library.") (define-public python-py (package (name "python-py") - (version "1.4.32") + (version "1.4.34") (source (origin (method url-fetch) (uri (pypi-uri "py" version)) (sha256 (base32 - "19s1pql9pq85h1qzsdwgyb8a3k1qgkvh33b02m8kfqhizz8rzf64")))) + "1qyd5z0hv8ymxy84v5vig3vps2fvhcf4bdlksb3r03h549fmhb8g")))) (build-system python-build-system) (arguments ;; FIXME: "ImportError: 'test' module incorrectly imported from -- 2.13.3 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 16:07:56 2017 Received: (at 27888) by debbugs.gnu.org; 31 Jul 2017 20:07:56 +0000 Received: from localhost ([127.0.0.1]:35674 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGye-0004lP-59 for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:07:56 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:37177) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyZ-0004kt-VX for 27888@debbugs.gnu.org; Mon, 31 Jul 2017 16:07:42 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 99E2420780; Mon, 31 Jul 2017 16:07:39 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 31 Jul 2017 16:07:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=/Jhw5b VGiFCU/h5dsWU1U9F62noWqgn23N/X7zuK998=; b=0o4L4t3GiX4f3H/9dJqbLQ u9ojKYntiBsJyDiFfiy5svc+IcXT39wNB3gl5qAxHH3LmkyFo5MJ7LQFgjhXH9zJ 1KNZw3RV1C6wZ/W/wrWPD2k28muHqSoVvfaz3mBDYcP3+BnmYruQ6Fao4VTVPf14 4h6SKUhhVPzZuh1+1S16MQciOJg45G8Zp5682N9W1OtnhHKATvmmDrKjb225FfAc 6Hu3uxH84Z4oxCnYAzbGNlxGkk+Pphyk8lU7Yv05MRDhlg7SmW6aW1ifwoRoPL9L hTsUQhrPZ2jrPB6uDV7WirUA2WctMh4jP411OUWWOVPiHrohmp/0B+HZPFjk1ZCg == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=/Jhw5bVGiFCU/h5dsWU1U9F62noWqgn23N/X7zuK9 98=; b=l9t+7OqaJoUFxy3utXSBAl12IlOYQ7458KAFdcRFnEfsp+qiZvCZ2GhqX gZW1WeGdPIX8EKywdXohMjhFILXy0R4P57pqwnDfHzeb7JelQfof0fUxNwUUa91C AzdD7D4kbOWOnKilhrrx2tUrkjdun5GsgeA2x8k9y+gGiAxjDPJpVSPxZoceLbBM bENZKR1v1BachyEnySjQOgRELy2xmhdEpiV62nwFK/QsnjS95fq+N+Ju9WHmqgnD mME09kq/BT9mOuz/LzBWIb2nSqmPbHq3wx3QZSvDw1+0qSeudrHh0siG+nY3X6CL 3UUQV/Zl5idpbF1RGAOYi8dUk9Yag== X-ME-Sender: X-Sasl-enc: H/UP269yCJRoXNBJEbx1YxxtCpDcyW16xuwfxFwSg/OD 1501531658 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id BCF5E7E12A; Mon, 31 Jul 2017 16:07:38 -0400 (EDT) From: Marius Bakke To: 27888@debbugs.gnu.org Subject: [PATCH 01/18] gnu: python@3: Update to 3.6.2. Date: Mon, 31 Jul 2017 22:07:18 +0200 Message-Id: <20170731200735.28019-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: References: X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) * gnu/packages/patches/python-3.5-fix-tests.patch: Rename to ... * gnu/packages/patches/python-3-fix-tests.patch: ... this. Adjust and disable more tests. * gnu/packages/patches/python-3.5-getentropy-on-old-kernels.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python.scm (python-2.7)[argument]: Patch '/bin/sh' in one more file. (python-3.5): Rename to ... (python-3.6): ... this. Update to 3.6.2. [source](patches): Remove obsolete patch, adjust to patch rename. (python-3): Use PYTHON-3.6. --- gnu/local.mk | 3 +- gnu/packages/patches/python-3-fix-tests.patch | 130 ++++ gnu/packages/patches/python-3.5-fix-tests.patch | 69 -- .../python-3.5-getentropy-on-old-kernels.patch | 720 --------------------- gnu/packages/python.scm | 12 +- 5 files changed, 137 insertions(+), 797 deletions(-) create mode 100644 gnu/packages/patches/python-3-fix-tests.patch delete mode 100644 gnu/packages/patches/python-3.5-fix-tests.patch delete mode 100644 gnu/packages/patches/python-3.5-getentropy-on-old-kernels.patch diff --git a/gnu/local.mk b/gnu/local.mk index baada1cf0..62ef61589 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -932,8 +932,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-2.7-source-date-epoch.patch \ %D%/packages/patches/python-3-deterministic-build-info.patch \ %D%/packages/patches/python-3-search-paths.patch \ - %D%/packages/patches/python-3.5-fix-tests.patch \ - %D%/packages/patches/python-3.5-getentropy-on-old-kernels.patch \ + %D%/packages/patches/python-3-fix-tests.patch \ %D%/packages/patches/python-dendropy-fix-tests.patch \ %D%/packages/patches/python-fix-tests.patch \ %D%/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch \ diff --git a/gnu/packages/patches/python-3-fix-tests.patch b/gnu/packages/patches/python-3-fix-tests.patch new file mode 100644 index 000000000..dec58dd9c --- /dev/null +++ b/gnu/packages/patches/python-3-fix-tests.patch @@ -0,0 +1,130 @@ +Additional test fixes which affect Python 3.5 (and presumably later) but not +prior revisions of Python. + +--- Lib/test/test_pathlib.py 2014-03-01 03:02:36.088311000 +0100 ++++ Lib/test/test_pathlib.py 2014-03-01 04:56:37.768311000 +0100 +@@ -2132,8 +2132,7 @@ + self.assertEqual(given, expect) + self.assertEqual(set(p.rglob("FILEd*")), set()) + +- @unittest.skipUnless(hasattr(pwd, 'getpwall'), +- 'pwd module does not expose getpwall()') ++ @unittest.skipIf(True, "Guix builder home is '/' which causes trouble for these tests") + def test_expanduser(self): + P = self.cls + support.import_module('pwd') +--- Lib/test/test_tarfile.py 2016-02-24 19:22:52.597208055 +0000 ++++ Lib/test/test_tarfile.py 2016-02-24 20:50:48.941950135 +0000 +@@ -2305,11 +2305,14 @@ + try: + import pwd, grp + except ImportError: + return False +- if pwd.getpwuid(0)[0] != 'root': +- return False +- if grp.getgrgid(0)[0] != 'root': ++ try: ++ if pwd.getpwuid(0)[0] != 'root': ++ return False ++ if grp.getgrgid(0)[0] != 'root': ++ return False ++ except KeyError: + return False + return True + + +--- Lib/test/test_asyncio/test_base_events.py ++++ Lib/test/test_asyncio/test_base_events.py +@@ -1216,6 +1216,8 @@ + self._test_create_connection_ip_addr(m_socket, False) + + @patch_socket ++ @unittest.skipUnless(support.is_resource_enabled('network'), ++ 'network is not enabled') + def test_create_connection_service_name(self, m_socket): + m_socket.getaddrinfo = socket.getaddrinfo + sock = m_socket.socket.return_value + +--- Lib/test/test_pdb.py.org 2017-03-12 03:09:01.991856701 +0100 ++++ Lib/test/test_pdb.py 2017-03-12 03:26:17.742572869 +0100 + +For some reason, KeyboardInterrupts do not work in the build +environment (lack of controlling TTY?). Just change the expected +outcome. Unfortunately, this will make it fail for users running +`python -m test test_pdb test_pdb` interactively. + +@@ -928,11 +928,11 @@ + > (6)test_function() + -> print('pdb %d: %s' % (i, sess._previous_sigint_handler)) + (Pdb) continue +- pdb 1: ++ pdb 1: Handlers.SIG_IGN + > (5)test_function() + -> sess.set_trace(sys._getframe()) + (Pdb) continue +- pdb 2: ++ pdb 2: Handlers.SIG_IGN + """ + + class PdbTestCase(unittest.TestCase): +--- Lib/test/test_socket.py ++++ Lib/test/test_socket.py +@@ -802,6 +802,8 @@ + if not fqhn in all_host_names: + self.fail("Error testing host resolution mechanisms. (fqdn: %s, all: %s)" % (fqhn, repr(all_host_names))) + ++ @unittest.skipUnless(support.is_resource_enabled('network'), ++ 'network is not enabled') + def test_host_resolution(self): + for addr in [support.HOST, '10.0.0.1', '255.255.255.255']: + self.assertEqual(socket.gethostbyname(addr), addr) +--- Lib/test/test_spwd.py ++++ Lib/test/test_spwd.py +@@ -5,8 +5,7 @@ + spwd = support.import_module('spwd') + + +-@unittest.skipUnless(hasattr(os, 'geteuid') and os.geteuid() == 0, +- 'root privileges required') ++@unittest.skipUnless(os.path.exists("/etc/shadow"), 'spwd tests require /etc/shadow') + class TestSpwdRoot(unittest.TestCase): + + def test_getspall(self): +@@ -56,8 +55,7 @@ + self.assertRaises(TypeError, spwd.getspnam, bytes_name) + + +-@unittest.skipUnless(hasattr(os, 'geteuid') and os.geteuid() != 0, +- 'non-root user required') ++@unittest.skipUnless(os.path.exists("/etc/shadow"), 'spwd tests require /etc/shadow') + class TestSpwdNonRoot(unittest.TestCase): + + def test_getspnam_exception(self): +--- Lib/test/test_regrtest.py ++++ Lib/test/test_regrtest.py +@@ -700,6 +700,7 @@ + output = self.run_tests('--fromfile', filename) + self.check_executed_tests(output, tests) + ++ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment.') + def test_interrupted(self): + code = TEST_INTERRUPTED + test = self.create_test('sigint', code=code) +@@ -717,6 +718,7 @@ + % (self.TESTNAME_REGEX, len(tests))) + self.check_line(output, regex) + ++ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment.') + def test_slow_interrupted(self): + # Issue #25373: test --slowest with an interrupted test + code = TEST_INTERRUPTED +--- Lib/test/test_generators.py ++++ Lib/test/test_generators.py +@@ -29,6 +29,7 @@ + else: + return "FAILED" + ++ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment') + def test_raise_and_yield_from(self): + gen = self.generator1() + gen.send(None) diff --git a/gnu/packages/patches/python-3.5-fix-tests.patch b/gnu/packages/patches/python-3.5-fix-tests.patch deleted file mode 100644 index 9778b88db..000000000 --- a/gnu/packages/patches/python-3.5-fix-tests.patch +++ /dev/null @@ -1,69 +0,0 @@ -Additional test fixes which affect Python 3.5 (and presumably later) but not -prior revisions of Python. - ---- Lib/test/test_pathlib.py 2014-03-01 03:02:36.088311000 +0100 -+++ Lib/test/test_pathlib.py 2014-03-01 04:56:37.768311000 +0100 -@@ -1986,8 +1986,9 @@ - expect = set() if not support.fs_is_case_insensitive(BASE) else given - self.assertEqual(given, expect) - self.assertEqual(set(p.rglob("FILEd*")), set()) - -+ @unittest.skipIf(True, "Guix builder home is '/' which causes trouble for these tests") - def test_expanduser(self): - P = self.cls - support.import_module('pwd') - import pwd ---- Lib/test/test_tarfile.py 2016-02-24 19:22:52.597208055 +0000 -+++ Lib/test/test_tarfile.py 2016-02-24 20:50:48.941950135 +0000 -@@ -2305,11 +2305,14 @@ - try: - import pwd, grp - except ImportError: - return False -- if pwd.getpwuid(0)[0] != 'root': -- return False -- if grp.getgrgid(0)[0] != 'root': -+ try: -+ if pwd.getpwuid(0)[0] != 'root': -+ return False -+ if grp.getgrgid(0)[0] != 'root': -+ return False -+ except KeyError: - return False - return True - - ---- Lib/test/test_asyncio/test_base_events.py -+++ Lib/test/test_asyncio/test_base_events.py -@@ -1216,6 +1216,8 @@ - self._test_create_connection_ip_addr(m_socket, False) - - @patch_socket -+ @unittest.skipUnless(support.is_resource_enabled('network'), -+ 'network is not enabled') - def test_create_connection_service_name(self, m_socket): - m_socket.getaddrinfo = socket.getaddrinfo - sock = m_socket.socket.return_value - ---- Lib/test/test_pdb.py.org 2017-03-12 03:09:01.991856701 +0100 -+++ Lib/test/test_pdb.py 2017-03-12 03:26:17.742572869 +0100 - -For some reason, KeyboardInterrupts do not work in the build -environment (lack of controlling TTY?). Just change the expected -outcome. Unfortunately, this will make it fail for users running -`python -m test test_pdb test_pdb` interactively. - -@@ -928,11 +928,11 @@ - > (6)test_function() - -> print('pdb %d: %s' % (i, sess._previous_sigint_handler)) - (Pdb) continue -- pdb 1: -+ pdb 1: Handlers.SIG_IGN - > (5)test_function() - -> sess.set_trace(sys._getframe()) - (Pdb) continue -- pdb 2: -+ pdb 2: Handlers.SIG_IGN - """ - - class PdbTestCase(unittest.TestCase): diff --git a/gnu/packages/patches/python-3.5-getentropy-on-old-kernels.patch b/gnu/packages/patches/python-3.5-getentropy-on-old-kernels.patch deleted file mode 100644 index 8a12b5b44..000000000 --- a/gnu/packages/patches/python-3.5-getentropy-on-old-kernels.patch +++ /dev/null @@ -1,720 +0,0 @@ -This patch resolves a compatibility issue when compiled against glibc 2.25 -and run runder kernels < 3.17: - -https://bugzilla.redhat.com/show_bug.cgi?id=1410175 - -Upstream bug URL: https://bugs.python.org/issue29157 - -Patch copied from upstream source repository: - -https://hg.python.org/cpython/rev/8125d9a8152b - -# HG changeset patch -# User Victor Stinner -# Date 1483957133 -3600 -# Node ID 8125d9a8152b79e712cb09c7094b9129b9bcea86 -# Parent 337461574c90281630751b6095c4e1baf380cf7d -Issue #29157: Prefer getrandom() over getentropy() - -Copy and then adapt Python/random.c from default branch. Difference between 3.5 -and default branches: - -* Python 3.5 only uses getrandom() in non-blocking mode: flags=GRND_NONBLOCK -* If getrandom() fails with EAGAIN: py_getrandom() immediately fails and - remembers that getrandom() doesn't work. -* Python 3.5 has no _PyOS_URandomNonblock() function: _PyOS_URandom() - works in non-blocking mode on Python 3.5 - -diff --git a/Python/random.c b/Python/random.c ---- Python/random.c -+++ Python/random.c -@@ -1,6 +1,9 @@ - #include "Python.h" - #ifdef MS_WINDOWS - # include -+/* All sample MSDN wincrypt programs include the header below. It is at least -+ * required with Min GW. */ -+# include - #else - # include - # ifdef HAVE_SYS_STAT_H -@@ -37,10 +40,9 @@ win32_urandom_init(int raise) - return 0; - - error: -- if (raise) -+ if (raise) { - PyErr_SetFromWindowsErr(0); -- else -- Py_FatalError("Failed to initialize Windows random API (CryptoGen)"); -+ } - return -1; - } - -@@ -53,8 +55,9 @@ win32_urandom(unsigned char *buffer, Py_ - - if (hCryptProv == 0) - { -- if (win32_urandom_init(raise) == -1) -+ if (win32_urandom_init(raise) == -1) { - return -1; -+ } - } - - while (size > 0) -@@ -63,11 +66,9 @@ win32_urandom(unsigned char *buffer, Py_ - if (!CryptGenRandom(hCryptProv, (DWORD)chunk, buffer)) - { - /* CryptGenRandom() failed */ -- if (raise) -+ if (raise) { - PyErr_SetFromWindowsErr(0); -- else -- Py_FatalError("Failed to initialized the randomized hash " -- "secret using CryptoGen)"); -+ } - return -1; - } - buffer += chunk; -@@ -76,58 +77,23 @@ win32_urandom(unsigned char *buffer, Py_ - return 0; - } - --/* Issue #25003: Don't use getentropy() on Solaris (available since -- * Solaris 11.3), it is blocking whereas os.urandom() should not block. */ --#elif defined(HAVE_GETENTROPY) && !defined(sun) --#define PY_GETENTROPY 1 -- --/* Fill buffer with size pseudo-random bytes generated by getentropy(). -- Return 0 on success, or raise an exception and return -1 on error. -- -- If fatal is nonzero, call Py_FatalError() instead of raising an exception -- on error. */ --static int --py_getentropy(unsigned char *buffer, Py_ssize_t size, int fatal) --{ -- while (size > 0) { -- Py_ssize_t len = Py_MIN(size, 256); -- int res; -- -- if (!fatal) { -- Py_BEGIN_ALLOW_THREADS -- res = getentropy(buffer, len); -- Py_END_ALLOW_THREADS -- -- if (res < 0) { -- PyErr_SetFromErrno(PyExc_OSError); -- return -1; -- } -- } -- else { -- res = getentropy(buffer, len); -- if (res < 0) -- Py_FatalError("getentropy() failed"); -- } -- -- buffer += len; -- size -= len; -- } -- return 0; --} -- --#else -+#else /* !MS_WINDOWS */ - - #if defined(HAVE_GETRANDOM) || defined(HAVE_GETRANDOM_SYSCALL) - #define PY_GETRANDOM 1 - --/* Call getrandom() -+/* Call getrandom() to get random bytes: -+ - - Return 1 on success -- - Return 0 if getrandom() syscall is not available (failed with ENOSYS or -- EPERM) or if getrandom(GRND_NONBLOCK) failed with EAGAIN (system urandom -- not initialized yet) and raise=0. -+ - Return 0 if getrandom() is not available (failed with ENOSYS or EPERM), -+ or if getrandom(GRND_NONBLOCK) failed with EAGAIN (system urandom not -+ initialized yet). - - Raise an exception (if raise is non-zero) and return -1 on error: -- getrandom() failed with EINTR and the Python signal handler raised an -- exception, or getrandom() failed with a different error. */ -+ if getrandom() failed with EINTR, raise is non-zero and the Python signal -+ handler raised an exception, or if getrandom() failed with a different -+ error. -+ -+ getrandom() is retried if it failed with EINTR: interrupted by a signal. */ - static int - py_getrandom(void *buffer, Py_ssize_t size, int raise) - { -@@ -142,16 +108,19 @@ py_getrandom(void *buffer, Py_ssize_t si - * see https://bugs.python.org/issue26839. To avoid this, use the - * GRND_NONBLOCK flag. */ - const int flags = GRND_NONBLOCK; -+ char *dest; - long n; - - if (!getrandom_works) { - return 0; - } - -+ dest = buffer; - while (0 < size) { - #ifdef sun - /* Issue #26735: On Solaris, getrandom() is limited to returning up -- to 1024 bytes */ -+ to 1024 bytes. Call it multiple times if more bytes are -+ requested. */ - n = Py_MIN(size, 1024); - #else - n = Py_MIN(size, LONG_MAX); -@@ -161,34 +130,35 @@ py_getrandom(void *buffer, Py_ssize_t si - #ifdef HAVE_GETRANDOM - if (raise) { - Py_BEGIN_ALLOW_THREADS -- n = getrandom(buffer, n, flags); -+ n = getrandom(dest, n, flags); - Py_END_ALLOW_THREADS - } - else { -- n = getrandom(buffer, n, flags); -+ n = getrandom(dest, n, flags); - } - #else - /* On Linux, use the syscall() function because the GNU libc doesn't -- * expose the Linux getrandom() syscall yet. See: -- * https://sourceware.org/bugzilla/show_bug.cgi?id=17252 */ -+ expose the Linux getrandom() syscall yet. See: -+ https://sourceware.org/bugzilla/show_bug.cgi?id=17252 */ - if (raise) { - Py_BEGIN_ALLOW_THREADS -- n = syscall(SYS_getrandom, buffer, n, flags); -+ n = syscall(SYS_getrandom, dest, n, flags); - Py_END_ALLOW_THREADS - } - else { -- n = syscall(SYS_getrandom, buffer, n, flags); -+ n = syscall(SYS_getrandom, dest, n, flags); - } - #endif - - if (n < 0) { -- /* ENOSYS: getrandom() syscall not supported by the kernel (but -- * maybe supported by the host which built Python). EPERM: -- * getrandom() syscall blocked by SECCOMP or something else. */ -+ /* ENOSYS: the syscall is not supported by the kernel. -+ EPERM: the syscall is blocked by a security policy (ex: SECCOMP) -+ or something else. */ - if (errno == ENOSYS || errno == EPERM) { - getrandom_works = 0; - return 0; - } -+ - if (errno == EAGAIN) { - /* getrandom(GRND_NONBLOCK) fails with EAGAIN if the system - urandom is not initialiazed yet. In this case, fall back on -@@ -202,32 +172,101 @@ py_getrandom(void *buffer, Py_ssize_t si - } - - if (errno == EINTR) { -- if (PyErr_CheckSignals()) { -- if (!raise) { -- Py_FatalError("getrandom() interrupted by a signal"); -+ if (raise) { -+ if (PyErr_CheckSignals()) { -+ return -1; - } -- return -1; - } - -- /* retry getrandom() */ -+ /* retry getrandom() if it was interrupted by a signal */ - continue; - } - - if (raise) { - PyErr_SetFromErrno(PyExc_OSError); - } -- else { -- Py_FatalError("getrandom() failed"); -+ return -1; -+ } -+ -+ dest += n; -+ size -= n; -+ } -+ return 1; -+} -+ -+#elif defined(HAVE_GETENTROPY) -+#define PY_GETENTROPY 1 -+ -+/* Fill buffer with size pseudo-random bytes generated by getentropy(): -+ -+ - Return 1 on success -+ - Return 0 if getentropy() syscall is not available (failed with ENOSYS or -+ EPERM). -+ - Raise an exception (if raise is non-zero) and return -1 on error: -+ if getentropy() failed with EINTR, raise is non-zero and the Python signal -+ handler raised an exception, or if getentropy() failed with a different -+ error. -+ -+ getentropy() is retried if it failed with EINTR: interrupted by a signal. */ -+static int -+py_getentropy(char *buffer, Py_ssize_t size, int raise) -+{ -+ /* Is getentropy() supported by the running kernel? Set to 0 if -+ getentropy() failed with ENOSYS or EPERM. */ -+ static int getentropy_works = 1; -+ -+ if (!getentropy_works) { -+ return 0; -+ } -+ -+ while (size > 0) { -+ /* getentropy() is limited to returning up to 256 bytes. Call it -+ multiple times if more bytes are requested. */ -+ Py_ssize_t len = Py_MIN(size, 256); -+ int res; -+ -+ if (raise) { -+ Py_BEGIN_ALLOW_THREADS -+ res = getentropy(buffer, len); -+ Py_END_ALLOW_THREADS -+ } -+ else { -+ res = getentropy(buffer, len); -+ } -+ -+ if (res < 0) { -+ /* ENOSYS: the syscall is not supported by the running kernel. -+ EPERM: the syscall is blocked by a security policy (ex: SECCOMP) -+ or something else. */ -+ if (errno == ENOSYS || errno == EPERM) { -+ getentropy_works = 0; -+ return 0; -+ } -+ -+ if (errno == EINTR) { -+ if (raise) { -+ if (PyErr_CheckSignals()) { -+ return -1; -+ } -+ } -+ -+ /* retry getentropy() if it was interrupted by a signal */ -+ continue; -+ } -+ -+ if (raise) { -+ PyErr_SetFromErrno(PyExc_OSError); - } - return -1; - } - -- buffer += n; -- size -= n; -+ buffer += len; -+ size -= len; - } - return 1; - } --#endif -+#endif /* defined(HAVE_GETENTROPY) && !defined(sun) */ -+ - - static struct { - int fd; -@@ -235,136 +274,123 @@ static struct { - ino_t st_ino; - } urandom_cache = { -1 }; - -+/* Read random bytes from the /dev/urandom device: - --/* Read 'size' random bytes from py_getrandom(). Fall back on reading from -- /dev/urandom if getrandom() is not available. -+ - Return 0 on success -+ - Raise an exception (if raise is non-zero) and return -1 on error - -- Call Py_FatalError() on error. */ --static void --dev_urandom_noraise(unsigned char *buffer, Py_ssize_t size) -+ Possible causes of errors: -+ -+ - open() failed with ENOENT, ENXIO, ENODEV, EACCES: the /dev/urandom device -+ was not found. For example, it was removed manually or not exposed in a -+ chroot or container. -+ - open() failed with a different error -+ - fstat() failed -+ - read() failed or returned 0 -+ -+ read() is retried if it failed with EINTR: interrupted by a signal. -+ -+ The file descriptor of the device is kept open between calls to avoid using -+ many file descriptors when run in parallel from multiple threads: -+ see the issue #18756. -+ -+ st_dev and st_ino fields of the file descriptor (from fstat()) are cached to -+ check if the file descriptor was replaced by a different file (which is -+ likely a bug in the application): see the issue #21207. -+ -+ If the file descriptor was closed or replaced, open a new file descriptor -+ but don't close the old file descriptor: it probably points to something -+ important for some third-party code. */ -+static int -+dev_urandom(char *buffer, Py_ssize_t size, int raise) - { - int fd; - Py_ssize_t n; - -- assert (0 < size); -+ if (raise) { -+ struct _Py_stat_struct st; - --#ifdef PY_GETRANDOM -- if (py_getrandom(buffer, size, 0) == 1) { -- return; -+ if (urandom_cache.fd >= 0) { -+ /* Does the fd point to the same thing as before? (issue #21207) */ -+ if (_Py_fstat_noraise(urandom_cache.fd, &st) -+ || st.st_dev != urandom_cache.st_dev -+ || st.st_ino != urandom_cache.st_ino) { -+ /* Something changed: forget the cached fd (but don't close it, -+ since it probably points to something important for some -+ third-party code). */ -+ urandom_cache.fd = -1; -+ } -+ } -+ if (urandom_cache.fd >= 0) -+ fd = urandom_cache.fd; -+ else { -+ fd = _Py_open("/dev/urandom", O_RDONLY); -+ if (fd < 0) { -+ if (errno == ENOENT || errno == ENXIO || -+ errno == ENODEV || errno == EACCES) { -+ PyErr_SetString(PyExc_NotImplementedError, -+ "/dev/urandom (or equivalent) not found"); -+ } -+ /* otherwise, keep the OSError exception raised by _Py_open() */ -+ return -1; -+ } -+ if (urandom_cache.fd >= 0) { -+ /* urandom_fd was initialized by another thread while we were -+ not holding the GIL, keep it. */ -+ close(fd); -+ fd = urandom_cache.fd; -+ } -+ else { -+ if (_Py_fstat(fd, &st)) { -+ close(fd); -+ return -1; -+ } -+ else { -+ urandom_cache.fd = fd; -+ urandom_cache.st_dev = st.st_dev; -+ urandom_cache.st_ino = st.st_ino; -+ } -+ } -+ } -+ -+ do { -+ n = _Py_read(fd, buffer, (size_t)size); -+ if (n == -1) -+ return -1; -+ if (n == 0) { -+ PyErr_Format(PyExc_RuntimeError, -+ "Failed to read %zi bytes from /dev/urandom", -+ size); -+ return -1; -+ } -+ -+ buffer += n; -+ size -= n; -+ } while (0 < size); - } -- /* getrandom() failed with ENOSYS or EPERM, -- fall back on reading /dev/urandom */ --#endif -- -- fd = _Py_open_noraise("/dev/urandom", O_RDONLY); -- if (fd < 0) { -- Py_FatalError("Failed to open /dev/urandom"); -- } -- -- while (0 < size) -- { -- do { -- n = read(fd, buffer, (size_t)size); -- } while (n < 0 && errno == EINTR); -- -- if (n <= 0) { -- /* read() failed or returned 0 bytes */ -- Py_FatalError("Failed to read bytes from /dev/urandom"); -- break; -- } -- buffer += n; -- size -= n; -- } -- close(fd); --} -- --/* Read 'size' random bytes from py_getrandom(). Fall back on reading from -- /dev/urandom if getrandom() is not available. -- -- Return 0 on success. Raise an exception and return -1 on error. */ --static int --dev_urandom_python(char *buffer, Py_ssize_t size) --{ -- int fd; -- Py_ssize_t n; -- struct _Py_stat_struct st; --#ifdef PY_GETRANDOM -- int res; --#endif -- -- if (size <= 0) -- return 0; -- --#ifdef PY_GETRANDOM -- res = py_getrandom(buffer, size, 1); -- if (res < 0) { -- return -1; -- } -- if (res == 1) { -- return 0; -- } -- /* getrandom() failed with ENOSYS or EPERM, -- fall back on reading /dev/urandom */ --#endif -- -- if (urandom_cache.fd >= 0) { -- /* Does the fd point to the same thing as before? (issue #21207) */ -- if (_Py_fstat_noraise(urandom_cache.fd, &st) -- || st.st_dev != urandom_cache.st_dev -- || st.st_ino != urandom_cache.st_ino) { -- /* Something changed: forget the cached fd (but don't close it, -- since it probably points to something important for some -- third-party code). */ -- urandom_cache.fd = -1; -- } -- } -- if (urandom_cache.fd >= 0) -- fd = urandom_cache.fd; - else { -- fd = _Py_open("/dev/urandom", O_RDONLY); -+ fd = _Py_open_noraise("/dev/urandom", O_RDONLY); - if (fd < 0) { -- if (errno == ENOENT || errno == ENXIO || -- errno == ENODEV || errno == EACCES) -- PyErr_SetString(PyExc_NotImplementedError, -- "/dev/urandom (or equivalent) not found"); -- /* otherwise, keep the OSError exception raised by _Py_open() */ - return -1; - } -- if (urandom_cache.fd >= 0) { -- /* urandom_fd was initialized by another thread while we were -- not holding the GIL, keep it. */ -- close(fd); -- fd = urandom_cache.fd; -- } -- else { -- if (_Py_fstat(fd, &st)) { -+ -+ while (0 < size) -+ { -+ do { -+ n = read(fd, buffer, (size_t)size); -+ } while (n < 0 && errno == EINTR); -+ -+ if (n <= 0) { -+ /* stop on error or if read(size) returned 0 */ - close(fd); - return -1; - } -- else { -- urandom_cache.fd = fd; -- urandom_cache.st_dev = st.st_dev; -- urandom_cache.st_ino = st.st_ino; -- } -+ -+ buffer += n; -+ size -= n; - } -+ close(fd); - } -- -- do { -- n = _Py_read(fd, buffer, (size_t)size); -- if (n == -1) { -- return -1; -- } -- if (n == 0) { -- PyErr_Format(PyExc_RuntimeError, -- "Failed to read %zi bytes from /dev/urandom", -- size); -- return -1; -- } -- -- buffer += n; -- size -= n; -- } while (0 < size); -- - return 0; - } - -@@ -376,8 +402,8 @@ dev_urandom_close(void) - urandom_cache.fd = -1; - } - } -+#endif /* !MS_WINDOWS */ - --#endif - - /* Fill buffer with pseudo-random bytes generated by a linear congruent - generator (LCG): -@@ -400,29 +426,98 @@ lcg_urandom(unsigned int x0, unsigned ch - } - } - -+/* Read random bytes: -+ -+ - Return 0 on success -+ - Raise an exception (if raise is non-zero) and return -1 on error -+ -+ Used sources of entropy ordered by preference, preferred source first: -+ -+ - CryptGenRandom() on Windows -+ - getrandom() function (ex: Linux and Solaris): call py_getrandom() -+ - getentropy() function (ex: OpenBSD): call py_getentropy() -+ - /dev/urandom device -+ -+ Read from the /dev/urandom device if getrandom() or getentropy() function -+ is not available or does not work. -+ -+ Prefer getrandom() over getentropy() because getrandom() supports blocking -+ and non-blocking mode and Python requires non-blocking RNG at startup to -+ initialize its hash secret: see the PEP 524. -+ -+ Prefer getrandom() and getentropy() over reading directly /dev/urandom -+ because these functions don't need file descriptors and so avoid ENFILE or -+ EMFILE errors (too many open files): see the issue #18756. -+ -+ Only use RNG running in the kernel. They are more secure because it is -+ harder to get the internal state of a RNG running in the kernel land than a -+ RNG running in the user land. The kernel has a direct access to the hardware -+ and has access to hardware RNG, they are used as entropy sources. -+ -+ Note: the OpenSSL RAND_pseudo_bytes() function does not automatically reseed -+ its RNG on fork(), two child processes (with the same pid) generate the same -+ random numbers: see issue #18747. Kernel RNGs don't have this issue, -+ they have access to good quality entropy sources. -+ -+ If raise is zero: -+ -+ - Don't raise an exception on error -+ - Don't call the Python signal handler (don't call PyErr_CheckSignals()) if -+ a function fails with EINTR: retry directly the interrupted function -+ - Don't release the GIL to call functions. -+*/ -+static int -+pyurandom(void *buffer, Py_ssize_t size, int raise) -+{ -+#if defined(PY_GETRANDOM) || defined(PY_GETENTROPY) -+ int res; -+#endif -+ -+ if (size < 0) { -+ if (raise) { -+ PyErr_Format(PyExc_ValueError, -+ "negative argument not allowed"); -+ } -+ return -1; -+ } -+ -+ if (size == 0) { -+ return 0; -+ } -+ -+#ifdef MS_WINDOWS -+ return win32_urandom((unsigned char *)buffer, size, raise); -+#else -+ -+#if defined(PY_GETRANDOM) || defined(PY_GETENTROPY) -+#ifdef PY_GETRANDOM -+ res = py_getrandom(buffer, size, raise); -+#else -+ res = py_getentropy(buffer, size, raise); -+#endif -+ if (res < 0) { -+ return -1; -+ } -+ if (res == 1) { -+ return 0; -+ } -+ /* getrandom() or getentropy() function is not available: failed with -+ ENOSYS, EPERM or EAGAIN. Fall back on reading from /dev/urandom. */ -+#endif -+ -+ return dev_urandom(buffer, size, raise); -+#endif -+} -+ - /* Fill buffer with size pseudo-random bytes from the operating system random - number generator (RNG). It is suitable for most cryptographic purposes - except long living private keys for asymmetric encryption. - -- Return 0 on success, raise an exception and return -1 on error. */ -+ Return 0 on success. Raise an exception and return -1 on error. */ - int - _PyOS_URandom(void *buffer, Py_ssize_t size) - { -- if (size < 0) { -- PyErr_Format(PyExc_ValueError, -- "negative argument not allowed"); -- return -1; -- } -- if (size == 0) -- return 0; -- --#ifdef MS_WINDOWS -- return win32_urandom((unsigned char *)buffer, size, 1); --#elif defined(PY_GETENTROPY) -- return py_getentropy(buffer, size, 0); --#else -- return dev_urandom_python((char*)buffer, size); --#endif -+ return pyurandom(buffer, size, 1); - } - - void -@@ -463,13 +558,14 @@ void - } - } - else { --#ifdef MS_WINDOWS -- (void)win32_urandom(secret, secret_size, 0); --#elif defined(PY_GETENTROPY) -- (void)py_getentropy(secret, secret_size, 1); --#else -- dev_urandom_noraise(secret, secret_size); --#endif -+ int res; -+ -+ /* _PyRandom_Init() is called very early in the Python initialization -+ and so exceptions cannot be used (use raise=0). */ -+ res = pyurandom(secret, secret_size, 0); -+ if (res < 0) { -+ Py_FatalError("failed to get random numbers to initialize Python"); -+ } - } - } - -@@ -481,8 +577,6 @@ void - CryptReleaseContext(hCryptProv, 0); - hCryptProv = 0; - } --#elif defined(PY_GETENTROPY) -- /* nothing to clean */ - #else - dev_urandom_close(); - #endif - diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a088fefb8..a047b617c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -201,6 +201,7 @@ '("Lib/subprocess.py" "Lib/popen2.py" "Lib/distutils/tests/test_spawn.py" + "Lib/test/support/__init__.py" "Lib/test/test_subprocess.py")) (("/bin/sh") (which "sh"))) @@ -326,23 +327,22 @@ data types.") ;; Current 2.x version. (define-public python-2 python-2.7) -(define-public python-3.5 +(define-public python-3.6 (package (inherit python-2) - (version "3.5.3") + (version "3.6.2") (source (origin (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" version "/Python-" version ".tar.xz")) (patches (search-patches "python-fix-tests.patch" - "python-3.5-fix-tests.patch" - "python-3.5-getentropy-on-old-kernels.patch" + "python-3-fix-tests.patch" "python-3-deterministic-build-info.patch" "python-3-search-paths.patch")) (patch-flags '("-p0")) (sha256 (base32 - "1c6v1n9nz4mlx9mw1125fxpmbrgniqdbbx9hnqx44maqazb2mzpf")) + "1ab4vlpdax1ihpiyiwchlgsk36apl4kgdw271wvl9l8ywhxpfacj")) (snippet '(begin (for-each delete-file @@ -359,7 +359,7 @@ data types.") "/site-packages")))))))) ;; Current 3.x version. -(define-public python-3 python-3.5) +(define-public python-3 python-3.6) ;; Current major version. (define-public python python-3) -- 2.13.3 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 16:07:56 2017 Received: (at 27888) by debbugs.gnu.org; 31 Jul 2017 20:07:56 +0000 Received: from localhost ([127.0.0.1]:35700 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyq-0004mM-Fj for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:07:56 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:33581) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyc-0004l4-T1 for 27888@debbugs.gnu.org; Mon, 31 Jul 2017 16:07:43 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id D48E920AAD; Mon, 31 Jul 2017 16:07:42 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 31 Jul 2017 16:07:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=/yw5mB hOp2ABKyvVGS52CjOXwI6tkg/XXrNJriK1TZI=; b=EAfU4YP5BqhXh9SfIZiQ2j n4mFK20pMeqYzGKaLLfTXCdNHSukoV13OQqbz4G1o5Il8m2rtiLbH++avkNYc55I YDGL9w0pD+jwIQUZERkcO93XCwkX98g/K5wUeSP6hyFCm9OsRBmMWGC2Qj7JUURo XcIgPQ0ZqaUt5Ha4heUf09+3F9L+jmXjWhVg+GZcR7g92xzjuI6gD4XQRbEv0yyS 2PnYCLZlWwS4PeOUzfEtZDS/g9f6ey7xxRPJMbUBDDf9XMKtVOdjBUOI9HXrmKXx Bg0cN/sU1gWG8XrJpxt0mIArB9ObFR4Jd7yVWh6l/FTsu0gPM/rwoFtNoza98bSQ == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=/yw5mBhOp2ABKyvVGS52CjOXwI6tkg/XXrNJriK1T ZI=; b=MYvD4fGlVxQ7I/POy+SZ1TOFoVexEKzFZsomU2BJiqmJKqPnZ4Tw7AlTV 5ZHTjsvOmK6XfqrGS3DEmvYh9WenlUsDC2u9BQcXma5rzUrX71SxHOVNBhy3bTVx n7LpPq9TNJxFqbXhZ4m7okJHp2ePuoZ65vlwaKXPt2I2V5X2e9iO2pyO584gUPH8 VocqZyaU7AkRQrBy+TonOnmfCt/gbvG91uRaqnq+ykUGudxqK4nDN//d6rfjFWna KepubzbHY02kFGKRSLlUjD4m5jgi9dq+2HC4HBn+M3WmKdoY15qI4dnbUusPRh2g lZs9DwKCzZi6vBJPgJmNLtLE+g2Pg== X-ME-Sender: X-Sasl-enc: oPLvFvisTK0+qMUWj6sNRZ3iCZbUQ2g1pbeBEoFb64w2 1501531662 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 6A4CA7E1D9; Mon, 31 Jul 2017 16:07:42 -0400 (EDT) From: Marius Bakke To: 27888@debbugs.gnu.org Subject: [PATCH 03/18] gnu: python-six: Really enable tests. Date: Mon, 31 Jul 2017 22:07:20 +0200 Message-Id: <20170731200735.28019-3-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170731200735.28019-1-mbakke@fastmail.com> References: <20170731200735.28019-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/python.scm (python-six)[arguments]: Override 'check' phase. --- gnu/packages/python.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 42f5d0472..dd61389b8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1179,6 +1179,12 @@ password storage.") (base32 "0snmb8xffb3vsma0z67i0h0w2g2dy0p3gsgh9gi4i0kgc5l8spqh")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (zero? (system* "py.test" "-v"))))))) (native-inputs `(("python-py" ,python-py) ("python-pytest" ,python-pytest))) -- 2.13.3 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 16:08:00 2017 Received: (at 27888) by debbugs.gnu.org; 31 Jul 2017 20:08:00 +0000 Received: from localhost ([127.0.0.1]:35702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyq-0004ma-Q7 for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:08:00 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:56797) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGye-0004lQ-JO for 27888@debbugs.gnu.org; Mon, 31 Jul 2017 16:07:46 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 8A09A20BCC; Mon, 31 Jul 2017 16:07:44 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 31 Jul 2017 16:07:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=mZyU8L z/jN9XrTDstedpYPUMNzt88/AYQ5o3W3Yb4/A=; b=Rlr3KR4mcR78LBSlYg9OXT n1P9sqV5R7qvDa68wyjo6A7a5EYjssZ+v4iRGwe+9O0H7zHYVh564+eQ33Y3OCgX tpm3rXImITERpfw42vTns+aJnwxcUloL794IT+FqymmuI3T8LcEahZN13+kjn9mX vy7oefiWyFyWTwGe9p7bnMUcqjl1+4VgGnoGfxh2B4DMs34575wRbU4dQE71X3vH Ykhd6DxA8unZj6dQ3X05dynCJ3RxSPAHthttx3Dul8IERu4p7cDXKBM+p8aRA/Cx gpF1Tcb4RJSILZcM9QdRDTTKHeLffwJqBx4fomezjoThFlW8u3h0YO98wkrZFI7g == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=mZyU8Lz/jN9XrTDstedpYPUMNzt88/AYQ5o3W3Yb4 /A=; b=h1SWSf257FNh82fD60eFvs288lm0BqnDaKNQzOneDdvK8weQZsN9R/79E TL2os7/PM/r2FG4N9SWRUoR+M0fiiC/XlbD5OYcAXvcSAypzAbQWSr8H+ptSG7XN Cp4i/va3ZH5cFcAvdv25YoTKWHh+wPzSijwqVFHsftMMxe58Ru7ur231dL0LJJrv WmNlav84as8yB8yp/GHEvsfawAJ34H/KhtnFL/J6nyb0htk1Lun5imX+ruUAaMIO ZpgSL9uF86QgSERqjcsgon6Kp+p/EFb3lBRdd9HFX+ulwdhKm58MWVJrK+9n5rxF 20AUtL1OzeKqZglhCvmU24tc8oTog== X-ME-Sender: X-Sasl-enc: CmhqI4Z+cdifbbfOWtX4FLOBZPCiYFME/wKbJjX7fwfK 1501531664 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 169D77E1D9; Mon, 31 Jul 2017 16:07:43 -0400 (EDT) From: Marius Bakke To: 27888@debbugs.gnu.org Subject: [PATCH 04/18] gnu: Remove python-pytest@2. Date: Mon, 31 Jul 2017 22:07:21 +0200 Message-Id: <20170731200735.28019-4-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170731200735.28019-1-mbakke@fastmail.com> References: <20170731200735.28019-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/python.scm (python-pytest): Update to 3.0.7. [source]: Move substitution to ... [arguments]: ... here. Incorporate phase from pytest-3.0. [native-inputs]: Add PYTHON-HYPOTHESIS. (python-pytest-3.0): Remove variable. (python2-pytest-3.0): Rename to ... (python2-pytest): ... this. [native-inputs]: Add PYTHON2-ENUM34. * gnu/packages/backup.scm (borg)[native-inputs]: Replace PYTHON-PYTEST-3.0 with PYTHON-PYTEST. * gnu/packages/calendar.scm (khal): Likewise. * gnu/packages/python.scm (python-sphinx-1.6, python-sphinx-1.5.3, python-pexpect, python-cryptography, python-pyopenssl, python-pytest-warnings, python-pytest-capturelog, python-pytest-catchlog, python-marshmallow, python-apispec, python-flasgger): Likewise. * gnu/packages/web.scm (python-internetarchive): Likewise. --- gnu/packages/backup.scm | 4 +-- gnu/packages/calendar.scm | 3 +- gnu/packages/python.scm | 86 ++++++++++++++++++----------------------------- gnu/packages/web.scm | 2 +- 4 files changed, 35 insertions(+), 60 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 20b375abe..974cc8fe6 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -534,9 +534,7 @@ detection, and lossless compression.") (native-inputs `(("python-cython" ,python-cython) ("python-setuptools-scm" ,python-setuptools-scm) - ;; Borg 1.0.8's test suite uses 'tmpdir_factory', which was introduced in - ;; pytest 2.8. - ("python-pytest" ,python-pytest-3.0) + ("python-pytest" ,python-pytest) ;; For generating the documentation. ("python-sphinx" ,python-sphinx) ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme))) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index b022c0efa..bd2381aed 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -113,8 +113,7 @@ data units.") "/share/zoneinfo/Zulu")) (zero? (system* "py.test" "tests"))))))) (native-inputs - ;; XXX Uses tmpdir_factory, introduced in pytest 2.8. - `(("python-pytest" ,python-pytest-3.0) + `(("python-pytest" ,python-pytest) ("python-pytest-cov" ,python-pytest-cov) ("python-setuptools-scm" ,python-setuptools-scm) ;; Required for tests diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index dd61389b8..18067d388 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1889,28 +1889,36 @@ code introspection, and logging.") (define-public python-pytest (package (name "python-pytest") - (version "2.7.3") + (version "3.0.7") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/p/pytest/pytest-" - version ".tar.gz")) + (uri (pypi-uri "pytest" version)) (sha256 (base32 - "1z4yi986f9n0p8qmzmn21m21m8j1x78hk3505f89baqm6pdw7afm")) - (modules '((guix build utils))) - (snippet - ;; One of the tests involves the /usr directory, so it fails. - '(substitute* "testing/test_argcomplete.py" - (("def test_remove_dir_prefix\\(self\\):") - "@pytest.mark.xfail\n def test_remove_dir_prefix(self):"))))) + "1asc4b2nd2a4f0g3r12y97rslq5wliji7b73wwkvdrm5s7mrc1mp")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'disable-invalid-tests + (lambda _ + ;; Some tests involves the /usr directory, and fails. + (substitute* "testing/test_argcomplete.py" + (("def test_remove_dir_prefix\\(self\\):") + "@pytest.mark.xfail\n def test_remove_dir_prefix(self):")) + (substitute* "testing/test_argcomplete.py" + (("def test_remove_dir_prefix" line) + (string-append "@pytest.mark.skip" + "(reason=\"Assumes that /usr exists.\")\n " + line))) + #t))))) (propagated-inputs `(("python-py" ,python-py))) (native-inputs `(;; Tests need the "regular" bash since 'bash-final' lacks `compgen`. ("bash" ,bash) + ("python-hypothesis" ,python-hypothesis) ("python-nose" ,python-nose) ("python-mock" ,python-mock))) (home-page "http://pytest.org") @@ -1919,42 +1927,12 @@ code introspection, and logging.") "Pytest is a testing tool that provides auto-discovery of test modules and functions, detailed info on failing assert statements, modular fixtures, and many external plugins.") + (properties `((python2-variant . ,(delay python2-pytest)))) (license license:expat))) (define-public python2-pytest - (package-with-python2 python-pytest)) - -;; Some packages require a newer pytest. -(define-public python-pytest-3.0 - (package - (inherit python-pytest) - (name "python-pytest") - (version "3.0.7") - (source (origin - (method url-fetch) - (uri (pypi-uri "pytest" version)) - (sha256 - (base32 - "1asc4b2nd2a4f0g3r12y97rslq5wliji7b73wwkvdrm5s7mrc1mp")))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'disable-invalid-test - (lambda _ - (substitute* "testing/test_argcomplete.py" - (("def test_remove_dir_prefix" line) - (string-append "@pytest.mark.skip" - "(reason=\"Assumes that /usr exists.\")\n " - line))) - #t))))) - (native-inputs - `(("python-hypothesis" ,python-hypothesis) - ,@(package-native-inputs python-pytest))) - (properties `((python2-variant . ,(delay python2-pytest-3.0)))))) - -(define-public python2-pytest-3.0 (let ((base (package-with-python2 - (strip-python2-variant python-pytest-3.0)))) + (strip-python2-variant python-pytest)))) (package (inherit base) (native-inputs `(("python2-enum34" ,python2-enum34) @@ -3296,7 +3274,7 @@ sources.") `(("python-sphinxcontrib-websupport" ,python-sphinxcontrib-websupport) ,@(package-propagated-inputs python-sphinx))) (native-inputs - `(("python-pytest" ,python-pytest-3.0) + `(("python-pytest" ,python-pytest) ("imagemagick" ,imagemagick) ; for "convert" ,@(package-native-inputs python-sphinx))) (properties '()))) @@ -3314,7 +3292,7 @@ sources.") (base32 "0kw1axswbvaavr8ggyf4qr6hnisnrzlbkkcdada69vk1x9xjassg")))) (native-inputs - `(("python-pytest" ,python-pytest-3.0) + `(("python-pytest" ,python-pytest) ,@(package-native-inputs python-sphinx))))) (define-public python2-sphinx @@ -5241,7 +5219,7 @@ cluster without needing to write any wrapper code yourself.") (replace 'check (lambda _ (zero? (system* "nosetests" "-v"))))))) (native-inputs `(("python-nose" ,python-nose) - ("python-pytest" ,python-pytest-3.0) + ("python-pytest" ,python-pytest) ("man-db" ,man-db) ("which" ,which) ("bash-full" ,bash))) ;full Bash for 'test_replwrap.py' @@ -7691,7 +7669,7 @@ responses, rather than doing any computation.") ("python-hypothesis" ,python-hypothesis) ("python-pretend" ,python-pretend) ("python-pytz" ,python-pytz) - ("python-pytest" ,python-pytest-3.0))) + ("python-pytest" ,python-pytest))) (home-page "https://github.com/pyca/cryptography") (synopsis "Cryptographic recipes and primitives for Python") (description @@ -7751,7 +7729,7 @@ message digests and key derivation functions.") (native-inputs `(("python-flaky" ,python-flaky) ("python-pretend" ,python-pretend) - ("python-pytest" ,python-pytest-3.0))) + ("python-pytest" ,python-pytest))) (home-page "https://github.com/pyca/pyopenssl") (synopsis "Python wrapper module around the OpenSSL library") (description @@ -14493,7 +14471,7 @@ for Flask.") "0gf2dpahpl5igb7jh1sr9acj3z3gp7zahqdqb69nk6wx01c8kc1g")))) (build-system python-build-system) (propagated-inputs - `(("pytest" ,python-pytest-3.0))) + `(("pytest" ,python-pytest))) (home-page "https://github.com/fschulze/pytest-warnings") (synopsis "Pytest plugin to list Python warnings in pytest report") (description @@ -14517,7 +14495,7 @@ pytest report.") "038049nyjl7di59ycnxvc9nydivc5m8np3hqq84j2iirkccdbs5n")))) (build-system python-build-system) (propagated-inputs - `(("pytest" ,python-pytest-3.0))) + `(("pytest" ,python-pytest))) (home-page "http://bitbucket.org/memedough/pytest-capturelog/overview") (synopsis "Pytest plugin to catch log messages") (description @@ -14542,7 +14520,7 @@ pytest report.") (native-inputs `(("unzip" ,unzip))) (propagated-inputs - `(("pytest" ,python-pytest-3.0))) + `(("pytest" ,python-pytest))) (home-page "https://github.com/eisensheng/pytest-catchlog") (synopsis "Pytest plugin to catch log messages") (description @@ -15533,7 +15511,7 @@ address is valid and really exists.") `(("python-dateutil" ,python-dateutil) ("python-simplejson" ,python-simplejson))) (native-inputs - `(("python-pytest-3.0" ,python-pytest-3.0) + `(("python-pytest" ,python-pytest) ("python-pytz" ,python-pytz))) (home-page "https://github.com/marshmallow-code/marshmallow") (synopsis "Convert complex datatypes to and from native @@ -15580,7 +15558,7 @@ complex datatypes to and from native Python datatypes.") (propagated-inputs `(("python-pyyaml" ,python-pyyaml))) (native-inputs - `(("python-pytest-3.0" ,python-pytest-3.0) + `(("python-pytest" ,python-pytest) ("python-flask" ,python-flask) ("python-marshmallow" ,python-marshmallow) ("python-tornado" ,python-tornado) @@ -15633,7 +15611,7 @@ Swagger 2.0).") ("python-flake8" ,python-flake8) ("python-flask-restful" ,python-flask-restful) ("python-flex" ,python-flex) - ("python-pytest-3.0" ,python-pytest-3.0) + ("python-pytest" ,python-pytest) ("python-pytest-cov" ,python-pytest-cov) ("python-marshmallow" ,python-marshmallow) ("python-apispec" ,python-apispec))) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 9c3373f8d..f691705d5 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4763,7 +4763,7 @@ command-line arguments or read from stdin.") ("python-schema" ,python-schema-0.5) ("python-backports-csv" ,python-backports-csv))) (native-inputs - `(("python-pytest-3.0" ,python-pytest-3.0) + `(("python-pytest" ,python-pytest) ("python-pytest-capturelog" ,python-pytest-capturelog) ("python-responses" ,python-responses))) (home-page "https://github.com/jjjake/internetarchive") -- 2.13.3 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 16:08:00 2017 Received: (at 27888) by debbugs.gnu.org; 31 Jul 2017 20:08:00 +0000 Received: from localhost ([127.0.0.1]:35710 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyu-0004my-9L for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:08:00 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:33819) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyg-0004lW-8n for 27888@debbugs.gnu.org; Mon, 31 Jul 2017 16:07:46 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 3CCC72098E; Mon, 31 Jul 2017 16:07:46 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 31 Jul 2017 16:07:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=nvM9goocDmxcylJsgg x+/KbbMyYAEUnO8yM5+7al4cE=; b=Mk5lqYzSp8Ivmyfby5a/KzfS/Vai0LU9S7 mubU34Hntwn/TOAdWsnqnMH2HApztnnERKfvx/QXkvU8IqMZxv6ln7cCNljCTiuj 3d2yYOuQ210LwjGvarq7mU+Ny5xtroTaOnO5uF5s2Fs96dK860+wT58UsdB+nQ+W 5XlgLvRc5e1qBxAvfIw4rorRRPc3WoDVaJ3v+1phwU8fxet08gQoISLTigqpe/Zx uO8YVwpymKVNUPn1eR2leYbXoQraxlU45vFlPZDwssLI6c18pl9wAFeBsQi+V58C PSuWAw8Mst25xFZ5iIWQ40usdkvfd3PGfkZy5lvS5Ibw71Ev4vQw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s= fm1; bh=nvM9goocDmxcylJsggx+/KbbMyYAEUnO8yM5+7al4cE=; b=NPwBrI2o Y4VsOr+NTiEOoXncGudmUw2bluTX09nDabqWY22yCTxtkW1aTgANDCFQtS1xntD7 YfCgEMmbhzo2xtVkq4wpw1q4rRRGL9O5g+d/uN9GerR8rMN4F72aSQIgGl2rSWNJ wb8y8AZ0OAVHNJy+gqcPUrTV3LAitSq1hI2mohjFy9mT1J/ut8nQObQTAWncrJT4 6vC8/IXqgY+C6l4N4XHkGfIP3DFpnGTudsGvYz94RKSXzSs8fkjFDzfyz7fIZLTf nLCbF8m7avl/22iOrv2a0Lgpk6YPnVdQjjIcxyF3EbRXsoBHFUb9Da5LBirqm4Db ajtVItP3OMlqKQ== X-ME-Sender: X-Sasl-enc: /NNN88hSSYb4iTdIJDogXrsb3ML8fmFLK0du3x2sfp5X 1501531665 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id C5D8C7E1D9; Mon, 31 Jul 2017 16:07:45 -0400 (EDT) From: Marius Bakke To: 27888@debbugs.gnu.org Subject: [PATCH 05/18] gnu: python-pytest: Add a minimal variant for bootstrapping. Date: Mon, 31 Jul 2017 22:07:22 +0200 Message-Id: <20170731200735.28019-5-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170731200735.28019-1-mbakke@fastmail.com> References: <20170731200735.28019-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/python.scm (python-pytest-bootstrap, python2-pytest-bootstrap): New variables. (python-pytest, python2-pytest): Inherit from bootstrap variants. (python-six, python-hypothesis, python-pytest-runner, python-mccabe)[native-inputs]: Use PYTHON-PYTEST-BOOTSTRAP instead of PYTHON-PYTEST. --- gnu/packages/python.scm | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 18067d388..2fe74a4e4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1187,7 +1187,7 @@ password storage.") (zero? (system* "py.test" "-v"))))))) (native-inputs `(("python-py" ,python-py) - ("python-pytest" ,python-pytest))) + ("python-pytest" ,python-pytest-bootstrap))) (home-page "http://pypi.python.org/pypi/six/") (synopsis "Python 2 and 3 compatibility utilities") (description @@ -1886,9 +1886,9 @@ code introspection, and logging.") (define-public python2-py (package-with-python2 python-py)) -(define-public python-pytest +(define python-pytest-bootstrap (package - (name "python-pytest") + (name "python-pytest-bootstrap") (version "3.0.7") (source (origin @@ -1899,6 +1899,25 @@ code introspection, and logging.") "1asc4b2nd2a4f0g3r12y97rslq5wliji7b73wwkvdrm5s7mrc1mp")))) (build-system python-build-system) (arguments + `(#:tests? #f)) + (propagated-inputs + `(("python-py" ,python-py))) + (home-page "http://pytest.org") + (synopsis "Python testing library") + (description + "Pytest is a testing tool that provides auto-discovery of test modules +and functions, detailed info on failing assert statements, modular fixtures, +and many external plugins.") + (license license:expat))) + +(define-public python2-pytest-bootstrap + (package-with-python2 python-pytest-bootstrap)) + +(define-public python-pytest + (package + (inherit python-pytest-bootstrap) + (name "python-pytest") + (arguments `(#:phases (modify-phases %standard-phases (add-before 'check 'disable-invalid-tests @@ -1913,22 +1932,13 @@ code introspection, and logging.") "(reason=\"Assumes that /usr exists.\")\n " line))) #t))))) - (propagated-inputs - `(("python-py" ,python-py))) (native-inputs `(;; Tests need the "regular" bash since 'bash-final' lacks `compgen`. ("bash" ,bash) ("python-hypothesis" ,python-hypothesis) ("python-nose" ,python-nose) ("python-mock" ,python-mock))) - (home-page "http://pytest.org") - (synopsis "Python testing library") - (description - "Pytest is a testing tool that provides auto-discovery of test modules -and functions, detailed info on failing assert statements, modular fixtures, -and many external plugins.") - (properties `((python2-variant . ,(delay python2-pytest)))) - (license license:expat))) + (properties `((python2-variant . ,(delay python2-pytest-bootstrap)))))) (define-public python2-pytest (let ((base (package-with-python2 @@ -1998,7 +2008,7 @@ supports coverage of subprocesses.") (string-append "version = \"" ,version "\""))) #t))))) (native-inputs - `(("python-pytest" ,python-pytest) + `(("python-pytest" ,python-pytest-bootstrap) ("python-setuptools-scm" ,python-setuptools-scm))) (home-page "https://github.com/pytest-dev/pytest-runner") (synopsis "Invoke py.test as a distutils command") @@ -6722,7 +6732,7 @@ PEP 8.") "0yr08a36h8lqlif10l4xcikbbig7q8f41gqywir7rrvnv3mi4aws")))) (build-system python-build-system) (native-inputs - `(("python-pytest" ,python-pytest) + `(("python-pytest" ,python-pytest-bootstrap) ("python-pytest-runner" ,python-pytest-runner))) (home-page "https://github.com/flintwork/mccabe") (synopsis "McCabe checker, plugin for flake8") @@ -9774,7 +9784,7 @@ Amazon Web Services (AWS) API.") (build-system python-build-system) (native-inputs `(("python-flake8" ,python-flake8) - ("python-pytest" ,python-pytest))) + ("python-pytest" ,python-pytest-bootstrap))) (synopsis "Library for property based testing") (description "Hypothesis is a library for testing your Python code against a much larger range of examples than you would ever want to write by hand. It’s -- 2.13.3 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 16:08:00 2017 Received: (at 27888) by debbugs.gnu.org; 31 Jul 2017 20:08:01 +0000 Received: from localhost ([127.0.0.1]:35712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyu-0004n9-LT for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:08:00 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:37437) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyh-0004li-Ts for 27888@debbugs.gnu.org; Mon, 31 Jul 2017 16:07:48 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id CAC9320BD6; Mon, 31 Jul 2017 16:07:47 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 31 Jul 2017 16:07:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=VKcSD7 5dJvl3cbqdoz5CUr5OAGb8cIdAUYnErz+g6dw=; b=NWaDzDgJoLdec/bfMRz8iw ZJnJurgcJA8/YF/eJOFpYcGefCz3ZT1MJ0L3nTXDKN1J9payZNFR4onmj8xd9TxE U6BSumWJdTRDv644Pad05bnBHaPTNnwZPOC4P0MbRe/aX5HvH7DS3v+PiObE/Hq2 w9cotLXT3HlftK+3/72XXKksxcDSjGPMgp4wbr73U3kXjx8zE88BN7zNXttsps86 Zxw8MV1f1EzRl4f/Msk6t8lja+z+NVuXJl3L4x9u8EP7EZKH9XJMi2YIpPyc8Jez LFpCuPNjvxpkHuBr54i5h2LKRlSDdnTiM6J5aCoKvjz7S7Z4mFsBnNFqD6oDc8Hg == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=VKcSD75dJvl3cbqdoz5CUr5OAGb8cIdAUYnErz+g6 dw=; b=qMRGJIsbojqmTRBZsqVCvlQUeTV1QrNa3sQBgSL3AfLfnI+z0TdlBfn/Y 6d/BbyYZb9fD2+3J/UFyFQYNtOTwnTiNzCWMWi5WRUId4ccB7UfUK9BX6qyraT7/ WjFwUmkqVbpWv4MzMoRp6n3PdzTTfb2B6lZkXsXY4kAOQS4afghZ1lUQo6P5yKax RzSfJJrqHQMLNHsdLB2aZnpB6i4DXbuTgXFLMJHVoSpmr79wcKU3KmkDmNH0QK5j OEIYXUV7RCz6u0LSDucAiPqxZ9ezP9WdFh1+nWM8XDpWofO5Nijz1lNMXwVCin2K ZEro9LS7xpCW02A8oxc36/WGeomZw== X-ME-Sender: X-Sasl-enc: v0ibwNyEgL89SyhmHtZdmqKdCYW6yABdTdTkO5Lrf5Ap 1501531667 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 71BD47E354; Mon, 31 Jul 2017 16:07:47 -0400 (EDT) From: Marius Bakke To: 27888@debbugs.gnu.org Subject: [PATCH 06/18] gnu: python-setuptools-scm: Update to 1.15.6. Date: Mon, 31 Jul 2017 22:07:23 +0200 Message-Id: <20170731200735.28019-6-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170731200735.28019-1-mbakke@fastmail.com> References: <20170731200735.28019-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/python.scm (python-setuptools-scm): Update to 1.15.6. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2fe74a4e4..c40f56978 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5250,13 +5250,13 @@ child application and control it as if a human were typing commands.") (define-public python-setuptools-scm (package (name "python-setuptools-scm") - (version "1.15.0") + (version "1.15.6") (source (origin (method url-fetch) (uri (pypi-uri "setuptools_scm" version)) (sha256 (base32 - "0bwyc5markib0i7i2qlyhdzxhiywzxbkfiapldma8m91m82jvwfs")))) + "0pzvfmx8s20yrgkgwfbxaspz2x1g38qv61jpm0ns91lrb22ldas9")))) (build-system python-build-system) (home-page "https://github.com/pypa/setuptools_scm/") (synopsis "Manage Python package versions in SCM metadata") -- 2.13.3 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 16:08:01 2017 Received: (at 27888) by debbugs.gnu.org; 31 Jul 2017 20:08:01 +0000 Received: from localhost ([127.0.0.1]:35714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyu-0004nC-Tz for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:08:01 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:53283) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyj-0004lq-Hh for 27888@debbugs.gnu.org; Mon, 31 Jul 2017 16:07:49 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 7E9B620BD6; Mon, 31 Jul 2017 16:07:49 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 31 Jul 2017 16:07:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=k978pZ 8pBv67Er9r2DzI4xSj4UyI/7rg9aVsGYdxy7c=; b=RYPs2OzPmhGUidCuPgK9Gx eEqIODA28d6jVO23QH/DIX/K4hOHiR9asvv59Li7QyiL3euZ60YuY2ZyO/8uEx/6 UBvMik/6ZD17yJb2CCBcGZ1K4ZrU40O8dA1zqlVUQniIBpAjEcPWPeeSgN4EnZrA VhYLLdcFsgC1KoyHqUY5/5MVtXEBBACIhrRNJ2KK0O/TCL7wswtByVpyS+6cAcWx Jw74fdjaUv2PQC7aBVwR9gZZi9GFej9ZEsKHbfIuxprIlDRC7AC8Yf3JPPaSuz91 OhrV8sx76ONURlWyNsDzyrygOmyzJxQeMsCkA9VDlsJxL7WsTsecPU68cEo4xpXQ == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=k978pZ8pBv67Er9r2DzI4xSj4UyI/7rg9aVsGYdxy 7c=; b=qYEmWSHyBP0UKiJT1Y5EOVZ4P0Mk7nT3KvWpBT6+S2ls3VAqLYcrEtoRZ 4fDQLC6aQMDTpZWW7Eo/L4XCd5Fn4mbnoptmPi1+GkPLPLp7bYOB/V1jwOSUxKAH 8v2kE3wb4F9UkeRwHi1+pUlHtMCr6n8LfBHQgiwlrvC8x0VXv7hCKgZcYMIhMXcD dWF+gascLScGKO0uN7q4CQ15W9G6X9zuk0ZtSEVJJHgNqm15lpbJaS5ypAwrm6Bj Iw/2xwjrUDMe4tNv6i8HWBQiC2YWXqb/+Lo90hBfWMlxuk9z15hgnIRqBQuxW8GN DiyG7odszCGVEz90SPkeaA+GMTDxQ== X-ME-Sender: X-Sasl-enc: Bq95+xLGjJe2iJ7pcPhxAnk0Ug61CmZSq4iPX751YZN2 1501531669 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 1917E7E4EA; Mon, 31 Jul 2017 16:07:48 -0400 (EDT) From: Marius Bakke To: 27888@debbugs.gnu.org Subject: [PATCH 07/18] gnu: python-pytest: Update to 3.1.3. Date: Mon, 31 Jul 2017 22:07:24 +0200 Message-Id: <20170731200735.28019-7-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170731200735.28019-1-mbakke@fastmail.com> References: <20170731200735.28019-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/python.scm (python-pytest-bootstrap): Update to 3.1.3. [native-inputs]: Add PYTHON-SETUPTOOLS-SCM. (python-pytest)[native-inputs]: Inherit. --- gnu/packages/python.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c40f56978..955bd670a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1889,17 +1889,19 @@ code introspection, and logging.") (define python-pytest-bootstrap (package (name "python-pytest-bootstrap") - (version "3.0.7") + (version "3.1.3") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) (sha256 (base32 - "1asc4b2nd2a4f0g3r12y97rslq5wliji7b73wwkvdrm5s7mrc1mp")))) + "01k2abl6x60ac7wx5k9rw602n1b5r39xix6sjly5c974ywr1hph9")))) (build-system python-build-system) (arguments `(#:tests? #f)) + (native-inputs + `(("python-setuptools-scm" ,python-setuptools-scm))) (propagated-inputs `(("python-py" ,python-py))) (home-page "http://pytest.org") @@ -1937,7 +1939,8 @@ and many external plugins.") ("bash" ,bash) ("python-hypothesis" ,python-hypothesis) ("python-nose" ,python-nose) - ("python-mock" ,python-mock))) + ("python-mock" ,python-mock) + ,@(package-native-inputs python-pytest-bootstrap))) (properties `((python2-variant . ,(delay python2-pytest-bootstrap)))))) (define-public python2-pytest -- 2.13.3 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 16:08:01 2017 Received: (at 27888) by debbugs.gnu.org; 31 Jul 2017 20:08:01 +0000 Received: from localhost ([127.0.0.1]:35716 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyv-0004nJ-5m for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:08:01 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:49603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyl-0004lx-8C for 27888@debbugs.gnu.org; Mon, 31 Jul 2017 16:07:51 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 2CEA220BE8; Mon, 31 Jul 2017 16:07:51 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 31 Jul 2017 16:07:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=P87Fxm 2dvdK1eWfttxsty9L0ek9Vr0Nu5+9BYVPht74=; b=iMj5Kw2zh83t4QgQPNI1yK IaHKo86qd+xzQmrJmTLRCovvKTUsItvl+SDeoGMbK9ZP3nO96c5Zhi2UXMSmtmpq R50GCNSkMHkRWW/WPe4gGMtPO+wXggpvcfOQIpz9OOYVC6M3kZjZN01YbenPwIsG RebFuSJacN7MQGo9GUYXunz+tJAh3W1tR1JU2oZ7jJX0rZDvLOzTl1MhP6nym6JJ Ffd1OzD/ay2kMcoGLuSQLMNYlQ3VwBKm5vIJclxJOAU7ILqEJjiaGiFB7cOjhgbT Bkrsk8WDEJsKVeHEYEFqCtncll6MTDcfhbaCOhHiy88YzyksxHTWNaMS5T0iT3QA == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=P87Fxm2dvdK1eWfttxsty9L0ek9Vr0Nu5+9BYVPht 74=; b=R/n6HA4fiTZMVFQPgl7XVQRF24hb6OJdqWLyvYovYj6ufpI7t9E7KhgEv OzEgNwCMyC/e3sgzlzeYzwZy7AS2Jg+UAHzKnIlnj9Dnn/hluQ/6qOhp3O2c3a33 3EIkVW9lBSH61Hf+qTq2TzA/pjvW8NeMTUxzHzvfmh2JGkmO4uXwgDMgucABit8Z euTX8ch8kitvy8MaMnQO2EhNjN3CvinFKYkvF0ciRcKR3Hkb3TaVaESylowlSbjR 1J1CacZDjFk3z0O8QFKtf3n8GkDjoZq6ZF+9QokATimcRf6Iojx0jTaM4TEhbX16 mohqy2c4S+rU9y9YH2RB+b/LmtRwA== X-ME-Sender: X-Sasl-enc: wiIXecCy5rYeP3+DiIKwBgQ9J0vQ2CrTJ6jqa+23g82l 1501531670 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id B54297E1D9; Mon, 31 Jul 2017 16:07:50 -0400 (EDT) From: Marius Bakke To: 27888@debbugs.gnu.org Subject: [PATCH 08/18] gnu: python-pyflakes: Update to 1.5.0. Date: Mon, 31 Jul 2017 22:07:25 +0200 Message-Id: <20170731200735.28019-8-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170731200735.28019-1-mbakke@fastmail.com> References: <20170731200735.28019-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/python.scm (python-pyflakes): Update to 1.5.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 955bd670a..d0a979a2a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6703,14 +6703,14 @@ PEP 8.") (define-public python-pyflakes (package (name "python-pyflakes") - (version "1.0.0") + (version "1.5.0") (source (origin (method url-fetch) (uri (pypi-uri "pyflakes" version)) (sha256 (base32 - "0qs2sgqszq7wcplis8509wk2ygqcrwzbs1ghfj3svvivq2j377pk")))) + "1x1pcca4a24k4pw8x1c77sgi58cg1wl2k38mp8a25k608pzls3da")))) (build-system python-build-system) (home-page "https://github.com/pyflakes/pyflakes") -- 2.13.3 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 16:08:01 2017 Received: (at 27888) by debbugs.gnu.org; 31 Jul 2017 20:08:01 +0000 Received: from localhost ([127.0.0.1]:35721 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyv-0004nT-EM for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:08:01 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:36895) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGym-0004m5-Sx for 27888@debbugs.gnu.org; Mon, 31 Jul 2017 16:07:53 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id C9B7520AAD; Mon, 31 Jul 2017 16:07:52 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 31 Jul 2017 16:07:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=+e+iVh hGWzA+/LZLt/Iyq2sEcooeqXaNAggwL1wmHhA=; b=KrdQVAddLmB4CYY+nMtM/G 9rVdIq82VwPb3XC8J50QBRRMETQHuK4gr+H0fB3GqkywCcMpaWL6hXrEcoUNhYNJ myd+zfEpxfRQerBeTw1Tyfdz6fAxPqNgZJ8xsU+/6T2dOXGF44EgWDose4g0siBr RaUVP6KQAUmPEmfd1To+qAYvZOcLjNcBpAQDiz4J3M0ODj6jQIUgwuA3OTx9JDGd 0Lxp59vrXvUuL7kmLdgBREnBciOPqVTYnexu/zSZEYc2t9CkP7RcquKg9mZ/Mabu QlnYxqcx8i/e/qKF+s6kqMuIUyhNPmy5I2TA+YpszvW/jN++0IocyvyMffTu8frQ == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=+e+iVhhGWzA+/LZLt/Iyq2sEcooeqXaNAggwL1wmH hA=; b=WuEBWDqtcOkee5byk8rQiuxtVRm3a1sDuBArAOCQrmp1UMy+B2dTE6Dan nyOrBtbIlHqE54YbUa7gNoinInyE+ryDiDjdIPuFSYu2do+n2Nd8In4MtbOntUYi jmtrTAB8tLbsvtac02ZK4P1XuUDShF7CT5S6PDTBfIKom9cU6AISHOFW5hD0jtRi csVql06YTAuazWKZSNTLvCHnpKKMUjFhAlHfJjx77zxk8cb57o7xx3cd9V2v0g9m gL4LL4FWJpiwGJl4j+fZ0SwvSU0cRdR74xJfeWFDWGNeJhc6IvOVJxSX03rSOOYo 2975kYLu05JKRuJnkcGEfX6G91hOQ== X-ME-Sender: X-Sasl-enc: MgPE4LCrDN2pNSlphKUMuq4fZUPSojiFKTzFmGOW4k5n 1501531672 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 60B047E1D9; Mon, 31 Jul 2017 16:07:52 -0400 (EDT) From: Marius Bakke To: 27888@debbugs.gnu.org Subject: [PATCH 09/18] gnu: python-mccabe: Update to 0.6.1. Date: Mon, 31 Jul 2017 22:07:26 +0200 Message-Id: <20170731200735.28019-9-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170731200735.28019-1-mbakke@fastmail.com> References: <20170731200735.28019-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/python.scm (python-mccabe): Update to 0.6.1. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d0a979a2a..6fd0f014c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6725,14 +6725,14 @@ PEP 8.") (define-public python-mccabe (package (name "python-mccabe") - (version "0.4.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (pypi-uri "mccabe" version)) (sha256 (base32 - "0yr08a36h8lqlif10l4xcikbbig7q8f41gqywir7rrvnv3mi4aws")))) + "07w3p1qm44hgxf3vvwz84kswpsx6s7kvaibzrsx5dzm0hli1i3fx")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest-bootstrap) -- 2.13.3 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 16:08:02 2017 Received: (at 27888) by debbugs.gnu.org; 31 Jul 2017 20:08:02 +0000 Received: from localhost ([127.0.0.1]:35723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyv-0004ni-Oz for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:08:02 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:60815) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyo-0004mC-JG for 27888@debbugs.gnu.org; Mon, 31 Jul 2017 16:07:54 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 8A47420BE7; Mon, 31 Jul 2017 16:07:54 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 31 Jul 2017 16:07:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=NyQ5Yf CSD9NUZhwbB2CmL8g5Rf6dH7kOHxYjUJgNTDw=; b=qlNJ3URPNd1Iz/wfvb3pp3 ECMtCwryA7krNS2iiq7g081D10syHHyPMyNyHt1mwfiBZNknpIOZ1w81PabP6u4r YbZI4jlnF4RwiJ87zdouZoUuF/ud0uh/Wo02PRuD9jRjcnQV4FDckWGy331EgsQw GNLGpSiw17Fi8Csa9tbaEqlci5HZDbbqcJilrB+FZC+3kJXkloK4vmLCt6EJIw+/ 4js6yVxH5HUImJQlQsY/ikAD3t1GcuTZY6IH9IA9ZFYq6ga6Ssy+NtY00OoJ4mMv BXszdRdS2Eqavs8zAHq+3NEUR2zwZNL14KOatkg/tWYCCiPO8t33ehLCXdMNyMDQ == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=NyQ5YfCSD9NUZhwbB2CmL8g5Rf6dH7kOHxYjUJgNT Dw=; b=kJTlnVWVWM3AzwOniaTaHVWlJDMMmarrKqd/7Pq5ZIib8PzUGDt92jn4s 1hnSJM3+lVQmPevFFl9JwVJHsLxqfqHzUvHrgd6bI+aQ/ojLiISO5rOrUHAGj+yT byTT6mu7KUzchRvuNfi8zsnT0j43WGpm5OtYWSUcfvlpb941hs/qiqnaImGzdwOY JtQ2lfK+tHl0u2Gb1nw8aSWWPmNOzHTPSc5pbeoBLo85boKjCf4/ABohmwg31sFE 1nCXauJaEmwxTsB+5cGiSgFMrSuJ5RgwTY0inyUG+NbYpHkJrEU9EZ+BUcXSKWi8 e9ANX4zrg8pqTzR9n4T1T/MN/LGiA== X-ME-Sender: X-Sasl-enc: GtnpXki0rLjMD/5mTBjlWzX3tDfHSGrmfzWOI1wGX0Q6 1501531674 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 19A247E1D9; Mon, 31 Jul 2017 16:07:53 -0400 (EDT) From: Marius Bakke To: 27888@debbugs.gnu.org Subject: [PATCH 10/18] gnu: python-mock@2: Add dependency on python-six. Date: Mon, 31 Jul 2017 22:07:27 +0200 Message-Id: <20170731200735.28019-10-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170731200735.28019-1-mbakke@fastmail.com> References: <20170731200735.28019-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/python.scm (python-mock-2)[propagated-inputs]: Add PYTHON-SIX. --- gnu/packages/python.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6fd0f014c..37b8c5594 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -970,6 +970,7 @@ have been used.") "1flbpksir5sqrvq2z0dp8sl4bzbadg21sj4d42w3klpdfvgvcn5i")))) (propagated-inputs `(("python-pbr" ,python-pbr-minimal) + ("python-six" ,python-six) ,@(package-propagated-inputs python-mock))))) (define-public python-setuptools -- 2.13.3 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 16:08:03 2017 Received: (at 27888) by debbugs.gnu.org; 31 Jul 2017 20:08:03 +0000 Received: from localhost ([127.0.0.1]:35727 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyx-0004oE-3a for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:08:03 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:40557) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyq-0004mK-9S for 27888@debbugs.gnu.org; Mon, 31 Jul 2017 16:07:56 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 3581220BF7; Mon, 31 Jul 2017 16:07:56 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 31 Jul 2017 16:07:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=eCs6pX CNKglGAx32+s7AmT5q4dCF4HfGwAtTqYbKrb0=; b=xX3N2UAEckaJNbFM52liq3 +KrzZdtRMxgnrBQ+u0AG94+Z2xRZSkK4+C2zIFVOHHT2NLgAR9b2s1KeEGQqSxaI 3w7Ue03QFPqcgpubgmMygUE4FmlCImvNPJ4fxgDtJ2cboCSKdPnMnstUUGTW8UyB lM6MAL2mR09Kcq07/B1h3I4C7RdsJI3Q9yV2Kw2JOzRnvC3oVG4HiIC6l08yAfPU VOCR29jiiiieCJ7r4lLrPK87vPbm5XJdKcWCxK7WafxKBNwHrYtpnUx/nilDr1ws q78BzznfVsXj2OlDqAH5eMCrjZrXFoAWH+oiQErR9v83ixAoscYGZWx+MQTeKEsg == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=eCs6pXCNKglGAx32+s7AmT5q4dCF4HfGwAtTqYbKr b0=; b=d7uqck90+t/3vTxQzSmUEx04mMSf6giN3v9I1S+ItGtU/uOP7XjGxsY5k bsG9LuM6svI+kGV8JFgqeaivxCs2nECue5kW/lKUdqec7rdGZ6ZLkIs/8ET8SoKx Rv+UcauOB3+xcODnp2/Z54yhv7gYwVxE8zUeXyEB6PGCYDn4CnBFmdhm13p+N1kC 9z2ZLkoesw6bgqIZwaFJf6yzfrBcZNpp19OBxY/M5b67MBA2/ECZukdqMVeoTNMN z/UkkCWQMGUVa38o8f4mSNUl7xkrVWPs1182g3q+TuRbG0tHTl86lCioM2VfiNO/ gNnnRqd9xmf9Pn6pt6thiQHs3NO5A== X-ME-Sender: X-Sasl-enc: 6fvHzAJAlZEh7YW4yQ7Xxf32LtsEOJS7mvDKGJYGtR6+ 1501531675 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id C2D017E1D9; Mon, 31 Jul 2017 16:07:55 -0400 (EDT) From: Marius Bakke To: 27888@debbugs.gnu.org Subject: [PATCH 11/18] gnu: Add python2-enum. Date: Mon, 31 Jul 2017 22:07:28 +0200 Message-Id: <20170731200735.28019-11-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170731200735.28019-1-mbakke@fastmail.com> References: <20170731200735.28019-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/python.scm (python2-enum): New variable. --- gnu/packages/python.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 37b8c5594..0d90d2017 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1547,6 +1547,28 @@ bug tracker.") (home-page "http://www.liquidx.net/pybugz/") (license license:gpl2))) +(define-public python2-enum + (package + (name "python2-enum") + (version "0.4.6") + (source (origin + (method url-fetch) + (uri (pypi-uri "enum" version)) + (sha256 + (base32 + "13lk3yrwj42vl30kw3c194f739nrfrdg64s6i0v2p636n4k8brsl")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2)) + (home-page "http://pypi.python.org/pypi/enum/") + (synopsis "Robust enumerated type support in Python") + (description + "This provides a module for robust enumerations in Python. It has +been superseded by the Python standard library and is provided only for +compatibility.") + ;; Choice of either license. + (license (list license:gpl3+ license:psfl)))) + (define-public python-enum34 (package (name "python-enum34") -- 2.13.3 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 16:08:04 2017 Received: (at 27888) by debbugs.gnu.org; 31 Jul 2017 20:08:04 +0000 Received: from localhost ([127.0.0.1]:35730 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyx-0004oL-Dk for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:08:03 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:54197) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGys-0004mi-17 for 27888@debbugs.gnu.org; Mon, 31 Jul 2017 16:07:58 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id E972320AAD; Mon, 31 Jul 2017 16:07:57 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 31 Jul 2017 16:07:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=0js6HS b60KkAxgTi3/wrlD8Jo/hsoMiiETXx8dfBZ+k=; b=zoUWr2N+JcXtEzc85ts5Ge 0Q1RTJ52GfiqP7bXhPiCWRL8jKXcVCV9QAkKGVfFc+LBb+ee4AzbpVZ+2geGh3xj bC/Jd3k+eSZCIRTC77s7izUFRU1xSGm7Nbb2jYIDHQChV2MiF1gNoTvdx8GRcqOM K1ZW57B+U3ABwX9IH7lg12IPIaUV6FqD8su48fjdm41xeAsZh4iA1z91PyutPsvk 7E2nAAbuxN0xYDLPeInHsL5PfIRfbYEqfeZOvMwuf10RdU0Hkp8ZkufbRfBfYZuV tDL9UELl9zEgUll4dIShxERNKrEGqbXOUMn2yOLY+fkUgPCf5fN0+uu+gPj23VZA == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=0js6HSb60KkAxgTi3/wrlD8Jo/hsoMiiETXx8dfBZ +k=; b=VbsfkOUDhia7oWMy9HS+Bj+cL405dnapM+Kj8ibMQ1/x9pPZ/W+dv/hyA 65B9FH4H28BzDb8QCiyl1nax+aXnUbN8NbkyJH90tZDbGX53e/3+XPJR+nq/5zBP M2vBdsTtnrOP2AE9/e0+HIqqj5Uem5yESbOyREpz9D5YQNi7vzUGxvtDStQOYMPH 7H+dPFES6rvg6FWugRcYexNOc27Y9IHsAGfQXO5hAYeqlOh/Fq13nWNEX/991sD+ emRh4bKlzVwk+0ffn6prBSRqb2aBw9Oes6YaRFoERN2dsQHL+xT5h3Ykf4jUSMSf JmoaDHVp5OUyPCnsIU/YXMFkhOEjQ== X-ME-Sender: X-Sasl-enc: UF0DT9xF/nfJVtv3lUA1Gk42ITP4+fMcsjAFiVZhTo6p 1501531677 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 6E3667E432; Mon, 31 Jul 2017 16:07:57 -0400 (EDT) From: Marius Bakke To: 27888@debbugs.gnu.org Subject: [PATCH 12/18] gnu: python-flake8: Update to 3.4.1. Date: Mon, 31 Jul 2017 22:07:29 +0200 Message-Id: <20170731200735.28019-12-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170731200735.28019-1-mbakke@fastmail.com> References: <20170731200735.28019-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/python.scm (python-flake8): Update to 3.4.1. [source]: Remove obsolete snippet. [arguments]: Override 'check' phase. [propagated-inputs]: Remove PYTHON-PEP8. Add PYTHON-PYCODESTYLE and PYTHON-SETUPTOOLS. [native-inputs]: Change PYTHON-MOCK to PYTHON-MOCK-2. Remove PYTHON-NOSE. Add PYTHON-PYTEST-BOOTSTRAP and PYTHON-PYTEST-RUNNER. [properties]: Declare python2 variant. * gnu/packages/python.scm (python-flake8)[propagated-inputs]: Add PYTHON2-ENUM and PYTHON2-CONFIGPARSER. --- gnu/packages/python.scm | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0d90d2017..a23d6aa1c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6831,39 +6831,48 @@ complexity of Python source code.") (define-public python-flake8 (package (name "python-flake8") - (version "2.5.4") + (version "3.4.1") (source (origin (method url-fetch) (uri (pypi-uri "flake8" version)) (sha256 (base32 - "0bs9cz4fr99r2rwig1b8jwaadl1nan7kgpdzqwj0bwbckwbmh7nc")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Remove pre-compiled .pyc files from source. - (for-each delete-file-recursively - (find-files "." "__pycache__" #:directories? #t)) - (for-each delete-file (find-files "." "\\.pyc$")) - #t)))) - (build-system python-build-system) - (propagated-inputs - `(("python-pep8" ,python-pep8) + "1n0i38592vy3q0x2a9bf8z6rhhn04i30wsn5i5zzcj7qkxvl8062")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'check) + (add-after 'install 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (zero? (system* "pytest" "-v"))))))) + (propagated-inputs + `(("python-pycodestyle" ,python-pycodestyle) ("python-pyflakes" ,python-pyflakes) + ;; flake8 depends on a newer setuptools than provided by python. + ("python-setuptools" ,python-setuptools) ("python-mccabe" ,python-mccabe))) (native-inputs - `(("python-mock" ,python-mock) ; TODO: only required for < 3.3 - ("python-nose" ,python-nose))) + `(("python-mock" ,python-mock-2) ; TODO: only required for < 3.3 + ("python-pytest" ,python-pytest-bootstrap) + ("python-pytest-runner" ,python-pytest-runner))) (home-page "https://gitlab.com/pycqa/flake8") (synopsis "The modular source code checker: pep8, pyflakes and co") (description "Flake8 is a wrapper around PyFlakes, pep8 and python-mccabe.") + (properties `((python2-variant . ,(delay python2-flake8)))) (license license:expat))) (define-public python2-flake8 - (package-with-python2 python-flake8)) + (let ((base (package-with-python2 (strip-python2-variant python-flake8)))) + (package (inherit base) + (propagated-inputs + `(("python2-configparser" ,python2-configparser) + ("python2-enum" ,python2-enum) + ,@(package-propagated-inputs base)))))) (define-public python-flake8-polyfill (package -- 2.13.3 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 16:08:04 2017 Received: (at 27888) by debbugs.gnu.org; 31 Jul 2017 20:08:04 +0000 Received: from localhost ([127.0.0.1]:35736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyy-0004oa-2t for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:08:04 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:51363) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyt-0004mq-LM for 27888@debbugs.gnu.org; Mon, 31 Jul 2017 16:07:59 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 848A820BCC; Mon, 31 Jul 2017 16:07:59 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 31 Jul 2017 16:07:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=stsgug GpTMcoX9fWohGvgocdmnASb2ZStc/b2jXIafg=; b=AUXe/gFx+oRMWDkTkshwTo pxi1iVWiVgQKKD/teLpeqkpF8oxv7RoLnl8u19cVVOqVyzAz9psz/w6RczUMctI2 8qII/JrZGIpIuz3aj5LELQ0pcoPt9k0a+0XrQ2zrwYHj/XWrY148b6OwUdotowDZ kUVEuohXAC4//SCxxcY5A42cmsOBITQxfWBf7h0/N5dck51iwU8748xVHmaa+U3G OnethWLUV8v5o+iQGRR9kjVUOTR1YO+MMLatvjzgHNgvjaTJAZB1/r4R4AmpoNLv kSIARO1W5QuMVxwes/Mhr9O9U1VK3xOIls0uHXKAsEjXZwi31khgVgtuFUIHVP5w == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=stsgugGpTMcoX9fWohGvgocdmnASb2ZStc/b2jXIa fg=; b=b7DqzuLD4Vkl72AJxnLSioh6IZcNL+PJ47wWeJLgzLYWF2WQ0cC9TujiD 4a0HJ4YzuVwphCQnaRTfiAd9h2oyVCzZNGh88+JsBorE/jxi1V4tPIv8XIhR9TFn 9/VASaWR98o499RNH37whwj0Kiy1p/RohBcT9eJnu/MpCj/44f16SMaZrc1q8eML +Qnxtx//fb3FVzcXWpxAQlbR6GPrsSbb376bPV2JIOsLkiiLzDRzVq0jEBHO9ji3 wz1i8n5sVFQarhogyT3vVBaZ23c7Csx7plFp2Se3ijldHsOO92A3+yQTxn5IbbjT h45oL28jKa52AJcXpJCtic5iqiA0A== X-ME-Sender: X-Sasl-enc: EZiMbtyLqdXTykOnT6qTOst5CfTPK5UVpyOJqFZ1jEWS 1501531679 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 178727E1D9; Mon, 31 Jul 2017 16:07:58 -0400 (EDT) From: Marius Bakke To: 27888@debbugs.gnu.org Subject: [PATCH 13/18] gnu: Add python-linecache2. Date: Mon, 31 Jul 2017 22:07:30 +0200 Message-Id: <20170731200735.28019-13-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170731200735.28019-1-mbakke@fastmail.com> References: <20170731200735.28019-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/python.scm (python-linecache2, python2-linecache2): New variables. --- gnu/packages/python.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a23d6aa1c..be556959d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1819,6 +1819,30 @@ interfaces and processes.") (define-public python2-nose2 (package-with-python2 python-nose2)) +(define-public python-linecache2 + (package + (name "python-linecache2") + (version "1.0.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "linecache2" version)) + (sha256 + (base32 + "0z79g3ds5wk2lvnqw0y2jpakjf32h95bd9zmnvp7dnqhf57gy9jb")))) + (build-system python-build-system) + (arguments `(#:tests? #f)) ; FIXME: dependency cycle on unittest2. + (native-inputs + `(("python-pbr" ,python-pbr-minimal))) + (home-page "https://github.com/testing-cabal/linecache2") + (synopsis "Backports of the linecache module") + (description + "Backports of the linecache module to older versions of Python.") + ;; No explicit license, but code is taken from Python standard library. + (license license:psfl))) + +(define-public python2-linecache2 + (package-with-python2 python-linecache2)) + (define-public python-unittest2 (package (name "python-unittest2") -- 2.13.3 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 16:08:04 2017 Received: (at 27888) by debbugs.gnu.org; 31 Jul 2017 20:08:04 +0000 Received: from localhost ([127.0.0.1]:35739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyy-0004oo-E8 for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:08:04 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:37083) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyv-0004nO-91 for 27888@debbugs.gnu.org; Mon, 31 Jul 2017 16:08:01 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 3C15F20780; Mon, 31 Jul 2017 16:08:01 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 31 Jul 2017 16:08:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=sU7bYA 0wFBD+3w9+m1Z8RYfaSgVycx/kgMVpwUzNEFQ=; b=V7YdJkFd5tI6eEzj3CUfOj Iec1TBf7mxVuxTNd9ZZtHkO/CA38dO0qUoUU+W/mq6rGCLMYGwIi47yg6/cdiVrI LKH65gtY2K3OsqwVcdjSKSHYJN+3fwKHxrNXU968z7PTQ4/NSZGaWo4XNkaGeXUh trGU4MaHzP7YVCATpLnmncXkaBZyrUH0aPWit+yG0GiZCsUUOh/TEnfyb+mjfYtJ uex1DGuToDg5rabr02b78Ti44PEhXNuEhRbEYjOjLkXb45rR3pawFLLOCSXbR9GO mX41icAUY6WwxQyDUV83ruFd1Cqtdqh/Sb2oeynZFZGOeM9o/ohY51UB4XYYBDnw == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=sU7bYA0wFBD+3w9+m1Z8RYfaSgVycx/kgMVpwUzNE FQ=; b=GWLL/N3TAFEuX/GlWI6+txfVS5XTRl/2RZVKvvedgOC6NRDjob3vl6E+L VYVWazEsLSb1UzmxIKYOGXnFUzCiXXZ1rdtgE/Up9ORtH1z6GdY6I8JDdqaY8WTo GTu62rr0vwMEaCIs8ECLwGXZgD8rhEccGybA4W8TM2FYsdhL0Is/FFnddCtGEny5 UyDq0942OpO8pQCkzzB0xz6he0E9fvtZKLrB1qwupTqs9Mw24Dt1oTkgL9h+LwPF Uc0sqpn2gFYtBhx8yhOL9LvQmgEqeUy2l51IB5TW/GbW45a9iPRlyI2Hn7AOt+D/ oUCm0cfIyvRQaaj8P/DW8cRwS6N/A== X-ME-Sender: X-Sasl-enc: ZvL4p8iyw+LK0yAI0TuYtF3emuNjUqzCACA54LuQRdPp 1501531680 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id B8D347E1D9; Mon, 31 Jul 2017 16:08:00 -0400 (EDT) From: Marius Bakke To: 27888@debbugs.gnu.org Subject: [PATCH 14/18] gnu: Add python-traceback2. Date: Mon, 31 Jul 2017 22:07:31 +0200 Message-Id: <20170731200735.28019-14-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170731200735.28019-1-mbakke@fastmail.com> References: <20170731200735.28019-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/python.scm (python-traceback2, python2-traceback2): New variables. --- gnu/packages/python.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index be556959d..77efcf1ed 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1843,6 +1843,31 @@ interfaces and processes.") (define-public python2-linecache2 (package-with-python2 python-linecache2)) +(define-public python-traceback2 + (package + (name "python-traceback2") + (version "1.4.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "traceback2" version)) + (sha256 + (base32 + "0c1h3jas1jp1fdbn9z2mrgn3jj0hw1x3yhnkxp7jw34q15xcdb05")))) + (build-system python-build-system) + (arguments `(#:tests? #f)) ; FIXME: Dependency cycle on unittest2. + (native-inputs + `(("python-pbr" ,python-pbr-minimal))) + (propagated-inputs + `(("python-linecache2" ,python-linecache2))) + (home-page "https://github.com/testing-cabal/traceback2") + (synopsis "Backports of the traceback module") + (description + "Backports of the traceback module to older versions of Python.") + (license license:psfl))) + +(define-public python2-traceback2 + (package-with-python2 python-traceback2)) + (define-public python-unittest2 (package (name "python-unittest2") -- 2.13.3 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 16:08:12 2017 Received: (at 27888) by debbugs.gnu.org; 31 Jul 2017 20:08:12 +0000 Received: from localhost ([127.0.0.1]:35759 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGz5-0004qj-Pc for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:08:11 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:51657) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyz-0004p8-2S for 27888@debbugs.gnu.org; Mon, 31 Jul 2017 16:08:05 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 00E1F20780; Mon, 31 Jul 2017 16:08:05 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 31 Jul 2017 16:08:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=aQufMc 1Sj8ExuBdnBC7OnMzL6BESJWyw93o0qQyXG20=; b=jNARftjkpF0Y/beHME3FFj naEjBlXnwvduru3LfQMXOpvdrkmCjL5peBg6syR/h/YeFmO0+xmoQ2OZA6yv0O/G V8F5TcWiURK4d5rUTwSIR3HrGIIX9nqZBERTtDk0Tr2y8gqWYDlafHrvfS4z30pY KFs3UUCA2oYdsijrmkgwE3lpzicIFCZYH4UHsPHd0B4NSvOa8WzMX87bxs+oFEKJ 5uXs7GQTLdgQCTRAD8MkwELHpd/VuJoTQCaTIxk7BjGYKqI4P9NgnrJWx0MOwyqR e3pR+ssfSni25MdOLVCo7nGH5qRsxODwikhnvMIgHBox9Osn21I66elGI9ktDFMw == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=aQufMc1Sj8ExuBdnBC7OnMzL6BESJWyw93o0qQyXG 20=; b=MtAFbUas8UdTO4D/7/GZ5Bk3rYLYlTS/T1awQq1k3FyvZuyqe6ByQeUtA cEVwDbIQ5egMur7WcMyo+laTHCSBZrAOJixdYGlBiFPZCu2qOL71eKCM9vGmPUgb 0JH43VSPtnqmUF/dLIewLwBZE/CttwLnCX0dmcouuif6ts0smF79oP6kNi6h9iWL 2WmK7UY/yf0nWCspT6bDEYqYIo72w3m9eTs5rQVNRItB9P4rHTdwExoiJV3S8/E+ KVTQjlNvXBEZllBz+1S6DKD92ioVJYgnol/Qotq5q9A/RrAzvDIGj+dPo3q/y/zC n6YZodNUUsSVb1SMt0QziUbGBX5mQ== X-ME-Sender: X-Sasl-enc: vGVNOnmSNgtT0zmHJIm2cL4IqyfVoII5B23azZyn6gFI 1501531684 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 8773B7E1D9; Mon, 31 Jul 2017 16:08:04 -0400 (EDT) From: Marius Bakke To: 27888@debbugs.gnu.org Subject: [PATCH 16/18] gnu: Add python2-funcsigs. Date: Mon, 31 Jul 2017 22:07:33 +0200 Message-Id: <20170731200735.28019-16-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170731200735.28019-1-mbakke@fastmail.com> References: <20170731200735.28019-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/python.scm (python2-funcsigs): New variable. --- gnu/packages/python.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3217de524..e1bc3905a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1819,6 +1819,27 @@ interfaces and processes.") (define-public python2-nose2 (package-with-python2 python-nose2)) +(define-public python2-funcsigs + (package + (name "python2-funcsigs") + (version "1.0.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "funcsigs" version)) + (sha256 + (base32 + "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2)) + (native-inputs + `(("python2-unittest2" ,python2-unittest2))) + (home-page "http://funcsigs.readthedocs.org") + (synopsis "Python function signatures from PEP362") + (description + "Backport of @code{funcsigs} which was introduced in Python 3.3.") + (license license:asl2.0))) + (define-public python-linecache2 (package (name "python-linecache2") -- 2.13.3 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 16:08:14 2017 Received: (at 27888) by debbugs.gnu.org; 31 Jul 2017 20:08:14 +0000 Received: from localhost ([127.0.0.1]:35761 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGz6-0004ql-0o for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:08:14 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:42129) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGyx-0004oJ-Cj for 27888@debbugs.gnu.org; Mon, 31 Jul 2017 16:08:05 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 59C8B209F9; Mon, 31 Jul 2017 16:08:03 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 31 Jul 2017 16:08:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=ye5PiX Mas7DcKiKMfECwdLl34Golp296qDkRGbH8BIg=; b=uaIX+OnPbHkBt/N9R7GQaC riy6AXt06JCzz8Yy7mpy9xCCX77ukdTl8Or+qNxDVDHzq9obbMBADzeMy3HvqJbr /COSwttoWn2DvYWDd5G/2wemZX4dx8my812pGOE8i91GvVhF5iWxoOtBdHW96N4g JcHg30i6Qm4o2ZxR8HuwraCDsV/ESL82LkE21SrHDH9nt6+ke+aIzJkeKD+OLjW6 HMzhIdr9am1cNoDRuKcInZoMEGKLgGG+w+gQ90ZwPFh28N61f7m9VkYmKSLj85zR bvR5eABjdrmLuS1UsYIGKDuY/NgNRU5Zk9R74XhDFVQEYjZSqQYNV4AVYOC6EkcQ == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=ye5PiXMas7DcKiKMfECwdLl34Golp296qDkRGbH8B Ig=; b=UD9v+7i/sDLwIbX1dwxXRXu2ktfqWKcA9PEy5JpWkPvOXB5qX7kZekK+s MGzF5MjgEAZemWSlUYtakD14i+m915atI85RCgoEWHqrjyJ6z3sOb6BUczC8XZSY FIotxhEzY6ZSS6FgEFhSY5DPG9TIZfl0BblIJMPfVzoIeMLvXvRTNxEIBRmlWxd0 rJqEPCZKdq0XaKfVQzaBK9uxMayRh8Ee8NkkcveYWLkTLhvUldzsmcryj67k68r7 uCFmqxenZn+7V4w+PkN83ovOnE90LmP160E66C8yLBJmqUBrolabXW/yIWPZ4HPZ rzrQJf55VvpKXgDLE/oVQP4Vgv79w== X-ME-Sender: X-Sasl-enc: xOGRNy/fJYGuV2+fUemVEHyx0/KMkc4XW8CS3Le2PPCY 1501531682 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 955607E1D9; Mon, 31 Jul 2017 16:08:02 -0400 (EDT) From: Marius Bakke To: 27888@debbugs.gnu.org Subject: [PATCH 15/18] gnu: python-unittest2: Update to 1.1.0. Date: Mon, 31 Jul 2017 22:07:32 +0200 Message-Id: <20170731200735.28019-15-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170731200735.28019-1-mbakke@fastmail.com> References: <20170731200735.28019-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/python.scm (python-unittest2): Update to 1.1.0. [source]: Use PYPI-URI. Add python3 compatibility patch. [arguments]: Add phases to loosen dependency requirements and run tests. [propagated-inputs]: Add PYTHON-SIX and PYTHON-TRACEBACK2. (python2-unittest2): Use 'package-with-python2'. * gnu/packages/patches/python-unittest2-python3-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + .../patches/python-unittest2-python3-compat.patch | 34 ++++++++++++++++++ gnu/packages/python.scm | 42 +++++++++++----------- 3 files changed, 57 insertions(+), 20 deletions(-) create mode 100644 gnu/packages/patches/python-unittest2-python3-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 62ef61589..ce3d821d9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -957,6 +957,7 @@ dist_patch_DATA = \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \ + %D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/qemu-CVE-2017-7493.patch \ %D%/packages/patches/qemu-CVE-2017-8112.patch \ %D%/packages/patches/qemu-CVE-2017-8309.patch \ diff --git a/gnu/packages/patches/python-unittest2-python3-compat.patch b/gnu/packages/patches/python-unittest2-python3-compat.patch new file mode 100644 index 000000000..fe0afe559 --- /dev/null +++ b/gnu/packages/patches/python-unittest2-python3-compat.patch @@ -0,0 +1,34 @@ +Skip tests that fail with newer versions of Python. + +Patch copied from Gentoo: + +https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch + +diff --git a/unittest2/test/test_loader.py b/unittest2/test/test_loader.py +index 683f662..347eea5 100644 +--- a/unittest2/test/test_loader.py ++++ b/unittest2/test/test_loader.py +@@ -509,6 +509,7 @@ class Test_TestLoader(unittest2.TestCase): + # + # What happens when an impossible name is given, relative to the provided + # `module`? ++ @unittest.skipIf(sys.version_info[:2] >= (3, 5), "python 3.5 has problems here") + def test_loadTestsFromName__relative_malformed_name(self): + loader = unittest.TestLoader() + +@@ -811,6 +812,7 @@ class Test_TestLoader(unittest2.TestCase): + # TestCase or TestSuite instance." + # + # What happens when presented with an impossible module name? ++ @unittest.skipIf(sys.version_info[:2] >= (3, 5), "python 3.5 has problems here") + def test_loadTestsFromNames__malformed_name(self): + loader = unittest2.TestLoader() + +@@ -918,6 +920,7 @@ class Test_TestLoader(unittest2.TestCase): + # "The method optionally resolves name relative to the given module" + # + # What happens when presented with an impossible attribute name? ++ @unittest.skipIf(sys.version_info[:2] >= (3, 5), "python 3.5 has problems here") + def test_loadTestsFromNames__relative_malformed_name(self): + loader = unittest.TestLoader() + diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 77efcf1ed..3217de524 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1871,17 +1871,33 @@ interfaces and processes.") (define-public python-unittest2 (package (name "python-unittest2") - (version "0.5.1") + (version "1.1.0") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/u/unittest2py3k/unittest2py3k-" - version ".tar.gz")) + (uri (pypi-uri "unittest2" version)) + (patches + (search-patches "python-unittest2-python3-compat.patch")) (sha256 (base32 - "00yl6lskygcrddx5zspkhr0ibgvpknl4678kkm6s626539grq93q")))) + "0y855kmx7a8rnf81d3lh5lyxai1908xjp0laf4glwa4c8472m212")))) (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'adjust-dependencies + (lambda _ + ;; Don't check for separate argparse module when it's shipped + ;; in all Python versions we support (2.7+). + (substitute* "setup.py" + (("'argparse',") "")) + #t)) + (replace 'check + (lambda _ + (zero? (system* "python" "-m" "unittest2" "discover" "--verbose"))))))) + (propagated-inputs + `(("python-six" ,python-six) + ("python-traceback2" ,python-traceback2))) (home-page "http://pypi.python.org/pypi/unittest2") (synopsis "Python unit testing library") (description @@ -1890,21 +1906,7 @@ standard library.") (license license:psfl))) (define-public python2-unittest2 - (package (inherit python-unittest2) - (name "python2-unittest2") - (version "0.5.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/u/unittest2/unittest2-" - version ".tar.gz")) - (sha256 - (base32 - "0wbs4i4x3x7klr3v35ss6p9mcqz883i1xgcpkhvl7n2lyv6yhpda")))) - (arguments - `(#:python ,python-2 - #:tests? #f)))) ; no setup.py test command + (package-with-python2 python-unittest2)) (define-public python-pafy (package -- 2.13.3 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 16:08:14 2017 Received: (at 27888) by debbugs.gnu.org; 31 Jul 2017 20:08:14 +0000 Received: from localhost ([127.0.0.1]:35763 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGz8-0004qy-FY for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:08:14 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:56355) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGz0-0004pQ-Ly for 27888@debbugs.gnu.org; Mon, 31 Jul 2017 16:08:07 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 9F8B020849; Mon, 31 Jul 2017 16:08:06 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 31 Jul 2017 16:08:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=7dEn3n TBtHI+jQTwf2G3Q8tPiL/7jo7/YzaZ65oAjP4=; b=cZWP3G1A8VxBcOSoq2kIHg Xo0ddRdiS1oqnWe+sHFUUIYv6Oa6OOI5E7o/fwmbdCjejrjwmZUndifM46pGyo4j QqTxb6eG0q6Y6UHmw9PBXLxa+4E6O5Sa7JzlwIC66X88qORmrOjJGxMoiY3WIG2s oi3pzL3udPnPC99jU3mNTtxbQ1YOxC2qhHjwKBbK8pkG5d3VxS4udvwo3m58b8Ra k8XOtPD+FY6B3NfFOZDPF1gSmZ31myhqfDklehQho1p4leVDtz7uWN17Lm86caT8 qJmoULQssCGEuUYIy13b2GqjnbMrYcChDrvb/FF55ZMDg7RTLA7A39SkGdo9k5UA == DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=7dEn3nTBtHI+jQTwf2G3Q8tPiL/7jo7/YzaZ65oAj P4=; b=BhZyF7W2NrdLbazddMNF7jqxa0pMBvaFcXYa1p1ePoni3YKlrVkDvNpif ssVfTn1fgp1+MXoIeZVO39gwOhrWEkTtRhe9ROyBIKb5adPwM40nYorXJu5WPTkk AQHw9WK56+SvTJSvDjQSfnAetBCWUuuSjXpAL3COPgsHAbs1yYg293qZAmI2yrU0 /CbC3bJEFX7RdWzb6oQ+pT0NLgec81Q0WoV6fT4IBfwtf6mmdBONe4r0cT5dbg97 uscpooIDmPzwAur8u3uk6dL2hotqHFAp4j0RcnZ7KW/f0GHht4EFEyj0qYciy/O/ GQ7wUppq0QZ8TGnddw5wG3bPrZTTw== X-ME-Sender: X-Sasl-enc: OZ01rjXjMviQP1qIEvli00HOqL9yNmGqMVrcflVhyR1J 1501531686 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 32B957E354; Mon, 31 Jul 2017 16:08:06 -0400 (EDT) From: Marius Bakke To: 27888@debbugs.gnu.org Subject: [PATCH 17/18] gnu: python-mock: Make 2.0 the default package. Date: Mon, 31 Jul 2017 22:07:34 +0200 Message-Id: <20170731200735.28019-17-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170731200735.28019-1-mbakke@fastmail.com> References: <20170731200735.28019-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/python.scm (python-mock): Update to 2.0.0. [native-inputs]: Add PYTHON-UNITTEST2. [propagated-inputs]: Add PYTHON-PBR and PYTHON-SIX. [arguments]: Override 'check' phase. [properties]: Declare python2 variant. (python2-mock)[propagated-inputs]: Add PYTHON2-FUNCTOOLS32 and PYTHON2-FUNCSIGS. (python-mock-2): Remove variable. * gnu/packages/python.scm (python-flake8)[native-inputs]: Adjust accordingly. * gnu/packages/tls.scm (python-acme, certbot)[native-inputs]: Likewise. --- gnu/packages/python.scm | 47 ++++++++++++++++++++++------------------------- gnu/packages/tls.scm | 4 ++-- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e1bc3905a..9a7f88c30 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -932,46 +932,43 @@ API for locking files.") (define-public python-mock (package (name "python-mock") - (version "1.0.1") + (version "2.0.0") (source (origin (method url-fetch) (uri (pypi-uri "mock" version)) (sha256 (base32 - "0kzlsbki6q0awf89rc287f3aj8x431lrajf160a70z0ikhnxsfdq")))) + "1flbpksir5sqrvq2z0dp8sl4bzbadg21sj4d42w3klpdfvgvcn5i")))) + (propagated-inputs + `(("python-pbr" ,python-pbr-minimal) + ("python-six" ,python-six))) (build-system python-build-system) - (arguments '(#:test-target "check")) + (native-inputs + `(("python-unittest2" ,python-unittest2))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (zero? (system* "unit2"))))))) (home-page "https://github.com/testing-cabal/mock") (synopsis "Python mocking and patching library for testing") (description "Mock is a library for testing in Python. It allows you to replace parts of your system under test with mock objects and make assertions about how they have been used.") + (properties `((python2-variant . ,(delay python2-mock)))) (license license:expat))) (define-public python2-mock - (package-with-python2 python-mock)) - -;;; Some packages (notably, certbot and python-acme) rely on this newer version -;;; of python-mock. However, a large number of packages fail to build with -;;; mock@2, so we add a new variable for now. Also, there may be a dependency -;;; cycle between mock and six, so we avoid creating python2-mock@2 for now. -(define-public python-mock-2 - (package - (inherit python-mock) - (version "2.0.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "mock" version)) - (sha256 - (base32 - "1flbpksir5sqrvq2z0dp8sl4bzbadg21sj4d42w3klpdfvgvcn5i")))) - (propagated-inputs - `(("python-pbr" ,python-pbr-minimal) - ("python-six" ,python-six) - ,@(package-propagated-inputs python-mock))))) + (let ((base (package-with-python2 + (strip-python2-variant python-mock)))) + (package (inherit base) + (propagated-inputs + `(("python2-functools32" ,python2-functools32) + ("python2-funcsigs" ,python2-funcsigs) + ,@(package-propagated-inputs base)))))) (define-public python-setuptools (package @@ -6927,7 +6924,7 @@ complexity of Python source code.") ("python-setuptools" ,python-setuptools) ("python-mccabe" ,python-mccabe))) (native-inputs - `(("python-mock" ,python-mock-2) ; TODO: only required for < 3.3 + `(("python-mock" ,python-mock) ; TODO: only required for < 3.3 ("python-pytest" ,python-pytest-bootstrap) ("python-pytest-runner" ,python-pytest-runner))) (home-page "https://gitlab.com/pycqa/flake8") diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 5a94ac619..4c64a0b0a 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -502,7 +502,7 @@ netcat implementation that supports TLS.") #t)))))) ;; TODO: Add optional inputs for testing. (native-inputs - `(("python-mock" ,python-mock-2) + `(("python-mock" ,python-mock) ;; For documentation ("python-sphinx" ,python-sphinx) ("python-sphinxcontrib-programoutput" ,python-sphinxcontrib-programoutput) @@ -554,7 +554,7 @@ netcat implementation that supports TLS.") ;; TODO: Add optional inputs for testing. (native-inputs `(("python-nose" ,python-nose) - ("python-mock" ,python-mock-2) + ("python-mock" ,python-mock) ;; For documentation ("python-sphinx" ,python-sphinx) ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) -- 2.13.3 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 16:08:15 2017 Received: (at 27888) by debbugs.gnu.org; 31 Jul 2017 20:08:15 +0000 Received: from localhost ([127.0.0.1]:35765 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGz8-0004r3-Rv for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:08:15 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:60301) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcGz2-0004pw-BZ for 27888@debbugs.gnu.org; Mon, 31 Jul 2017 16:08:08 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 4864820849; Mon, 31 Jul 2017 16:08:08 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 31 Jul 2017 16:08:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=uUVtPzOdablls8cvge LcMmGNwZXIq6kQ1TG6tSv6o1A=; b=P7zvzN5PxrZlC0uML20upahD0cL4wr6CgK hiHR7qajWZyOZvFk261iLnTTpqugw2NceDHFJUHqhmyXaJX0vFXT4qyhL9VP+bll V+mOv2eXUk1ru53c5BB8uzfwI5jnpzl8gQt426cDh+o58b9qH9yxIKh2Gs2TbVsk YB5TCejiKDqQev+VK/zx7VRmda/rMA0lZH8mR/1Tbsy6Ej5h+ovxPzJvIOo3vMRG gqEPm6Y9fu54g4ymdjLUnN9mU/DCkdj9TCK9Aaxam6Qel9+BESmBxVMprALzwo4F bR1zju7HPNIYy6vZpmhHHowi50hWRAe7wyMuSTlrpDgPGXIK8ONg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s= fm1; bh=uUVtPzOdablls8cvgeLcMmGNwZXIq6kQ1TG6tSv6o1A=; b=Q/nklV3B BkuA00fj2ak/L/tx0UpVyYv1ajQ61Hd+eKO2KAOXvagLwvRtpXY4o8Navikn68rz B06C4iyuxM5qA+NP/GGVaesMXAalkVnVHZ5/s9z12MGeFs1kuBMWoxKcTFl+XEwB Pgi+734y8cjRXMQLRSDLcmgHELt7RZ2obMqAxoTAVrW47gzYOySMXFltyf4Y99My jBpgjDh1Lq0NJ6BpXDW8zZ8H/CaNZk5aI8ZSg9sVNUKNvT9cX37jQcIuCFTqk8Hs cjSudAWne8ADdpz9YYDo94Xsuv/h6zHsy4wKEgFiL9NRbHHeHUSnckj4QRkFNNsf Rh2GvxuCGRj6lg== X-ME-Sender: X-Sasl-enc: 3NFqkHdX/LiMr8rkffPkWNElZaWNAHY8wblPdUiM3c1H 1501531687 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id D24C77E354; Mon, 31 Jul 2017 16:08:07 -0400 (EDT) From: Marius Bakke To: 27888@debbugs.gnu.org Subject: [PATCH 18/18] gnu: python-hypothesis: Update to 3.14.0. Date: Mon, 31 Jul 2017 22:07:35 +0200 Message-Id: <20170731200735.28019-18-mbakke@fastmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170731200735.28019-1-mbakke@fastmail.com> References: <20170731200735.28019-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/python.scm (python-hypothesis): Update to 3.14.0. [native-inputs]: Remove PYTHON-FLAKE8 and PYTHON-PYTEST. --- gnu/packages/python.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9a7f88c30..b32065f80 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9878,17 +9878,15 @@ Amazon Web Services (AWS) API.") (define-public python-hypothesis (package (name "python-hypothesis") - (version "3.1.0") + (version "3.14.0") (source (origin (method url-fetch) (uri (pypi-uri "hypothesis" version)) (sha256 (base32 - "0qyqq9akm4vshhn8cngjc1qykcvsn7cz6dlm6njfsgpbraqrmbbw")))) + "11q26a0j49hqw233gnvphlkin6piw2bpd0kji5zxr0980vl5rxvi")))) (build-system python-build-system) - (native-inputs - `(("python-flake8" ,python-flake8) - ("python-pytest" ,python-pytest-bootstrap))) + ;; FIXME: The PyPi release tarball does not contain tests. (synopsis "Library for property based testing") (description "Hypothesis is a library for testing your Python code against a much larger range of examples than you would ever want to write by hand. It’s -- 2.13.3 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 16:45:54 2017 Received: (at 27888) by debbugs.gnu.org; 31 Jul 2017 20:45:54 +0000 Received: from localhost ([127.0.0.1]:35794 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcHZZ-0005k4-P7 for submit@debbugs.gnu.org; Mon, 31 Jul 2017 16:45:53 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:42535) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcHZY-0005jw-7j for 27888@debbugs.gnu.org; Mon, 31 Jul 2017 16:45:52 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 0511D20A75 for <27888@debbugs.gnu.org>; Mon, 31 Jul 2017 16:45:49 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Mon, 31 Jul 2017 16:45:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=PLTXFpsXBLJ+hC8nZYFseRoGfRaG+yjXZUGV1k07K 9Q=; b=0PJYWNwHroX/vXJUyXTUfE7bURSvlDIW9vLhQzqwuNj5cbx7sYJFI7OOV WTxvhJBEH1hVL3Z68gSX+XoNWhb4J04hqROwkOltrNkAv8OdZTO/mwdacl4n1ZBj FUnZuBb3cEMBHidwml2DHWHjkjRpEO5FlCyKO2bY2krJFq5aTuRFWRJqDkt4rwQh xyjqIInC8Zx76J2QrgEdoaXwfboaRQp4ciQk13lkh/lciyVZw2ZxIA/6OQieCUQo qeBIRnMk1XsOTk/QFWZu5DCL7uyogeINZ2hmBkzA2bEOcx99BrioWvr0KbnXEMbP K0cBJpAANijBS41/bP3AXnLUxeeAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=PLTXFpsXBLJ+hC8nZY FseRoGfRaG+yjXZUGV1k07K9Q=; b=mNT9V2Bh4GdIHCq+49ESjZYyv/BYclZlW2 81bFGvxt2SgDFNNMl0hnHNXdfx6G6cCCGEAN/vfof3vm2VvvkcO01DrQv+d4vX7d BqZs3+KsV5BALGMaffcmS9OERQBbjRJmjZz1GLvyW+CTd5DdjN+s8MwqDTVWlKBg cDauei5zfrl5yzfQfaEz2qO1PVQ5i3TcDBRipVZN/UaQHs5PDVlzs5k5fcpbGEPR m3xyf46j6/I/NUyKEaetOGUY7DdAO2pumP7IaZV2H5M3ZuZ7jMpKh38lzcCiJ5Bz EMr/P/qDUg9rjFLKufQH/IhPUxC+p97HqCWnyrQsPSkJCEAbxBDg== X-ME-Sender: X-Sasl-enc: 7ewrFZokj4paWGCn0RbGpZ/WgeVcOWpG3/ay4EpzXONQ 1501533948 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 84E3E2464E for <27888@debbugs.gnu.org>; Mon, 31 Jul 2017 16:45:48 -0400 (EDT) From: Marius Bakke To: 27888@debbugs.gnu.org Subject: Re: [PATCH 17/18] gnu: python-mock: Make 2.0 the default package. In-Reply-To: <20170731200735.28019-17-mbakke@fastmail.com> References: <20170731200735.28019-1-mbakke@fastmail.com> <20170731200735.28019-17-mbakke@fastmail.com> User-Agent: Notmuch/0.25 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Mon, 31 Jul 2017 22:45:46 +0200 Message-ID: <878tj4xrlx.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain I've retitled this to 'gnu: Remove python-mock@1.' to be consistent with patch 04/18. Also +2 accuracy. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAll/lvsACgkQoqBt8qM6 VPoIZAf+P0gh/CcvDhQ0JcZ52RKuc0HgKZkkCfdwyp3N8YKgqDuqdG6EpJEU1oyW Ci+7lcvVB6627XQdSpHoAq/ujqhY2WfOK1Fx9VlU/tAiO43k3v79E9Dk8og5h7La Sr1rXYStePqCD/V6N3TKaOP9NAa94ZAfEj1dKeT21AC7DP5rXjogByTofwsQu9D8 O4uNAQu3xmKOHcCbnAdzL25W73FdiB/rERVON2WHjcQC7LuJ6/ySTEkJYsQ310Bs oaIrLxX2j9O/cgTMLD3F4+8Q33hMYpRiXWAde6tay1BfWmk6cytX/1JTAiJmixjN +7Yo91RRCUIhKF3EqsAIGWUHaYxgEg== =Rd8E -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 19:04:56 2017 Received: (at 27888) by debbugs.gnu.org; 31 Jul 2017 23:04:56 +0000 Received: from localhost ([127.0.0.1]:35861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcJk8-0000Xa-8V for submit@debbugs.gnu.org; Mon, 31 Jul 2017 19:04:56 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:47353) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcJk6-0000XR-Th for 27888@debbugs.gnu.org; Mon, 31 Jul 2017 19:04:55 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 6D2C020A80; Mon, 31 Jul 2017 19:04:54 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute4.internal (MEProxy); Mon, 31 Jul 2017 19:04:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=RrOxFcJ92Td60fBfrkZZL1TTg0rvKM785YNueB D00Pk=; b=IT1lgchF0lQAgMXwRtDKh3JZk2aMDv8KAmHFY5tiihTd5061GxKgha 9M0/UFqEqPfTCiDbfqrO4nySceFqiFy/MWw/d3JYU4udHnAuAguFaEPIifnInr5y dDZd/Hyc4v2mXFg2a0NY8k1e9DfTZBPQSFXDA7C3u0336Oe7yH8Gk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=RrOxFcJ92Td60fBfrk ZZL1TTg0rvKM785YNueBD00Pk=; b=eUWLPsc1H8xijFkjxIO4d+nMiLGFAVl/vk 0JRcIpCb73C8Sx0zytz8/p/ekozz6vh/Te4b868KvR2bhOQHR9Owqx3Rq04vSEw1 qkapqB1fWxxul9l1gy7L8v9gvHSaeIK1wlabgIwAMUlxTPrYxmcDsyWSzlCR0C0p ddg6Eg0AHQMnkTM5JGZC7V01Rc7y5HlJg8IhwGtDVo2+PsfE/gQcExQoGe18CjqU D851u6g/+oMGGAfbyrX5ELj623MkQt4927cOc2+zpGSvDlGfgWZiQu2AKwuLRwIF 5+Nvq+fTzHPIx67SGHjOkqHdGgKr6/4O0iFScmaMEJwYsaHOXAuw== X-ME-Sender: X-Sasl-enc: lAlFUA7ws5R4Jf78LT+HxnO6PXs1Vqg2AYcOPXwQKyuU 1501542294 Received: from localhost (c-73-165-108-70.hsd1.pa.comcast.net [73.165.108.70]) by mail.messagingengine.com (Postfix) with ESMTPA id 26856241DF; Mon, 31 Jul 2017 19:04:54 -0400 (EDT) Date: Mon, 31 Jul 2017 19:04:52 -0400 From: Leo Famulari To: Marius Bakke Subject: Re: [bug#27888] [PATCH 00/18] Python updates Message-ID: <20170731230452.GA11946@jasmine.lan> References: <20170731200413.27588-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="SLDf9lqlvOQaIe6s" Content-Disposition: inline In-Reply-To: <20170731200413.27588-1-mbakke@fastmail.com> User-Agent: Mutt/1.8.3 (2017-05-23) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 Cc: 27888@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --SLDf9lqlvOQaIe6s Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jul 31, 2017 at 10:04:13PM +0200, Marius Bakke wrote: > This is the beginning of a new 'python-updates' branch. It updates to > Python 3.6, as well as pulling in the latest versions of some popular > libraries (mostly the pytest closure). More to come! >=20 > 'python-pytest' gains a dependency on 'hypothesis' and 'setuptools_scm' > which complicates the dependency tree somewhat. Currently I'm working > around it by using a minimal 'python-pytest-bootstrap' variant in all > packages required for pytest itself. It works, for now, but don't tell > anyone that the tests for 'py' and 'setuptools_scm' are actually not > running and also require 'pytest'. >=20 > Not sure how to solve that one, but won't spend any more time on it > this round unless someone has strong objections/suggestions. It's not > like they are running tests now, anyway! Considering a new (gnu packages > python-bootstrap) module to make it more manageable in the long run. >=20 > The patches are on 'core-updates'. Feedback very welcome. I may or may > not improve bootstrapping comments and descriptions of new packages > before pushing ;-) Wow! Awesome, and thank you for putting this together. > If there is no feedback, I will push this to Savannah in a few days, > destroying the older 'python-updates' branch. That branch is super stale, time to cook up a new one :) > NB: The very last patch actually (inexplicably) breaks 'python-pytest' > and is included only for visibility. No idea what's up, yet. I was really not looking forward to dealing with this tangled mess, so I'm amazed that you got as far as you did. I think 17/18 is pretty good for this patch series ;) --SLDf9lqlvOQaIe6s Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAll/t5AACgkQJkb6MLrK fwgnJRAA0lVsw2YEi56TmN0iYDMEAYcdX6aaoQlI8I9Ey8MpEBLV7r/tS8dpP1SG jjKux/SAdvFFVh9eaCP/RseOJZOcvmAmG80XwFYbCPdnpH/N3MJylzqRr/2LP0cE 94krel5S4P3GJvqw3c6aP1x1e3GmK8stQEF8ToKfr00VCUYGOmShHnJD2TPxblCq EB2mSYRxbnDgYtsnitKHMMJRvW2dtqsm18E0uPopls1YzHzhO66ND0saA9J57rRK IqMpbh00AoBhEQbO8pPGTX8AjLtSU5nuiSe1YygpqrOEgekbsgZ82itn3MZFXtdV OID/tF5ykupEL4UrXPGNfiSUiTbamekMAdE+c5+ZU7UyGvGQsvdjmPuxTjGaVmae WZuajxJO1tTscZiP6Q6HXiDWcsrvwnB09f9G018+2LsMHEDnvhQU3uOBRmtrqBHE dokrTET4gTc/03qqsrkqVZRvZ+FIYQAEudYElRD1w5WvKtyLkDYimkXZAnqhUC3s lnfFE2NAVvtfKFnxFqs0QWknVsEZMZE9ZDrbXXj8eU8jL7DE8sa0yjQMuiZdRryb ffk6LRd+tbyujkhwjLSZHCqBHm9nWn2PDAQgUfcqSTh+H+Mi1ZoFHZeAsRRLjzSw beP5Ta1CIWISdW1y8BM9qZMqm/T4TjpGWjnzLNro7xqBXeu6trk= =la0y -----END PGP SIGNATURE----- --SLDf9lqlvOQaIe6s-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 19:07:02 2017 Received: (at 27888) by debbugs.gnu.org; 31 Jul 2017 23:07:02 +0000 Received: from localhost ([127.0.0.1]:35866 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcJmA-0000av-Kw for submit@debbugs.gnu.org; Mon, 31 Jul 2017 19:07:02 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:54605) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcJm9-0000ab-M2 for 27888@debbugs.gnu.org; Mon, 31 Jul 2017 19:07:01 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 8F66920AB2; Mon, 31 Jul 2017 19:07:01 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Mon, 31 Jul 2017 19:07:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=JG+SppkK5dKLlKGIbRBvgv5hsV4gpIae2kSlLK UyHYQ=; b=Vtez1Fbzx7ejtBGwCQlv9aRy3oIkUECzqyngbobhoam4PysHWesL8v /yAHlFiljOW3wobzp+QXOJIicDpFCUrizT17RzLLuiAN55fXwU04DEDNn0LS2tHe i0S/P1GrnaOGmiN604yFhSlEPjE8lpngp7ZkFOglQpHWqFp6Cw3to= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=JG+SppkK5dKLlKGIbR Bvgv5hsV4gpIae2kSlLKUyHYQ=; b=f50URbVpHJmeOEESRaoFXJMLCqW7o7Ow8u ZeKb24yP9sLxt59nOdgV9nRM+hzL/BRZ+1cA0L4ofwsTcFM3EN19Wei0yyaxqLoQ X152y5WuiQX1P/PD5c7H5OtKRwqttRzNet859T9VhuQO2LvwtvZJWqvSMxr+aB8b XPFssxsgVzLwC5xL4G7eBscBUmQmAsriSR6NwDRcAkFnCiVbZe7dKhExgr5kSW4x EoZruB5DbyqGbzU8mRyUYoEhkFqNn4VFMRUP+qzj63FiV6SjO4a6paJn4eULr4ao i6UdQ6LfflYVl1IVOpY7Iuwce4ZuxOCM3YRYOEA4BIPg0Nx3yf8w== X-ME-Sender: X-Sasl-enc: UvosnFHgQ3A8PmhHl14SNyfjNXmtbuDizw81K3Rr8D/Z 1501542421 Received: from localhost (c-73-165-108-70.hsd1.pa.comcast.net [73.165.108.70]) by mail.messagingengine.com (Postfix) with ESMTPA id 1606B7E1BE; Mon, 31 Jul 2017 19:07:01 -0400 (EDT) Date: Mon, 31 Jul 2017 19:07:00 -0400 From: Leo Famulari To: Marius Bakke Subject: Re: [bug#27888] [PATCH 01/18] gnu: python@3: Update to 3.6.2. Message-ID: <20170731230700.GB11946@jasmine.lan> References: <20170731200735.28019-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="IrhDeMKUP4DT/M7F" Content-Disposition: inline In-Reply-To: <20170731200735.28019-1-mbakke@fastmail.com> User-Agent: Mutt/1.8.3 (2017-05-23) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 Cc: 27888@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --IrhDeMKUP4DT/M7F Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, Jul 31, 2017 at 10:07:18PM +0200, Marius Bakke wrote: > * gnu/packages/patches/python-3.5-fix-tests.patch: Rename to ... > * gnu/packages/patches/python-3-fix-tests.patch: ... this. Adjust and disable > more tests. > * gnu/packages/patches/python-3.5-getentropy-on-old-kernels.patch: Delete file. I'm curious, do you know if they handled this issue upstream in a reliable way, or is getentropy() simply unused in Python 3.6? Also, do you have any idea about the state of the bytecode timestamp issue, which is related to the problem with the bytecode cache? I can work on that on python-updates when you push it. --IrhDeMKUP4DT/M7F Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAll/uBMACgkQJkb6MLrK fwjEmg//RkxYYCw/DOwRl6mkK9W7q8Ma7ylZIXQtC2Mn70W/Fk4AWpsAg4RHqXT4 hu876SRSLqLTq15wqjwbN5VOY0WeFHoNTN/XNIQEnp5gKZ1nUg5xtdckUbz8D8qf ++ZHD/zQ79dKAD7FdTMQCCibwkaLETO7dDXRxdKDJMpsfw0q3ZFOWvo9KAPZxRI1 QArgvVs6u3v9uAeAPnRbMt1Q5ZnJtAlqQdLQaWJfqkD6nCBFXe6y08rIHBYHREDc QCnakQwX4qtyWjuFlLQ2tAXAaHvGEj0hi8zBpiUNQWxiF2XjGR2WLT0HkHeIebyg QR/GVEFjHZkbWBvnnuyb0KQGGEHqVLK9FqS5N6p02DaTO3hKHOh4G4YjJkAaR+UQ 0fAfXcn1oPTXJmOGVjpbHdgzosBFB3M+YchHLhc8FVQdvCEC7Y5dGfVQCW9kCw2M TIV1kQBVmwK2OKRqmwyl9/4bHOe4gakTU36ORzQALksqrTzzTHmozXyyCT3fbuwE NlxnDVe8sztnAW458ow02cejZU0rKncT5Xsqt+xCqnoJXrxe7hb6dnqPQUX2AVlP YTytKg7TvPdcfeK76735G3bOkzRkaSNa03AvMslF9QFgwP29bLRmJSLUSCQyH1OS sfbsDhyArhE0gp1PEfDhnSXIyzDxIjqQ+Sjd/iMWylUU3dPB2XM= =Z9Xz -----END PGP SIGNATURE----- --IrhDeMKUP4DT/M7F-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 31 20:30:39 2017 Received: (at 27888) by debbugs.gnu.org; 1 Aug 2017 00:30:39 +0000 Received: from localhost ([127.0.0.1]:35914 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcL55-0002V7-Bv for submit@debbugs.gnu.org; Mon, 31 Jul 2017 20:30:39 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:60499) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcL53-0002Uy-Dt for 27888@debbugs.gnu.org; Mon, 31 Jul 2017 20:30:37 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id D842F207E5; Mon, 31 Jul 2017 20:30:36 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 31 Jul 2017 20:30:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=QQeup9Y6FG/F6vt0YMDjAkyFY9LiJaBTWadbT1G11 y4=; b=3cfpjLTZzxsKtDvIj08u66GS4OVah7yEbGZX2NeSzY7XA4KmixynwUfQ9 qkUEJfj0+6mbASCZhYAKCtoapGqwy+FeQ1oETrA3vABjS7oz6/I8SmSNIZqS/CtF +NfzEjmh40o4uLa+okIJB+knwe0xFwU2JpjfNWSM2VrEeFilXqfH1k0cy3tHHCDR YJrj6elzwD6XhN3nt61F48rVYmy2nA3Q2S3yAnnmAxAziq94Fkt640HuzL6QjxmJ tDMBu0UE4Obu59eV8K1mfReQvCMJhLQ7QNclgVo+It4n5XtXa08QCb3yG3f+zlka ruN69tpDSzunMl3PldDioIDLoVorw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=QQeup9Y6FG/F6vt0YM DjAkyFY9LiJaBTWadbT1G11y4=; b=GJNHxEqEaVstSFp1EkzA95KPux2RYu4kzB XckVkp8xRcWWvTZ23bkuSfVUmDrMbuNo2EeJySSdazelKI3VSPe1FGc2x3iko9W8 zfoSMYRWhjXxjjsX08c1BoODHZYK8MuaBKAz+vKUBVMD2qwzwZUtW5RaG401hGY8 koIoTAGrpvaVND3/xZdrRVfGqcjmq0H9GadUBjq9w5ErHuGZXIyz/o0gIs/djBZD pP87R3sZGKYXuck2NbkXaC2cxXjcPbDxkBvSXMX2QDIiCxwHvAHU8cVIlzxnWxNe FbzEpSOVGAKO7oYd8QwFzqM7m+idtiWvmYnpV6UNZnmtay0dclXg== X-ME-Sender: X-Sasl-enc: nzJX1m3nDW238YHOH6uXuUucmLcJZ0lt56dVzzPMsXcU 1501547436 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 6F18F7E12A; Mon, 31 Jul 2017 20:30:36 -0400 (EDT) From: Marius Bakke To: Leo Famulari Subject: Re: [bug#27888] [PATCH 01/18] gnu: python@3: Update to 3.6.2. In-Reply-To: <20170731230700.GB11946@jasmine.lan> References: <20170731200735.28019-1-mbakke@fastmail.com> <20170731230700.GB11946@jasmine.lan> User-Agent: Notmuch/0.25 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Tue, 01 Aug 2017 02:30:34 +0200 Message-ID: <87zibkw2mt.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 Cc: 27888@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Leo Famulari writes: > On Mon, Jul 31, 2017 at 10:07:18PM +0200, Marius Bakke wrote: >> * gnu/packages/patches/python-3.5-fix-tests.patch: Rename to ... >> * gnu/packages/patches/python-3-fix-tests.patch: ... this. Adjust and di= sable >> more tests. >> * gnu/packages/patches/python-3.5-getentropy-on-old-kernels.patch: Delet= e file. > > I'm curious, do you know if they handled this issue upstream in a > reliable way, or is getentropy() simply unused in Python 3.6? The getentropy fix for 3.5 was a port of "random.c" from 3.6 + the fix % 3.5 specific behaviour. Since 3.6.2 was just released it should have it. Most hunks are there, but didn't verify all. > Also, do you have any idea about the state of the bytecode timestamp > issue, which is related to the problem with the bytecode cache? I can > work on that on python-updates when you push it. Yes. You might have seen this: https://github.com/NixOS/nixpkgs/pull/25916 NixOS patches the interpreter to unconditionally set bytecode timestamps to epoch 1. Now I also found this: https://github.com/python/cpython/pull/296 So I think we only need that patch and to set PYTHONHASHSEED to some deterministic value in python-build-system.=20 I can give it a go next weekend if you're busy, but more than happy to share the workload :-) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAll/y6sACgkQoqBt8qM6 VPpd5QgAlgkwuuOH4JzrrKpUHaaFVAN6ibHfcdCjidFvEFa8WrsHFLdW/fF1NnyI KspIj+LUMmsmL+M5pyLaSzQ+A0i7f2c949e/BV8AfkccDfib80h8UtvHobssm+ZU RhMPk2XS4HIN94f4xz6vKuplLg/A3Ywddf/SVmcsua2Pdm3MyG2IwiQhz/kLayZ0 RGcMQ1rzsUKhpBDW2Pi83vj4LY7Nur1At9/Xot672jIQ1bnQCLaJrNDAGnuFcomi 64AcZ9BdqfxsOfPf1f1Yjf88jZ+yak3aG51oIfeRLFaLtLpvUT2JJXCXTsTqSc4X TqChpFb2Did4dnW5+jNRa2MErfuDYQ== =d9jM -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 18 17:18:19 2017 Received: (at 27888) by debbugs.gnu.org; 18 Oct 2017 21:18:19 +0000 Received: from localhost ([127.0.0.1]:48748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e4vjF-0000Y7-Qd for submit@debbugs.gnu.org; Wed, 18 Oct 2017 17:18:18 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e4vjD-0000Xx-Nd for 27888@debbugs.gnu.org; Wed, 18 Oct 2017 17:18:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1508361478; s=zoho; d=elephly.net; i=rekado@elephly.net; h=References:From:To:Cc:Subject:In-reply-to:Date:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-ID; l=1640; bh=FGbHM4O6QiEL3nSOhktbGBTBplM1JlqXpoFvkHn7o20=; b=hVqcrAVxDlHU+OTmTBMfMn95bX97hu3YclUojUMG5ncAN+UDNnOVwPExfZdSS8Lg +kUZV/6BDI0hO0ER/WD6KraoxHV8nu9YOKwsxgENZk2RfmYLnjwiMpGEQF4e7Z/HhlS zaG7faOI/CDZ6KGZk54wI/r95GsLcy7HHHI5JpkE= Received: from localhost (port-92-200-55-161.dynamic.qsc.de [92.200.55.161]) by mx.zohomail.com with SMTPS id 1508361478233775.206102790294; Wed, 18 Oct 2017 14:17:58 -0700 (PDT) References: <20170731200735.28019-1-mbakke@fastmail.com> <20170731230700.GB11946@jasmine.lan> <87zibkw2mt.fsf@fastmail.com> User-agent: mu4e 0.9.18; emacs 25.3.1 From: Ricardo Wurmus To: Marius Bakke Subject: Re: [bug#27888] [PATCH 01/18] gnu: python@3: Update to 3.6.2. In-reply-to: <87zibkw2mt.fsf@fastmail.com> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Wed, 18 Oct 2017 23:17:55 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Message-ID: <874lqw40l8.fsf@elephly.net> X-ZohoMailClient: External X-Spam-Score: -2.8 (--) X-Debbugs-Envelope-To: 27888 Cc: 27888@debbugs.gnu.org, Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.8 (--) Hi Marius and Leo, > Leo Famulari writes: > >> On Mon, Jul 31, 2017 at 10:07:18PM +0200, Marius Bakke wrote: >>> * gnu/packages/patches/python-3.5-fix-tests.patch: Rename to ... >>> * gnu/packages/patches/python-3-fix-tests.patch: ... this. Adjust and d= isable >>> more tests. >>> * gnu/packages/patches/python-3.5-getentropy-on-old-kernels.patch: Dele= te file. >> >> I'm curious, do you know if they handled this issue upstream in a >> reliable way, or is getentropy() simply unused in Python 3.6? > > The getentropy fix for 3.5 was a port of "random.c" from 3.6 + the fix % > 3.5 specific behaviour. Since 3.6.2 was just released it should have > it. Most hunks are there, but didn't verify all. > >> Also, do you have any idea about the state of the bytecode timestamp >> issue, which is related to the problem with the bytecode cache? I can >> work on that on python-updates when you push it. > > Yes. You might have seen this: > > https://github.com/NixOS/nixpkgs/pull/25916 > > NixOS patches the interpreter to unconditionally set bytecode timestamps > to epoch 1. Now I also found this: > > https://github.com/python/cpython/pull/296 > > So I think we only need that patch and to set PYTHONHASHSEED to some > deterministic value in python-build-system.=20 > > I can give it a go next weekend if you're busy, but more than happy to > share the workload :-) I hope you don=E2=80=99t mind me asking: is there any progress here? Anyth= ing blocking that I could help with? --=20 Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 18 18:30:46 2017 Received: (at 27888-done) by debbugs.gnu.org; 18 Oct 2017 22:30:46 +0000 Received: from localhost ([127.0.0.1]:48805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e4wrO-0006Ex-1S for submit@debbugs.gnu.org; Wed, 18 Oct 2017 18:30:46 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:44779) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e4wrM-0006Ep-Oa for 27888-done@debbugs.gnu.org; Wed, 18 Oct 2017 18:30:45 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 5E65C20D47; Wed, 18 Oct 2017 18:30:44 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Wed, 18 Oct 2017 18:30:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=iU4V58uNcx6Qe9y3whODkh549oq/fEvaiOpcC2Y6+ms=; b=o3Xc27gR ZsrgavmHoTKOYTQk8SJJmUZx/MO52hRHxc1c1XojuWQgdaggxAMLUxoU0/CGLwpx WYK/choa8GKnKZ/eQZtRa5x4JlrtmJ1gTcEc1HJpZAqMDy7gkxWHWrz8LEfwPLac L8cWXb8yNkXIYOEzE90xnOUYdBllH4YUBGGO6zJIvitnEQqaZMnw4KkTv3h6/J/v 403FutaU59oBiGMJ21IWfO4cshIZMerXnO4fIHObvsWcbYXpsV5LKft1zluFCWCS v34m9Japzgz/btDAverKn6noRCnLCzePRJkpD5VOud4O/Cp4YOcCMvxzsp4HLjqb E6+W78FWzHGK1g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=iU4V58uNcx6Qe9y3whODkh549oq/f EvaiOpcC2Y6+ms=; b=YzCp6zRDrChhaYoIemLN78ozvZ2N33RzEd5t7XdBfZthv 36fOD4OJlNvQHaHFphW1PDjyINd/Ci4zDcNlLV0SEkLh5A/QxlO7mDoeJeKJmvBA TU9vOgWUeUlvMHnvVepuXMzjrsPNI+xHBbd4BX0KZohNDJbeZOYqySFi8tQ37VC1 xktIqrAizBnqvwWzO0wDjYq1V5iaW4LXhDCGEMILKqeW5UvLYKK56m4b3hQDXXF6 WB2Wav0Nbhf/zP7hEShKCfHM+CootYWNu72LFrDnvU/aioWWvyb4hJTPhnQvJf0x gBJ5BGZdj7vDV6tYErUG09Jh6uXL6k/GkU+TL4/iQ== X-ME-Sender: Received: from localhost (cm-84.214.173.174.getinternet.no [84.214.173.174]) by mail.messagingengine.com (Postfix) with ESMTPA id D9E1924787; Wed, 18 Oct 2017 18:30:43 -0400 (EDT) From: Marius Bakke To: Ricardo Wurmus Subject: Re: [bug#27888] [PATCH 01/18] gnu: python@3: Update to 3.6.2. In-Reply-To: <874lqw40l8.fsf@elephly.net> References: <20170731200735.28019-1-mbakke@fastmail.com> <20170731230700.GB11946@jasmine.lan> <87zibkw2mt.fsf@fastmail.com> <874lqw40l8.fsf@elephly.net> User-Agent: Notmuch/0.25.1 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) Date: Thu, 19 Oct 2017 00:30:42 +0200 Message-ID: <87r2u05bsd.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888-done Cc: 27888-done@debbugs.gnu.org, Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ricardo Wurmus writes: > Hi Marius and Leo, > >> Leo Famulari writes: >> >>> On Mon, Jul 31, 2017 at 10:07:18PM +0200, Marius Bakke wrote: >>>> * gnu/packages/patches/python-3.5-fix-tests.patch: Rename to ... >>>> * gnu/packages/patches/python-3-fix-tests.patch: ... this. Adjust and = disable >>>> more tests. >>>> * gnu/packages/patches/python-3.5-getentropy-on-old-kernels.patch: Del= ete file. >>> >>> I'm curious, do you know if they handled this issue upstream in a >>> reliable way, or is getentropy() simply unused in Python 3.6? >> >> The getentropy fix for 3.5 was a port of "random.c" from 3.6 + the fix % >> 3.5 specific behaviour. Since 3.6.2 was just released it should have >> it. Most hunks are there, but didn't verify all. >> >>> Also, do you have any idea about the state of the bytecode timestamp >>> issue, which is related to the problem with the bytecode cache? I can >>> work on that on python-updates when you push it. >> >> Yes. You might have seen this: >> >> https://github.com/NixOS/nixpkgs/pull/25916 >> >> NixOS patches the interpreter to unconditionally set bytecode timestamps >> to epoch 1. Now I also found this: >> >> https://github.com/python/cpython/pull/296 >> >> So I think we only need that patch and to set PYTHONHASHSEED to some >> deterministic value in python-build-system.=20 >> >> I can give it a go next weekend if you're busy, but more than happy to >> share the workload :-) > > I hope you don=E2=80=99t mind me asking: is there any progress here? Any= thing > blocking that I could help with? Hello! I just pushed a rebased version of this branch to a new 'python-updates' branch on Savannah, with Python 3.6.3 and 2.7.14. I also have an update for 'python-hypothesis' coming, probably this weekend. Wrt the reproducibility patch, I've tried to cherry-pick but got a couple of new test failures. I have been really busy lately and got an injury to boot, so my work capacity is limited and any help very welcome. Closing this bug since the patches are "out there", but feel free to continue the discussion. I don't expect a lot of problems due to this update, so we can probably handle it on 'core-updates'. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlnn1hIACgkQoqBt8qM6 VPr14wgAyvf0USOjJk3Zk6jUd40W0u9yMs65qOD6RdFMUEvPlgpPqGFQIalh7dSD lo9tMxEAT1VFr6LI07w3E24g7AwTAbgrVX8Dn7DN4xtYs02WYrIWNDvMde4cBysA ISbpNYX2HF7PkZrJzbLM0pGTkuZ5cjTKRz5glSTj1iP9Dr7xklMceM/iNfKSxc5c UdcveLH0cq38ynDaYw4eAv3hSWybpq6pB+kul7VIJk8L364IYRCOQnTQsFRbY8BY WtJ7QcKfLyZjOtOZ1SBG8ZEPdbRIvS11TMeMo7XD13oheACSoXhDaBVBk4aVy02o OhlLTlFVYIwdSn1x8+JkgxmyleQuXA== =1wPO -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 18 19:37:11 2017 Received: (at submit) by debbugs.gnu.org; 18 Oct 2017 23:37:11 +0000 Received: from localhost ([127.0.0.1]:48867 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e4xtd-0007yw-Bd for submit@debbugs.gnu.org; Wed, 18 Oct 2017 19:37:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58965) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e4xtb-0007yg-9W for submit@debbugs.gnu.org; Wed, 18 Oct 2017 19:37:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4xtS-0002hW-0C for submit@debbugs.gnu.org; Wed, 18 Oct 2017 19:37:01 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:39481) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e4xtR-0002gY-SI for submit@debbugs.gnu.org; Wed, 18 Oct 2017 19:36:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4xtH-0001ya-Bq for guix-patches@gnu.org; Wed, 18 Oct 2017 19:36:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4xtD-0002aP-Eg for guix-patches@gnu.org; Wed, 18 Oct 2017 19:36:47 -0400 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]:50769) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4xtD-0002Yc-2U for guix-patches@gnu.org; Wed, 18 Oct 2017 19:36:43 -0400 Received: by mail-wm0-x22e.google.com with SMTP id u138so12718903wmu.5 for ; Wed, 18 Oct 2017 16:36:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to; bh=lZFTuF1YNYgTRFtpyx+LiitnyLntbuk57Fcw2TGd7ms=; b=Nn5ijc6AoUmEi4GGsdSyX3Qu8nOmevqHJuIzvo+MoPLpYqsF04i45AgZGlA5hZEEjp KeTPO8MMgaRcFnfF96FdFYyXBxGZ89jkWSahHhG0pHSjdclfUu2W/mrmno7kRKAToREI +45nzQtdgEa+6+UF+FrZ7Q9XSItjS++pLfZiUEtvlMg9HtgxGgrHRFZ/UeaThc27QYfg 7hC215oYXQXfTGSrJKi0dmvoiv3rx5kcVmXdzaPtYxTZ0CZbwl/XBF620bYsFlYC8HL5 UyIxK365fD+DM4Jf6bfvKMDG58s71ENKEPRnpUjAfEPvHPbzy7MXoxak+/RpDpbARJHl k+Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to; bh=lZFTuF1YNYgTRFtpyx+LiitnyLntbuk57Fcw2TGd7ms=; b=DWob96YAFCxDJZcbRXv+isHNmExoIu+LMNq3rzBiVZBYOwqpiUb2ETMpnHFoW9JtrJ tNfznsoveADiJayd4I2RKZRwrmmUZ1exk7d0o2LG2TcRCJEX2+I4m9ZKRsWQTgv34gnF PO8O+KDTUOfJBYzmCwIOml2z5omd5z+52Xtih9Yp3gWIbV4elNcFH/X45lHBMgdU0JfW paW/1uk2gKURMDNat08H6N10tXzytCjMaMBEm8PHfw/dzd9gm1pW+wausEysSc5KjkLx QUa0klShljhhxiOKuCc4Oenzg0vcnaqOEd3Hg7FpL46Y6XRZv4WiQCLr82y0IBMFaOez GlHA== X-Gm-Message-State: AMCzsaUTEvPeeFPsZhJKn427gWpWsDmJKPzD05VhUBGLu1hX0HMJqTIk kU0DIALRdlDMa3egIVmHLXFRxQ== X-Google-Smtp-Source: ABhQp+SB3w8IaJG2PR7/n9JePn92tGiaPXf0RUXypM9N2PAYq0SqsmR2613YKix/C90OlhXM4URuAg== X-Received: by 10.28.181.2 with SMTP id e2mr34365wmf.81.1508369800223; Wed, 18 Oct 2017 16:36:40 -0700 (PDT) Received: from [192.168.0.10] (tal33-3-82-233-82-24.fbx.proxad.net. [82.233.82.24]) by smtp.googlemail.com with ESMTPSA id e8sm130583wmc.46.2017.10.18.16.36.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Oct 2017 16:36:38 -0700 (PDT) Subject: Re: bug#27888: [PATCH 01/18] gnu: python@3: Update to 3.6.2. To: guix-patches@gnu.org References: <20170731200735.28019-1-mbakke@fastmail.com> <20170731230700.GB11946@jasmine.lan> <87zibkw2mt.fsf@fastmail.com> <874lqw40l8.fsf@elephly.net> <87r2u05bsd.fsf@fastmail.com> From: Cyril Roelandt Message-ID: Date: Thu, 19 Oct 2017 01:36:19 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <87r2u05bsd.fsf@fastmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="IdoVGhehwACriWDaHVfRC0HqB2BvIfLrm" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --IdoVGhehwACriWDaHVfRC0HqB2BvIfLrm Content-Type: multipart/mixed; boundary="UcUw5bjQfOLfAv2mcLdSvb86DaodinnGi"; protected-headers="v1" From: Cyril Roelandt To: guix-patches@gnu.org Message-ID: Subject: Re: bug#27888: [PATCH 01/18] gnu: python@3: Update to 3.6.2. References: <20170731200735.28019-1-mbakke@fastmail.com> <20170731230700.GB11946@jasmine.lan> <87zibkw2mt.fsf@fastmail.com> <874lqw40l8.fsf@elephly.net> <87r2u05bsd.fsf@fastmail.com> In-Reply-To: <87r2u05bsd.fsf@fastmail.com> --UcUw5bjQfOLfAv2mcLdSvb86DaodinnGi Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 10/19/2017 12:30 AM, Marius Bakke wrote: > I just pushed a rebased version of this branch to a new 'python-updates= ' > branch on Savannah, with Python 3.6.3 and 2.7.14. I also have an updat= e > for 'python-hypothesis' coming, probably this weekend. Do you wish to push the python-hypothesis update to core-updates as well? I have the following patch ready to be pushed: --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10150,9 +10150,9 @@ seamlessly into your existing Python unit testing work flow.") (let ((hypothesis (package-with-python2 (strip-python2-variant python-hypothesis)))) (package (inherit hypothesis) - (native-inputs + (propagated-inputs `(("python2-enum34" ,python2-enum34) - ,@(package-native-inputs hypothesis)))))) + ,@(package-propagated-inputs hypothesis)))))) (define-public python-pytest-subtesthack (package I need this to be able to upgrade python-chardet. Do you mind if I push this patch to master first? Regards, Cyril. --UcUw5bjQfOLfAv2mcLdSvb86DaodinnGi-- --IdoVGhehwACriWDaHVfRC0HqB2BvIfLrm Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQJHBAEBCAAxFiEETibM6VeOCCiYVb3UHHmV0tWjgzYFAlnn5X4THHRpcGVjYW1s QGdtYWlsLmNvbQAKCRAceZXS1aODNvJgEACGlAWSwtz8x06yRmJdQ13PSOeERYtO l8P6fE/fgO8OkEjp9TIF+uqKqTTXDIj3mHE2F+mIEdeEUonl30i3DKNrSoZv0fMe ZsK0uWnqY8R7m909zJhoque6MTDuAiQ+vIHf2TgN96NnI5qBX/pOm36RFPMpshHH CoKAv+dVZV/o/ne7Fx6XW6wmvprJFbcXpZpWZPzrxMYF5R6Gvjgo2TyPmGwZ7Ahx e3Ye6qzr8kzlqxCJIDxEjKi7QbeW9BWUqTAHjuR/8v6t8rDjLwdVBYON6DWqRlvV jy2an6CUAim2yuD3OsUwJoYKcDhG6JDv3z9hu7KSKsnTPuWWCzE16TL28uqgWgOc 1iBWBdH0+OSEbdhjTS1rbs5QAESJEhR0fd6Xsc8WZz1cufM41tDDTRzcjWT5IXHD sFRPGHWV9D0K7ZSvFwRvNF9aQZ4JLXgqc9UwZLsOkvdTKfa9dNqMXKxD6vL2odIz EZrGwy1Wg84t7wRPqWgaI3VBd1bWEaoox8Svl7TTVs95afJd58zHynvyyETJ0ElF mUM33tg6dEQVDsJxAYPgSRAcO8w9jF+UUe52ldEjMFDsppUdFWTzjNYZcUl4gt7Z oNNPA7p8fcoADkmuG/qRH8Y89C+w/jseoL4g+fjZGlRKwQt07jwypOa7ky6KQMcP G/kzt+RLDORW7g== =B3vf -----END PGP SIGNATURE----- --IdoVGhehwACriWDaHVfRC0HqB2BvIfLrm-- From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 19 11:46:15 2017 Received: (at 27888-done) by debbugs.gnu.org; 19 Oct 2017 15:46:15 +0000 Received: from localhost ([127.0.0.1]:50561 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e5D1T-0004Oz-8N for submit@debbugs.gnu.org; Thu, 19 Oct 2017 11:46:15 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21147) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e5D1Q-0004Op-KV for 27888-done@debbugs.gnu.org; Thu, 19 Oct 2017 11:46:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1508399911; s=zoho; d=elephly.net; i=rekado@elephly.net; h=References:From:To:Cc:Subject:Message-ID:In-reply-to:Date:MIME-Version:Content-Type:Content-Transfer-Encoding; l=688; bh=pXh6Xv7T3DX7CYkFz87SrMP7qeeK7LgexQNUSWtHV0Q=; b=iN2GFzMFhwP1AMX7HpRt6WWc6/uQr3U8GFIit6bW+wfA/UGve0lNVp/E2ZWCSKB0 c1gz/hDWisz+3usxyLlWC23P+oRVtY6JERO7BmavvRh3389v1zo3FKmzhYv0UEmEMCc 9NBQQPEKiUoGIjhIHood0rCpbXxbo7zFnd8VzeGM= Received: from localhost (port-92-200-59-10.dynamic.qsc.de [92.200.59.10]) by mx.zohomail.com with SMTPS id 1508399911050940.029075108278; Thu, 19 Oct 2017 00:58:31 -0700 (PDT) References: <20170731200735.28019-1-mbakke@fastmail.com> <20170731230700.GB11946@jasmine.lan> <87zibkw2mt.fsf@fastmail.com> <874lqw40l8.fsf@elephly.net> <87r2u05bsd.fsf@fastmail.com> User-agent: mu4e 0.9.18; emacs 25.3.1 From: Ricardo Wurmus To: Marius Bakke Subject: Re: [bug#27888] [PATCH 01/18] gnu: python@3: Update to 3.6.2. Message-ID: <87k1zr37td.fsf@elephly.net> In-reply-to: <87r2u05bsd.fsf@fastmail.com> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Thu, 19 Oct 2017 09:58:27 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -2.8 (--) X-Debbugs-Envelope-To: 27888-done Cc: 27888-done@debbugs.gnu.org, Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.8 (--) Hi Marius, > I just pushed a rebased version of this branch to a new 'python-updates' > branch on Savannah, with Python 3.6.3 and 2.7.14. I also have an update > for 'python-hypothesis' coming, probably this weekend. That’s great! Thank you! > Wrt the reproducibility patch, I've tried to cherry-pick > but got a couple of new > test failures. I have been really busy lately and got an injury to > boot, so my work capacity is limited and any help very welcome. I’ll take a look at this. I wish you a speedy recovery. Take care! -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 19 14:16:02 2017 Received: (at 27888) by debbugs.gnu.org; 19 Oct 2017 18:16:02 +0000 Received: from localhost ([127.0.0.1]:50689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e5FMQ-0001sB-4y for submit@debbugs.gnu.org; Thu, 19 Oct 2017 14:16:02 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:59221) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e5FMO-0001rs-Vp for 27888@debbugs.gnu.org; Thu, 19 Oct 2017 14:16:01 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 7E24520C5F; Thu, 19 Oct 2017 14:15:59 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Thu, 19 Oct 2017 14:15:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=mVKS3OkBEO8hWn7N/3SsWuuVWmhFrRWER4L6oF9fI+4=; b=BQppJfqd G3NWV0tPeMB996EtrCfESOhIjWrtopZHlfrvfA9JnUbdL6fJOMV/X5RRRB+cc/of sS13QezBsfKb/5q2bU+EzZva++4RhQY1mea0V6BmJbBzMBx77pCBckyVtLfdZKpQ nI9yPBVUa/iWU1gb8mZfDqPRNfH1th8ftnycoAMEQfxg4VjBtjrLR0TJ7R1CFDq/ z7rsi++4ZqtstsWsMbCm45Vh+MIBfCp/GJ5QHLvEIkOCy0VUZqKWKK3z1708HDzv 2zGMQ1qAFfrq0AilUwFzS9pdu1bNMOtgP2B6VeDAaufqmmvsGbx95zpSWS9wm0tc k5cBuhOLfSjDJg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=mVKS3OkBEO8hWn7N/3SsWuuVWmhFr RWER4L6oF9fI+4=; b=a1vuLwr5OSDGslN2YRhnUU5MMsHK+SV2tyqt6BawLV4bX rXQIBwT+6JNvAx0Ci4NZqlwgYqbVGH6tg+Hzxav9wkXMytMCFc3hqd6c92l++atF fvJlgEF/gAARVI2l871EPwGroDdUuRhTYyf+ZSYWvOS2blzyJJdbevO93pFBQ7bx gbeP3cS3HCZHPaScKFMbLrBwwhGc1+sRLkhyXUm4MMIADFR7SsXja9blmAS37Q2c zMR2HRxB+R0yxHeWNwmILfzsxqRVGbXAjmEUuLD+drsxuJYqH3tX1Xr9NqmFDMYR bAhiMcgzU9QQOx17W8V15Yb0ENvZ/vyGeCfzs3OOw== X-ME-Sender: Received: from localhost (cm-84.214.173.174.getinternet.no [84.214.173.174]) by mail.messagingengine.com (Postfix) with ESMTPA id ED66F7E3E0; Thu, 19 Oct 2017 14:15:58 -0400 (EDT) From: Marius Bakke To: Cyril Roelandt , 27888@debbugs.gnu.org Subject: Re: [bug#27888] [PATCH 01/18] gnu: python@3: Update to 3.6.2. In-Reply-To: References: <20170731200735.28019-1-mbakke@fastmail.com> <20170731230700.GB11946@jasmine.lan> <87zibkw2mt.fsf@fastmail.com> <874lqw40l8.fsf@elephly.net> <87r2u05bsd.fsf@fastmail.com> User-Agent: Notmuch/0.25.1 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) Date: Thu, 19 Oct 2017 20:15:56 +0200 Message-ID: <87lgk757hf.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27888 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Cyril Roelandt writes: > On 10/19/2017 12:30 AM, Marius Bakke wrote: >> I just pushed a rebased version of this branch to a new 'python-updates' >> branch on Savannah, with Python 3.6.3 and 2.7.14. I also have an update >> for 'python-hypothesis' coming, probably this weekend. > > Do you wish to push the python-hypothesis update to core-updates as > well? I have the following patch ready to be pushed: > > --- a/gnu/packages/python.scm > +++ b/gnu/packages/python.scm > @@ -10150,9 +10150,9 @@ seamlessly into your existing Python unit > testing work flow.") > (let ((hypothesis (package-with-python2 > (strip-python2-variant python-hypothesis)))) > (package (inherit hypothesis) > - (native-inputs > + (propagated-inputs > `(("python2-enum34" ,python2-enum34) > - ,@(package-native-inputs hypothesis)))))) > + ,@(package-propagated-inputs hypothesis)))))) > > (define-public python-pytest-subtesthack > (package > > > I need this to be able to upgrade python-chardet. Do you mind if I push > this patch to master first? Not at all; go ahead :) I have this in my queue as well, so LGTM! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlno69wACgkQoqBt8qM6 VPpHHAf9H6toVomvaKUBEP5r1tDd23VyhWi6JOnwnS0APY8/aBIS7FjRZc43xQca A3X9N7J0jsN+tBBFai1OeeWUyrSygFgCnsCSLdZ0DI4aPAcEYwRkWhGheMYOnVeU M7OSccjFtk3pTUuzK0Z917FxY97nMRrvYbLovJ3lQSXNg541OB82eQRPQfbec/1R cp/9O/l1V12QZc2xG5+pY07otk3hjW0poLsoMHeA1kdJ0jxu4u4+lFKIzh9XhH76 oRkCTMH7YLAU2iB2oCGGmPQ1EFZkxnxjRusASZ4vAAMH40pldvJA3XKq9Tx23Prj ZGJv9cVkErJt6MFClAQJa6yrXrVdSQ== =T000 -----END PGP SIGNATURE----- --=-=-=-- From unknown Fri Jun 13 10:56:18 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 17 Nov 2017 12:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator