From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: Update scientific Python packages Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Feb 2017 10:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 25834@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.14877594483355 (code B ref -1); Wed, 22 Feb 2017 10:31:01 +0000 Received: (at submit) by debbugs.gnu.org; 22 Feb 2017 10:30:48 +0000 Received: from localhost ([127.0.0.1]:49637 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgUC8-0000s2-KC for submit@debbugs.gnu.org; Wed, 22 Feb 2017 05:30:48 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49413) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgUC7-0000rq-46 for submit@debbugs.gnu.org; Wed, 22 Feb 2017 05:30:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cgUBy-0008Ed-R1 for submit@debbugs.gnu.org; Wed, 22 Feb 2017 05:30:42 -0500 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 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:55642) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cgUBy-0008EZ-O4 for submit@debbugs.gnu.org; Wed, 22 Feb 2017 05:30:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgUBs-00058V-LM for guix-patches@gnu.org; Wed, 22 Feb 2017 05:30:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cgUBp-0008Cj-Hc for guix-patches@gnu.org; Wed, 22 Feb 2017 05:30:32 -0500 Received: from s01.spamexperts.axc.nl ([185.182.56.9]:51108) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cgUBp-0008CH-AR for guix-patches@gnu.org; Wed, 22 Feb 2017 05:30:29 -0500 Received: from vserver42.axc.nl ([159.253.0.80]) by s01.spamexperts.axc.nl with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86) (envelope-from ) id 1cgUBj-0001lZ-Kz for guix-patches@gnu.org; Wed, 22 Feb 2017 11:30:24 +0100 Received: from mail.axc.nl ([159.253.0.157]:41646) by vserver42.axc.nl with esmtp (Exim 4.87) (envelope-from ) id 1cgUBi-0004Zs-DQ for guix-patches@gnu.org; Wed, 22 Feb 2017 11:30:22 +0100 Date: Wed, 22 Feb 2017 11:30:15 +0100 (CET) Message-Id: <20170222.113015.1486949640371512143.post@thomasdanckaert.be> From: Thomas Danckaert X-Mailer: Mew version 6.7 on Emacs 25.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=utf-8; format=flowed Content-Transfer-Encoding: base64 PrimaryMX: Accepted email from trusted host. Hint: This skips spam scanning so make sure other host is not vulnerable X-Relay-Host: 159.253.0.157 SpamTally: Final spam score: 0 X-Originating-IP: 159.253.0.80 X-SpamExperts-Domain: vserver42.axc.nl X-SpamExperts-Username: 159.253.0.80 Authentication-Results: spamexperts.axc.nl; auth=pass smtp.auth=159.253.0.80@vserver42.axc.nl X-SpamExperts-Outgoing-Class: unsure X-SpamExperts-Outgoing-Evidence: Combined (0.52) X-Recommended-Action: accept X-Filter-ID: s0sct1PQhAABKnZB5plbIaExX4b9HB97Y0LqBeziPXa8B5kabb+8+DRlCqSxA333/bPom7IVowNb jNmNSGjlJADpxEq2QWue0NVTi1XPmXej1KRrf1Y8eevl1lZRQAkHO76XSTAwtV4mg4i2ouCDa4AU hvIWAV5xUW/+gAh4vXpdmWmyer3yZEAjdCpCLi1/RcOb18WfxGyg6Om6u4YYm9u7/gK7OuHe71YS Xk/wo1zEJmXb7Ar/H99E7t+JzjZEexI6JliONwAnIAZqFP/xQOWBOXp8nHKe0R+FkIqN7hkbx4Px vydb/x32mhLBChw5NNMPtXItjLG4t9x0O63zbyLpQCk9LN96ieg5guM8uFge9Gory97ytKcl8m2v CNJ8q16AUQgygDMMJTOfrbMny4YMMMN9gXSa/QHmQlxnbwnJ+LDk+6c65WNHYJFrd5FIBZ6++Dfk TVlBWsR5QGkluYsktHOcNcA7Yit+vIPIFAQmEqN5fXoI0ArDZbumk3L6kihXO2fRb8rpv65HbpOd qmjDv/9lZWhS1i8CvLmhSHJulq+YCc1Jf9I1b2AZYErcjxqVInDtyLKdhpFYlh+5iwrwZePlKAja dVACXd5CVMStI4g+l6rCWbY0MZcgnbHscInbHxcQ7Yqf+SyeuX7VEg4xvSXNEuNAac1x4Dq+Rw46 YAui7CC12a7HCFC49T/2Hl+n4wJpi0aO64WmIrQSsoiOiAWzgWYfW4v6sNykXCUhQhivpDmZttuJ xBIdw0/3PmQkm/R/q0s7MghuhwYFI0CYbodT30ON66voTSWuQNhsvNhNiZMpZAonHM9TXt5r X-Report-Abuse-To: spam@s01.spamexperts.axc.nl 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.0 (----) 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 (----) SGksDQoNCkknbSBzdWJtaXR0aW5nIGEgcGF0Y2ggc2VyaWVzIHRvIHVwZGF0ZSBudW1weSwgbWF0 cGxvdGxpYiwgc2NpcHkgYW5kIA0KaXB5dGhvbi4gIEkndmUgc3BsaXQgb3V0IHRoZSBkb2N1bWVu dGF0aW9uIGZvciBudW1weSBhbmQgbWF0cGxvdGxpYiANCmludG8gc2VwYXJhdGUgcGFja2FnZXMg dG8gYXZvaWQgaXNzdWVzIHdpdGggdGhlIGZvbGxvd2luZyBjeWNsaWMgDQpkZXBlbmRlbmNpZXM6 DQoNCiAgLSBudW1weSBkb2N1bWVudGF0aW9uIGRlcGVuZHMgb24gbWF0cGxvdGxpYiwgd2hpY2gg ZGVwZW5kcyBvbiBudW1weS4NCg0KICAtIGRvY3VtZW50YXRpb24gZm9yIHRoZSBuZXcgdmVyc2lv biBvZiBtYXRwbG90bGliIGFsc28gZGVwZW5kcyBvbg0KICAgIGlweXRob24sIHdoaWNoIGRlcGVu ZHMgb24gbWF0cGxvdGxpYiBhbmQgbnVtcHkuDQoNCklmIHRoZSBwcmVmZXJlbmNlIGlzIHRvIHdv cmsgd2l0aCBtdWx0aXBsZSBvdXRwdXRzIGluc3RlYWQsIEkgY2FuIA0Kd29yayBvdXQgc29tZXRo aW5nIHdpdGgg4oCcYm9vdHN0cmFw4oCdIHBhY2thZ2VzIGFuZCANCnBhY2thZ2UtaW5wdXQtcmV3 cml0aW5nLCBidXQgSSBsaWtlIHRoZSBzaW1wbGljaXR5IG9mIHNlcGFyYXRlIA0KZG9jdW1lbnRh dGlvbiBwYWNrYWdlcyAod2hpY2ggYWxzbyBhdm9pZHMgcmVwZWF0ZWRseSBidWlsZGluZyB0aGUg DQpzYW1lIHBhY2thZ2UgZm9yIGJvb3RzdHJhcHBpbmcgcHVycG9zZXMpLg0KDQpUaG9tYXMNCg== From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: Update scientific Python packages Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Feb 2017 12:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Thomas Danckaert Cc: 25834@debbugs.gnu.org Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148776498112063 (code B ref 25834); Wed, 22 Feb 2017 12:04:01 +0000 Received: (at 25834) by debbugs.gnu.org; 22 Feb 2017 12:03:01 +0000 Received: from localhost ([127.0.0.1]:49748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgVdN-00038S-4q for submit@debbugs.gnu.org; Wed, 22 Feb 2017 07:03:01 -0500 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgVdK-00038G-Nt for 25834@debbugs.gnu.org; Wed, 22 Feb 2017 07:02:59 -0500 Received: from localhost (141.80.148.209 [141.80.148.209]) by mx.zohomail.com with SMTPS id 148776497536533.12813684440232; Wed, 22 Feb 2017 04:02:55 -0800 (PST) References: <20170222.113015.1486949640371512143.post@thomasdanckaert.be> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Ricardo Wurmus In-reply-to: <20170222.113015.1486949640371512143.post@thomasdanckaert.be> 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, 22 Feb 2017 13:02:52 +0100 Message-ID: <87mvdebfgz.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.0 (+) 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: 1.0 (+) Thomas Danckaert writes: > I'm submitting a patch series to update numpy, matplotlib, scipy and > ipython. I've split out the documentation for numpy and matplotlib > into separate packages to avoid issues with the following cyclic > dependencies: > > - numpy documentation depends on matplotlib, which depends on numpy. > > - documentation for the new version of matplotlib also depends on > ipython, which depends on matplotlib and numpy. > > If the preference is to work with multiple outputs instead, I can > work out something with “bootstrap” packages and > package-input-rewriting, but I like the simplicity of separate > documentation packages (which also avoids repeatedly building the > same package for bootstrapping purposes). Thanks for taking this on! My preference is to have separate documentation packages when this allows us to avoid a host of intermediate bootstrapping packages. This was acceptable for numpy and matplotlib in the past, but now that the cycle has grown even larger, I’d prefer to cut the dependency by turning them into separate packages. -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH 1/7] gnu: Add python2-backports-shutil-get-terminal-size. Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Feb 2017 16:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 25834@debbugs.gnu.org Cc: Thomas Danckaert Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.14877798169245 (code B ref 25834); Wed, 22 Feb 2017 16:11:01 +0000 Received: (at 25834) by debbugs.gnu.org; 22 Feb 2017 16:10:16 +0000 Received: from localhost ([127.0.0.1]:51350 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgZUe-0002P3-3d for submit@debbugs.gnu.org; Wed, 22 Feb 2017 11:10:16 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:32930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgV0l-00022y-MH for 25834@debbugs.gnu.org; Wed, 22 Feb 2017 06:23:08 -0500 Received: by mail-wm0-f68.google.com with SMTP id v77so1758562wmv.0 for <25834@debbugs.gnu.org>; Wed, 22 Feb 2017 03:23:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TWUI6Sc66YLhKMKJHFTKYqXsjUhzq9TSen3+6Yv4hUY=; b=SWJsWEL4XGSgUUL1la6LTWEUJceZzwruLOz6oU8+LdZdRmDx7YLR0afHRYgse7kwDo LXKplhtncczvmruuxXm2LvACjkDFlwXXIAtalxbZHZZI9288LUf/R5v4NREIhH9XfpLF uGEUqeSAh8Q+ftbXbjonHlG2eTqtje0YhZTmi1SLYNfz1Pr8vUgGsA7+PwBUKFQGmyWw JJfhJlqtX6PK/9tX6dkzjCpQ6hgct1B4NsHzkB1t7ONlITwcB6ec+XvH1AjcfESjdyn8 JNu02LzQ2RP7V3gp8MgU4qbmeTr1tlbOKkTfcHFjDl1NK0MfvYsM2rislXywbMNqAUBS s/eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TWUI6Sc66YLhKMKJHFTKYqXsjUhzq9TSen3+6Yv4hUY=; b=ZiaYFg31IAdedHzfn6IhQ7EHTqqbc6Q4W06KdyedgHVMa0p0S4zNZCXATbdQWih6tZ UNKkaCg/bwNmjeTobvm+qSS7IrgpWUJAoY0gQDfpnpnqz/qajrrhSVnsG4rTcFsUWM/8 T6vB10kc3k1fDnNv0GzAGjA+UYScblvb5S4/WkBeN4TrVbSGAxvB8xSMWAhWADb5/Bw+ wxzxaBAcoopvNMUv1BhCeEdCZhKuupo2IHP8d0AVh8+tzoKHsj9D10YmCiMaHWtKoaFf IIVDPskgze1n1Jo5rw+autuaPpX1IdojgussrE1bdA7cxITn8dJlPwCucdC3cWeYThaH Jfnw== X-Gm-Message-State: AMke39lAkdC/vYOjvQ/OoaW4gHmH3K3Qqs4tCjIJdgLgINjVnZ02M7DyAAZg8SOZct4z7Q== X-Received: by 10.28.54.35 with SMTP id d35mr1697407wma.105.1487762581685; Wed, 22 Feb 2017 03:23:01 -0800 (PST) Received: from localhost.localdomain (225.115-67-87.adsl-dyn.isp.belgacom.be. [87.67.115.225]) by smtp.gmail.com with ESMTPSA id t30sm1334196wra.52.2017.02.22.03.23.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Feb 2017 03:23:00 -0800 (PST) From: Thomas Danckaert Date: Wed, 22 Feb 2017 12:22:47 +0100 Message-Id: <20170222112253.30004-1-thomas.danckaert@gmail.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170222.113015.1486949640371512143.post@thomasdanckaert.be> References: <20170222.113015.1486949640371512143.post@thomasdanckaert.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Mailman-Approved-At: Wed, 22 Feb 2017 11:10:14 -0500 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.5 (/) From: Thomas Danckaert * gnu/packages/python.scm (python2-backports-shutil-get-terminal-size): New variable. --- gnu/packages/python.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 432298472..13906153c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -33,7 +33,7 @@ ;;; Copyright © 2016 Arun Isaac ;;; Copyright © 2016, 2017 Julien Lepiller ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice -;;; Copyright © 2016 Thomas Danckaert +;;; Copyright © 2016, 2017 Thomas Danckaert ;;; Copyright © 2017 Carlo Zancanaro ;;; Copyright © 2017 Frederick M. Muriithi ;;; @@ -5787,6 +5787,32 @@ connection to each user.") (define-public python2-backports-abc (package-with-python2 python-backports-abc)) +(define-public python2-backports-shutil-get-terminal-size + (package-with-python2 + (package + (name "python-backports-shutil-get-terminal-size") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://pypi.python.org/packages/ec/9c/" + "368086faa9c016efce5da3e0e13ba392c9db79e3ab740b763fe28620b18b/" + "backports.shutil_get_terminal_size-" version ".tar.gz")) + (sha256 + (base32 + "107cmn7g3jnbkp826zlj8rrj19fam301qvaqf0f3905f5217lgki")))) + (build-system python-build-system) + (home-page + "https://github.com/chrippa/backports.shutil_get_terminal_size") + (synopsis + "Backport of Python 3.3's @code{shutil.get_terminal_size()}") + (description + "A backport of the get_terminal_size function from Python 3.3's shutil. +Unlike the original version it is written in pure Python rather than C, so it +might be a tiny bit slower.") + (license license:expat)))) + (define-public python-waf (package (name "python-waf") -- 2.11.1 From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH 2/7] gnu: Add python-colorspacious. Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Feb 2017 16:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 25834@debbugs.gnu.org Cc: Thomas Danckaert Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148778134211643 (code B ref 25834); Wed, 22 Feb 2017 16:36:01 +0000 Received: (at 25834) by debbugs.gnu.org; 22 Feb 2017 16:35:42 +0000 Received: from localhost ([127.0.0.1]:51376 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgZtF-00031f-8j for submit@debbugs.gnu.org; Wed, 22 Feb 2017 11:35:41 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:36433) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgV0r-00023B-TK for 25834@debbugs.gnu.org; Wed, 22 Feb 2017 06:23:14 -0500 Received: by mail-wm0-f66.google.com with SMTP id r18so1744786wmd.3 for <25834@debbugs.gnu.org>; Wed, 22 Feb 2017 03:23:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=I/X1TiSslTA3Ky4lM2kG8uPefLtKyuf8WpY7SpZebFc=; b=Evwa09iBLyPCyBlr8u3cBgYNSgcVbDIoVdr87G7kMPskJfXkkTMvggrP89YoFT3WZA +kiWwWaVvtuHP46zZEimHAJAYauBwLEAX1LZ2ccRE5JSypNxjY/aVRHfwn0TA/xg+SVh mtr/UZcCOulc/JLNLNCudzEJ2vgrAOEfuo57ZvDYbKb/6S68RTeIFokCCMHGWa6njrLg DgUb6TbpaqqSt7i776adrjaFu7e7fvtssSKnvnQjyUieyRNgZhf/NO2wiHX0nVHpsCnM 2dvV+vxf5A67ggajQ4DuTsZL1XmzubEYWuTUT51iwbVLLnBDEBZQc6tNMewdyaHFOEUc VkxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=I/X1TiSslTA3Ky4lM2kG8uPefLtKyuf8WpY7SpZebFc=; b=Sbph5YGpnrRBVlHIYUmcrHdsXjFWcO9Lq00LtXuc8SwQoRlA97cv1uP1XteMQDV+Ch 7OLOKlGvNli+ThhZ+v2KFz+ufWHc27sccXL4lE92XziHYwNv1lOQARHOw/bfE/oxB+sy Btcz6HHTSKsXkc487QB6KjW1V5igMfMBdLmlhEHLWjBSMpze8AY5cCy1+VJLsheUOw3h yX7H845gN35mGn74RW2/50oYZk7ZZ52ZS+HryJXOz5xrSXIxVYokHvMnB9/KruRw/sYY 3YEydIvNL6LRsxSlfFJ7h2BOOs82T4haz5pEcpS3UrLh1+zB9emokEPzd2NsuVQvumwD lEzw== X-Gm-Message-State: AMke39lhJax48oAdRaBEUC7/ZQdd2sKM8nsm/8GbQ73HXsjaw5dZOcMp3jway7yHplmDCQ== X-Received: by 10.28.170.4 with SMTP id t4mr2021374wme.89.1487762588341; Wed, 22 Feb 2017 03:23:08 -0800 (PST) Received: from localhost.localdomain (225.115-67-87.adsl-dyn.isp.belgacom.be. [87.67.115.225]) by smtp.gmail.com with ESMTPSA id t30sm1334196wra.52.2017.02.22.03.23.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Feb 2017 03:23:07 -0800 (PST) From: Thomas Danckaert Date: Wed, 22 Feb 2017 12:22:48 +0100 Message-Id: <20170222112253.30004-2-thomas.danckaert@gmail.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170222112253.30004-1-thomas.danckaert@gmail.com> References: <20170222.113015.1486949640371512143.post@thomasdanckaert.be> <20170222112253.30004-1-thomas.danckaert@gmail.com> X-Spam-Score: 0.5 (/) X-Mailman-Approved-At: Wed, 22 Feb 2017 11:35:40 -0500 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.5 (/) From: Thomas Danckaert * gnu/packages/python.scm (python-colorspacious, python2-colorspacious): 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 13906153c..a9afbdfd6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3631,6 +3631,30 @@ To address this and enable easy cycling over arbitrary @code{kwargs}, the (define-public python2-cycler (package-with-python2 python-cycler)) +(define-public python-colorspacious + (package + (name "python-colorspacious") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/njsmith/colorspacious/archive/v" version ".tar.gz")) + (file-name (string-append name "-" version)) + (sha256 + (base32 "1vflh5jm32qb0skza2i8pjacv09w6gq84fqpp2nj77s0rbmzgr4k")))) + (build-system python-build-system) + (propagated-inputs + `(("python-numpy" ,python-numpy))) + (home-page "https://github.com/njsmith/colorspacious") + (synopsis "Python library for colorspace conversions") + (description "Colorspacious is a Python library that lets you easily convert +between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc.") + (license license:expat))) + +(define-public python2-colorspacious + (package-with-python2 python-colorspacious)) + (define-public python-matplotlib (package (name "python-matplotlib") -- 2.11.1 From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH 3/7] gnu: python-sphinx: Update to 1.5.2. Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Feb 2017 16:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 25834@debbugs.gnu.org Cc: Thomas Danckaert Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148778134311649 (code B ref 25834); Wed, 22 Feb 2017 16:36:02 +0000 Received: (at 25834) by debbugs.gnu.org; 22 Feb 2017 16:35:43 +0000 Received: from localhost ([127.0.0.1]:51378 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgZtG-00031k-Ph for submit@debbugs.gnu.org; Wed, 22 Feb 2017 11:35:43 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgV0v-00023H-PQ for 25834@debbugs.gnu.org; Wed, 22 Feb 2017 06:23:18 -0500 Received: by mail-wm0-f68.google.com with SMTP id r18so1745316wmd.3 for <25834@debbugs.gnu.org>; Wed, 22 Feb 2017 03:23:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Wk2HyIMGDys8T/TfN/9W0wowweuhNv334MWv8is5CtA=; b=tzIsBI8hbRYcymyJFRvKMkGEkvd2osSxif0ibzXGQ7xf1INquetocUni5Ug1CBNu7h tx7JB+w54EN8CxGvvo0NPvluATWMb1iQcMpSSfhaPqbifuqW28+j3dgOSWjxs6BvV3W6 XVhkyS0DbTbt3OXBbP80TR9Q7YN2600YZ8i3UnnajYFWHJGCHWBqx0VQItDwO7IPKqv8 cNicsSg624ekjDOtoI9g1/iup0NmmIgsdiA2vIm/SeNgQ3oDGr+anRiLfSYb8DOwRLLy ppSI0oUAG2sB2K15i+JS+Nj6AGRnmI3gIILQdqX5m/+fDK2QA6jGB3xZijLeJHYVmA88 /FMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Wk2HyIMGDys8T/TfN/9W0wowweuhNv334MWv8is5CtA=; b=lpSOaHEQ8y1mmpAI+1fwLXomWUd9QCuRO7+dtbnWW/fpf8jAXmm7JQbsiKZwySROpv HOvBY8yVflblJPuDHfMg2hde7mEFCA6N6ZI/JphhBM4Cb4hSYZZgqdMn+lV5RexqJln1 aJVpK8NNVsWl5DcFibAxAJ7RbdmB7zCv73HHffrLB2gl5t0Shm43jsAfEj9PgfhU4x9q VfQcaqoJdFsngmTIK5XKbIQLVUALkYUfHXTSogVxMlGfx5LqddYUcD7Xu1IYkdokOf1f DrYbZYP7hNBpODvkq9mphBgT/9+0U6mnxvP+kKHZuCPQBKAKNKt7lXzWzbhEnp3JBzKl 1OsA== X-Gm-Message-State: AMke39nPNDFbmFDY1Bk01kEPG9ra+vxiy/kAQ1ZuUtCq5gsXwWW1D17Yt+rzMWtC/d7gsw== X-Received: by 10.28.185.193 with SMTP id j184mr2015978wmf.86.1487762592313; Wed, 22 Feb 2017 03:23:12 -0800 (PST) Received: from localhost.localdomain (225.115-67-87.adsl-dyn.isp.belgacom.be. [87.67.115.225]) by smtp.gmail.com with ESMTPSA id t30sm1334196wra.52.2017.02.22.03.23.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Feb 2017 03:23:11 -0800 (PST) From: Thomas Danckaert Date: Wed, 22 Feb 2017 12:22:49 +0100 Message-Id: <20170222112253.30004-3-thomas.danckaert@gmail.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170222112253.30004-1-thomas.danckaert@gmail.com> References: <20170222.113015.1486949640371512143.post@thomasdanckaert.be> <20170222112253.30004-1-thomas.danckaert@gmail.com> X-Spam-Score: 0.5 (/) X-Mailman-Approved-At: Wed, 22 Feb 2017 11:35:40 -0500 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.5 (/) From: Thomas Danckaert * gnu/packages/python.scm (python-sphinx): Update to 1.5.2. [propagated-inputs]: Add python-sphinx-alabaster-theme, python-sphinx-rtd-theme, python-babel, python-requests, python-snowballstemmer and python-imagesize. --- gnu/packages/python.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a9afbdfd6..95cea0e89 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2907,21 +2907,26 @@ reStructuredText.") (define-public python-sphinx (package (name "python-sphinx") - (version "1.2.3") + (version "1.5.2") (source (origin (method url-fetch) (uri (string-append - "https://pypi.python.org/packages/source/S/Sphinx/Sphinx-" - version ".tar.gz")) + "https://github.com/sphinx-doc/sphinx/archive/" version ".tar.gz")) (sha256 (base32 - "011xizm3jnmf4cvs5i6kgf6c5nn046h79i8j0vd0f27yw9j3p4wl")))) + "1vjp7h60y6v0sdh67s26hmbrh1n7jhb3xdb98rqvilb59fnj9br1")))) (build-system python-build-system) (propagated-inputs - `(("python-jinja2" ,python-jinja2) + `(("python-sphinx-alabaster-theme" ,python-sphinx-alabaster-theme) + ("python-sphinx-rtd-theme", python-sphinx-rtd-theme) + ("python-jinja2" ,python-jinja2) + ("python-babel" ,python-babel) ("python-docutils" ,python-docutils) - ("python-pygments" ,python-pygments))) + ("python-pygments" ,python-pygments) + ("python-requests" ,python-requests) + ("python-snowballstemmer" ,python-snowballstemmer) + ("python-imagesize" ,python-imagesize))) (home-page "http://sphinx-doc.org/") (synopsis "Python documentation generator") (description "Sphinx is a tool that makes it easy to create documentation -- 2.11.1 From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH 4/7] gnu: python-numpy: Update to 1.12.0. Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Feb 2017 16:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 25834@debbugs.gnu.org Cc: Thomas Danckaert Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148778134311657 (code B ref 25834); Wed, 22 Feb 2017 16:36:02 +0000 Received: (at 25834) by debbugs.gnu.org; 22 Feb 2017 16:35:43 +0000 Received: from localhost ([127.0.0.1]:51380 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgZtH-00031u-Ay for submit@debbugs.gnu.org; Wed, 22 Feb 2017 11:35:43 -0500 Received: from mail-wr0-f195.google.com ([209.85.128.195]:36148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgV0y-00023Q-Ml for 25834@debbugs.gnu.org; Wed, 22 Feb 2017 06:23:21 -0500 Received: by mail-wr0-f195.google.com with SMTP id z61so1082508wrc.3 for <25834@debbugs.gnu.org>; Wed, 22 Feb 2017 03:23:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LrAJLywQDwHBi4Y/liq3ejXuExjY6XqPEecndxD2CmU=; b=dTYnbrOMV3iHZbtZe4J82XJ0mn2SAfcOC0aQZy+sc3iFI/1/UACxm4elkAHBjrLO7m gW+vzH7sIp/iEiT5pPTeiOtS/tjcF1OKSLJN6Hjt39Sx6pB76b7OBvdCW07itZevhW+7 xAraaih+llI4t9E03L1EVd+CTKg18eFY7IimhnQCesxh//0GyY+9WuDM2UdVN2rDE/tS qymdj77uoOXCgdC5q48egHW+wmQW1/7JihR0c6eTccBOLKEi2AihMoNqbuBguIbRJIi+ RJDnyTVUuM+jvHCKbixQ3+Kh5+iCYuqiZ1XD9yJFqGIEgqRpa5Hroi8BLSHM6NC9MFEA 80ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LrAJLywQDwHBi4Y/liq3ejXuExjY6XqPEecndxD2CmU=; b=K0PpH6nxeZaFGEUGco62/cE7bSkPqr26dmFbpjV0sSMvpJ+0j/PjdYZ8SmFMkQB5er KwJ6sK6T/GEYCNVli/WZ84gx3a9fX/A/WKOG2n/lvcRtoCNjfOUFJhAzt6+Jr4zFUDSf E91DhArCZ3jlg4EI3c3mS7bi7sNqQtovsi6qY4UvSS/eTWiq1iOqrVVpslZAtGPTmZcZ yuE4WNCoc+nyKLplqrq+Mq/7zmdYckvJ/RX4KKLGHErC5LFSKW09Ogi1Ugr4Ahs52bAg SxMNy8jipas88YodqBvHs43m8uW8AF3/jQSskeUnCvsaT1wWSTO5pBhSa6czBz/0Mv4k oa3Q== X-Gm-Message-State: AMke39nga8yCF4/mU309+Qg1QBGP44Eir13xkYK4TXkE5Hu94ejIKHevSCxmJEW7M7OFow== X-Received: by 10.223.167.66 with SMTP id e2mr23163952wrd.48.1487762594792; Wed, 22 Feb 2017 03:23:14 -0800 (PST) Received: from localhost.localdomain (225.115-67-87.adsl-dyn.isp.belgacom.be. [87.67.115.225]) by smtp.gmail.com with ESMTPSA id t30sm1334196wra.52.2017.02.22.03.23.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Feb 2017 03:23:14 -0800 (PST) From: Thomas Danckaert Date: Wed, 22 Feb 2017 12:22:50 +0100 Message-Id: <20170222112253.30004-4-thomas.danckaert@gmail.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170222112253.30004-1-thomas.danckaert@gmail.com> References: <20170222.113015.1486949640371512143.post@thomasdanckaert.be> <20170222112253.30004-1-thomas.danckaert@gmail.com> X-Spam-Score: -0.1 (/) X-Mailman-Approved-At: Wed, 22 Feb 2017 11:35:40 -0500 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.1 (/) From: Thomas Danckaert * gnu/packages/python.scm (python-numpy): Update to 1.12.0. [source]: Use github instead of sourceforge. [native-inputs]: Add python-cython. To simplify the handling of dependency cycles (numpy documentation depends on matplotlib, which depends on numpy), we split out the documentation into a separate package: (python-numpy-bootstrap, python2-numpy-bootstrap): Remove variables. (python-numpy-documentation, python2-numpy-documentation): New variables. --- gnu/packages/python.scm | 146 ++++++++++++++++++++++++++---------------------- 1 file changed, 79 insertions(+), 67 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 95cea0e89..c45cc9db4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3278,24 +3278,26 @@ between language specification and implementation aspects.") ;; This version of numpy is missing the documentation and is only used to ;; build matplotlib which is required to build numpy's documentation. -(define python-numpy-bootstrap +(define-public python-numpy (package - (name "python-numpy-bootstrap") - (version "1.10.4") + (name "python-numpy") + (version "1.12.0") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/numpy/NumPy/" version - "/numpy-" version ".tar.gz")) + (uri (string-append + "https://github.com/numpy/numpy/archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1bjjhvncraka5s6i4lg644jrxij6bvycxy7an20gcz3a0m11iygp")))) + "025d4j4aakcp8w5i5diqh812cbbjgac7jszx1j56ivrbi1i8vv7d")))) (build-system python-build-system) (inputs `(("openblas" ,openblas) ("lapack" ,lapack))) (native-inputs - `(("python-nose" ,python-nose) + `(("python-cython" ,python-cython) + ("python-nose" ,python-nose) ("gfortran" ,gfortran))) (arguments `(#:phases @@ -3344,8 +3346,8 @@ and Fortran code, useful linear algebra, Fourier transform, and random number capabilities.") (license license:bsd-3))) -(define python2-numpy-bootstrap - (package-with-python2 python-numpy-bootstrap)) +(define-public python2-numpy + (package-with-python2 python-numpy)) (define-public python-munch (package @@ -3401,69 +3403,79 @@ Models, is a program for performing both single-SNP and SNP-set genome-wide association studies (GWAS) on extremely large data sets.") (license license:asl2.0))) -(define-public python-numpy - (package (inherit python-numpy-bootstrap) - (name "python-numpy") - (outputs '("out" "doc")) - (inputs - `(("which" ,which) - ,@(package-inputs python-numpy-bootstrap))) - (propagated-inputs - `(("python-matplotlib" ,python-matplotlib) - ("python-pyparsing" ,python-pyparsing) - ,@(package-propagated-inputs python-numpy-bootstrap))) +(define-public python-numpy-documentation + (package (inherit python-numpy) + (name "python-numpy-documentation") (native-inputs - `(("pkg-config" ,pkg-config) + `(("python-matplotlib" ,python-matplotlib) + ("python-numpy" ,python-numpy) + ("pkg-config" ,pkg-config) ("python-sphinx" ,python-sphinx) ("python-numpydoc" ,python-numpydoc) ("texlive" ,texlive) ("texinfo" ,texinfo) ("perl" ,perl) - ,@(package-native-inputs python-numpy-bootstrap))) - (arguments - `(,@(substitute-keyword-arguments - (package-arguments python-numpy-bootstrap) - ((#:phases phases) - `(alist-cons-after - 'install 'install-doc - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Make installed package available for building the - ;; documentation - (add-installed-pythonpath inputs outputs) - (let* ((data (string-append (assoc-ref outputs "doc") "/share")) - (doc (string-append - data "/doc/" ,name "-" - ,(package-version python-numpy-bootstrap))) - (info (string-append data "/info")) - (html (string-append doc "/html")) - (pyver ,(string-append "PYVER="))) - (with-directory-excursion "doc" - (mkdir-p html) - (system* "make" "html" pyver) - (system* "make" "latex" "PAPER=a4" pyver) - (system* "make" "-C" "build/latex" - "all-pdf" "PAPER=a4" pyver) - ;; FIXME: Generation of the info file fails. - ;; (system* "make" "info" pyver) - ;; (mkdir-p info) - ;; (copy-file "build/texinfo/numpy.info" - ;; (string-append info "/numpy.info")) - (for-each (lambda (file) - (copy-file (string-append "build/latex" file) - (string-append doc file))) - '("/numpy-ref.pdf" "/numpy-user.pdf")) - (with-directory-excursion "build/html" - (for-each (lambda (file) - (let* ((dir (dirname file)) - (tgt-dir (string-append html "/" dir))) - (unless (equal? "." dir) - (mkdir-p tgt-dir)) - (install-file file html))) - (find-files "." ".*")))))) - ,phases))))))) - -(define-public python2-numpy - (package-with-python2 python-numpy)) + ("scipy-sphinx-theme" + ,(origin ; The build script expects scipy-sphinx-theme as a git submodule + (method git-fetch) + (uri (git-reference + (url "https://github.com/scipy/scipy-sphinx-theme.git") + (commit "c466764e22"))) + (sha256 + (base32 + "0q2y87clwlsgc7wvlsn9pzyssybcq10plwhq2w1ydykfsyyqbmkl")))) + ,@(package-native-inputs python-numpy))) + (arguments + `(#:tests? #f ; we're only generating the documentation + #:phases + (modify-phases %standard-phases + (delete 'build) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Make installed package available for building the + ;; documentation + (add-installed-pythonpath inputs outputs) + (let* ((data (string-append (assoc-ref outputs "out") "/share")) + (doc (string-append + data "/doc/" ,name "-" + ,(package-version python-numpy))) + (info-reader (string-append data "/info")) + (html (string-append doc "/html")) + (scipy-sphinx-theme "scipy-sphinx-theme") + (sphinx-theme-checkout (assoc-ref inputs scipy-sphinx-theme)) + (pyver ,(string-append "PYVER="))) + (with-directory-excursion "doc" + (copy-recursively sphinx-theme-checkout scipy-sphinx-theme) + (mkdir-p html) + (system* "make" "html" pyver) + (system* "make" "latex" "PAPER=a4" pyver) + (system* "make" "-C" "build/latex" + "all-pdf" "PAPER=a4" pyver) + ;; FIXME: Generation of the info file fails. + ;; (system* "make" "info" pyver) + ;; (mkdir-p info) + ;; (copy-file "build/texinfo/numpy.info" + ;; (string-append info "/numpy.info")) + (for-each (lambda (file) + (copy-file (string-append "build/latex" file) + (string-append doc file))) + '("/numpy-ref.pdf" "/numpy-user.pdf")) + (with-directory-excursion "build/html" + (for-each (lambda (file) + (let* ((dir (dirname file)) + (tgt-dir (string-append html "/" dir))) + (unless (equal? "." dir) + (mkdir-p tgt-dir)) + (install-file file html))) + (find-files "." ".*")))))))))) + (synopsis "Documentation for the python-numpy package"))) + +(define-public python2-numpy-documentation + (let ((numpy-documentation (package-with-python2 python-numpy-documentation))) + (package + (inherit numpy-documentation) + (native-inputs `(("python2-functools32" ,python2-functools32) + ,@(package-native-inputs numpy-documentation)))))) (define-public python-pygit2 (package @@ -3682,7 +3694,7 @@ between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc.") ("gobject-introspection" ,gobject-introspection) ("python-tkinter" ,python "tk") ("python-dateutil" ,python-dateutil-2) - ("python-numpy" ,python-numpy-bootstrap) + ("python-numpy" ,python-numpy) ("python-pillow" ,python-pillow) ("python-pytz" ,python-pytz) ("python-six" ,python-six) -- 2.11.1 From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH 6/7] gnu: python-ipython: Update to 5.2.2. Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Feb 2017 16:36:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 25834@debbugs.gnu.org Cc: Thomas Danckaert Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148778134411664 (code B ref 25834); Wed, 22 Feb 2017 16:36:03 +0000 Received: (at 25834) by debbugs.gnu.org; 22 Feb 2017 16:35:44 +0000 Received: from localhost ([127.0.0.1]:51382 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgZtH-00031z-Qb for submit@debbugs.gnu.org; Wed, 22 Feb 2017 11:35:44 -0500 Received: from mail-wr0-f196.google.com ([209.85.128.196]:36182) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgV13-00023n-5V for 25834@debbugs.gnu.org; Wed, 22 Feb 2017 06:23:25 -0500 Received: by mail-wr0-f196.google.com with SMTP id z61so1082936wrc.3 for <25834@debbugs.gnu.org>; Wed, 22 Feb 2017 03:23:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=D2wAUQgm7hABIewh/zjYMhlOZ15lyQlIUY4/vpMTPX4=; b=QA3PWmTMgzt5JYhHG4Y7EQje/Z6LyREt4HHvmhmfd3QO00HqGFkDS74O+q2ghpe3qQ 3VKSWJWkc3H4K80TsUqiexR2z+d/4jw+v/6EpzV7RvMrQ1o7+CwiejWYQQKR7D078mNQ haFljTket8ZbsK2+sHbEaujRkEWbbXMJRVobO3PkNkOBONrxZdb369N0SXm5Is3O669c pwdTr4So0zzN8CF8WIxEyT7noEYV/sCwIKdYHbK0HFIL9j2FdJDRGeh20tzU9r0v34yP ovtDCaD9+judY7UE0DBe7HgWmrbk3H89LgivLqNc7sZsFs+7KweGdx6n6vilkQQay6rz P4dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=D2wAUQgm7hABIewh/zjYMhlOZ15lyQlIUY4/vpMTPX4=; b=kzOsIQrddKXsvBYuOhxijjT9LbO9/qikeZvZrCd9pLIRvl5H3oZpuaK/I9d8sHDgd6 tKhDFWd5+OpxWVLLHlRE/qMcYQiMr4Eqx5u7l9wWL6/P2mrkKjGV7II47H5LEdUrr76k IyjxP8iw4O0xCoXpRqA6k4cig+mV78rxf5W8ZC1rRD0RwY5h5vhhXQcui8682183Axfh 8NcMzGN8ytkvRhFG6HE7nWEWVxR/4fhPX+9wMCJiIhZ13S7iV94xSaH8Y6J3eZhmhWgD noQgW2scRqM17O5ON2SHW7y39hTTpOsMql/dLFITfx0hGzB+SctP6j6OkU5wAGE46bw4 zd5A== X-Gm-Message-State: AMke39kNm6y9MRo9g+Jc/GI8mgWw/nTAgSHpk5u/GxJd0muogWtZMY3LPNVgkgUOpyGTzg== X-Received: by 10.223.177.142 with SMTP id q14mr22104028wra.194.1487762599553; Wed, 22 Feb 2017 03:23:19 -0800 (PST) Received: from localhost.localdomain (225.115-67-87.adsl-dyn.isp.belgacom.be. [87.67.115.225]) by smtp.gmail.com with ESMTPSA id t30sm1334196wra.52.2017.02.22.03.23.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Feb 2017 03:23:19 -0800 (PST) From: Thomas Danckaert Date: Wed, 22 Feb 2017 12:22:52 +0100 Message-Id: <20170222112253.30004-6-thomas.danckaert@gmail.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170222112253.30004-1-thomas.danckaert@gmail.com> References: <20170222.113015.1486949640371512143.post@thomasdanckaert.be> <20170222112253.30004-1-thomas.danckaert@gmail.com> X-Spam-Score: -0.1 (/) X-Mailman-Approved-At: Wed, 22 Feb 2017 11:35:40 -0500 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.1 (/) From: Thomas Danckaert * gnu/packages/python.scm (python-ipython): Update to 5.2.2. [propagated-inputs]: Add pyhon-prompt-toolkit and python-nbformat. --- gnu/packages/python.scm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 14b99cf4a..9a842cbf7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4992,17 +4992,18 @@ tools for mocking system commands and recording calls to those.") (define-public python-ipython (package (name "python-ipython") - (version "4.0.3") + (version "5.2.2") (source (origin (method url-fetch) (uri (pypi-uri "ipython" version ".tar.gz")) (sha256 - (base32 "1h2gp1p06sww9rzfkfzqy489bh47gj3910y2b1wdk3dcx1cqz4is")))) + (base32 "1qhjwa9cyz1np7rhv3p4ip13lkgbqsad62l24xkwiq1ic2gwiqbf")))) (build-system python-build-system) (outputs '("out" "doc")) (propagated-inputs `(("python-pyzmq" ,python-pyzmq) + ("python-prompt-toolkit" ,python-prompt-toolkit) ("python-terminado" ,python-terminado) ("python-matplotlib" ,python-matplotlib) ("python-numpy" ,python-numpy) @@ -5015,6 +5016,7 @@ tools for mocking system commands and recording calls to those.") ("python-jsonschema" ,python-jsonschema) ("python-traitlets" ,python-traitlets) ("python-ipykernel" ,python-ipykernel) + ("python-nbformat" ,python-nbformat) ("python-pygments" ,python-pygments))) (inputs `(("readline" ,readline) @@ -5038,15 +5040,16 @@ tools for mocking system commands and recording calls to those.") (html (string-append doc "/html")) (man1 (string-append data "/man/man1")) (info (string-append data "/info")) - (examples (string-append doc "/examples"))) + (examples (string-append doc "/examples")) + (python-arg (string-append "PYTHON=" (which "python")))) (setenv "LANG" "en_US.utf8") ;; Make installed package available for running the tests (add-installed-pythonpath inputs outputs) (with-directory-excursion "docs" ;; FIXME: pdf fails to build ;;(system* "make" "pdf" "PAPER=a4") - (system* "make" "html") - (system* "make" "info")) + (system* "make" python-arg "html") + (system* "make" python-arg "info")) (copy-recursively "docs/man" man1) (copy-recursively "examples" examples) (copy-recursively "docs/build/html" html) @@ -5100,6 +5103,10 @@ computing.") (arguments `(#:tests? #f ,@(package-arguments ipython))) ;; FIXME: add pyreadline once available. + (propagated-inputs + `(("python2-backports-shutil-get-terminal-size" ,python2-backports-shutil-get-terminal-size) + ("python2-pathlib2" ,python2-pathlib2) + ,@(package-propagated-inputs ipython))) (native-inputs `(("python2-mock" ,python2-mock) ,@(package-native-inputs ipython)))))) -- 2.11.1 From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH 5/7] gnu: python-matplotlib: Update to 2.0.0. Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Feb 2017 16:36:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 25834@debbugs.gnu.org Cc: Thomas Danckaert Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148778134711675 (code B ref 25834); Wed, 22 Feb 2017 16:36:03 +0000 Received: (at 25834) by debbugs.gnu.org; 22 Feb 2017 16:35:47 +0000 Received: from localhost ([127.0.0.1]:51384 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgZtI-000329-6B for submit@debbugs.gnu.org; Wed, 22 Feb 2017 11:35:47 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:36159) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgV10-00023f-HA for 25834@debbugs.gnu.org; Wed, 22 Feb 2017 06:23:26 -0500 Received: by mail-wr0-f193.google.com with SMTP id z61so1082661wrc.3 for <25834@debbugs.gnu.org>; Wed, 22 Feb 2017 03:23:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=P6NEruC24JkJSnabtECwA3oTJeId5oiMEwZVfq7v3RE=; b=tvcl+YTSvW9GZSIxs4e9B6eqfM1CQlMtTJt5oJ0XCwg/XF5DWdizbdZ8P+gxWKOdwv UTvLosAIMFDR7JmRlAKjUVR4UlKgALSQIbm2XxXzvK9pyQVRKXoX39WLGbYeaIvM/Di6 rB2OKvJdUVkiB5nhoTaWf9p/r0p4q4vSujtKcq3SOOM1t2scp+04gGHZ9dUtl2EvtXS5 VaFV2kvV0uTPYBuZZ6zLZT1sK8OX3fj/IpidPHWmmd4je35yU+rbQeMj15SNfCXvewZl De5DvF2HYYOk6lP0B8uXVr7BYdzrxl4lV5/i5/ZoaOEckH0OxDhTRlYB7qVS5zWVTMAo C0kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=P6NEruC24JkJSnabtECwA3oTJeId5oiMEwZVfq7v3RE=; b=PjgZS4qmehEPBuR2wLSVBcuWWpUuI+aDVvm/UNYyAzqOem1Q9UkqkRIKiUBa3Fbal9 g1LH/I3h2KBCqhb3PfGRQ6S7QX2UYyAVtSz90Yl4/hICYiqfbnTeX3/FFhKrwAk+rGtH iFir/iy+vxbBm4UX5MenPmUtIwyKArZgzAMK4B6OA1f/dtW+ThUTYAlMH5mXV5PDWeVh hx9ShAL3l4g1jNqfFK8Ni4Wm0cLgCu+uHX6u9ZpRby56CnpfydX/+PghBoEqjCuAs1cz 5kcNoJIi9QR1OwvvThBVxNPv8FIkQ2Lus9u/C10vH7Gm9zqWJtHxeF5JBltQlNvaIRem muoQ== X-Gm-Message-State: AMke39npQnMakLPlpZwbnGdcU3pR8iguPBOzjmohGOu7XSY6F9AN5wQ2zC334dzFthP36Q== X-Received: by 10.223.136.79 with SMTP id e15mr12409363wre.14.1487762596792; Wed, 22 Feb 2017 03:23:16 -0800 (PST) Received: from localhost.localdomain (225.115-67-87.adsl-dyn.isp.belgacom.be. [87.67.115.225]) by smtp.gmail.com with ESMTPSA id t30sm1334196wra.52.2017.02.22.03.23.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Feb 2017 03:23:16 -0800 (PST) From: Thomas Danckaert Date: Wed, 22 Feb 2017 12:22:51 +0100 Message-Id: <20170222112253.30004-5-thomas.danckaert@gmail.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170222112253.30004-1-thomas.danckaert@gmail.com> References: <20170222.113015.1486949640371512143.post@thomasdanckaert.be> <20170222112253.30004-1-thomas.danckaert@gmail.com> X-Spam-Score: -0.1 (/) X-Mailman-Approved-At: Wed, 22 Feb 2017 11:35:40 -0500 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.1 (/) From: Thomas Danckaert * gnu/packages/python.scm (python-matplotlib): Update to 2.0.0. [source]: Remove Tk backend patch, use Github instead of Sourceforge. [outputs]: Remove "doc" output. [propagated-inputs]: Add python-cycler. [native-inputs]: Remove python-sphinx, python-numpydoc, texlive and texinfo. (python-matplotlib-documentation, python2-matplotlib-documentation): New variable. * gnu/packages/patches/matplotlib-setupext-tk.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove patch. --- gnu/local.mk | 1 - gnu/packages/patches/matplotlib-setupext-tk.patch | 34 ------ gnu/packages/python.scm | 142 ++++++++++++---------- 3 files changed, 79 insertions(+), 98 deletions(-) delete mode 100644 gnu/packages/patches/matplotlib-setupext-tk.patch diff --git a/gnu/local.mk b/gnu/local.mk index ca415ec48..13faeeba8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -748,7 +748,6 @@ dist_patch_DATA = \ %D%/packages/patches/make-impure-dirs.patch \ %D%/packages/patches/mars-install.patch \ %D%/packages/patches/mars-sfml-2.3.patch \ - %D%/packages/patches/matplotlib-setupext-tk.patch \ %D%/packages/patches/maxima-defsystem-mkdir.patch \ %D%/packages/patches/mcron-install.patch \ %D%/packages/patches/mcrypt-CVE-2012-4409.patch \ diff --git a/gnu/packages/patches/matplotlib-setupext-tk.patch b/gnu/packages/patches/matplotlib-setupext-tk.patch deleted file mode 100644 index 37c3d686e..000000000 --- a/gnu/packages/patches/matplotlib-setupext-tk.patch +++ /dev/null @@ -1,34 +0,0 @@ -Use 'pkg-config' instead of heuristics to find 'tk' flags. - ---- matplotlib-1.4.3/setupext.py.orig 2015-12-01 14:21:19.554417453 +0100 -+++ matplotlib-1.4.3/setupext.py 2015-12-02 10:39:47.282363530 +0100 -@@ -1457,7 +1457,7 @@ - p = subprocess.Popen( - '. %s ; eval echo ${%s}' % (file, varname), - shell=True, -- executable="/bin/sh", -+ executable="sh", - stdout=subprocess.PIPE) - result = p.communicate()[0] - return result.decode('ascii') -@@ -1601,8 +1601,19 @@ - # of distros. - - # Query Tcl/Tk system for library paths and version string -+ def getoutput(s): -+ ret = os.popen(s).read().strip() -+ return ret - try: -- tcl_lib_dir, tk_lib_dir, tk_ver = self.query_tcltk() -+ pkg_config_libs = getoutput('pkg-config --libs-only-L tk').split() -+ # drop '-L' part of strings -+ pkg_config_libs = [s[2:] for s in pkg_config_libs] -+ pkg_config_ver = getoutput('pkg-config --modversion tk') -+ tk_ver = re.match(r"(\d+.\d+)[\d.]*", pkg_config_ver).group(1) -+ tcl_lib_dir = next(s for s in pkg_config_libs -+ if re.match(r".*-tcl-.*", s)) + '/tcl' + tk_ver -+ tk_lib_dir = next(s for s in pkg_config_libs -+ if re.match(r".*-tk-.*", s)) + '/tk' + tk_ver - except: - tk_ver = '' - result = self.hardcoded_tcl_config() diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c45cc9db4..14b99cf4a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3675,21 +3675,20 @@ between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc.") (define-public python-matplotlib (package (name "python-matplotlib") - (version "1.4.3") + (version "2.0.0") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/matplotlib/matplotlib" - "/matplotlib-" version - "/matplotlib-" version ".tar.gz")) + (uri (string-append + "https://github.com/matplotlib/matplotlib/archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1dn05cvd0g984lzhh72wa0z93psgwshbbg93fkab6slx5m3l95av")) - (patches (search-patches "matplotlib-setupext-tk.patch")))) + "0w3k5m5qb3wsd7yhvmg042xddvligklvcq2visk2c5wnph3hhsln")))) (build-system python-build-system) - (outputs '("out" "doc")) (propagated-inputs ; the following packages are all needed at run time - `(("python-pyparsing" ,python-pyparsing) + `(("python-cycler" ,python-cycler) + ("python-pyparsing" ,python-pyparsing) ("python-pygobject" ,python-pygobject) ("gobject-introspection" ,gobject-introspection) ("python-tkinter" ,python "tk") @@ -3726,70 +3725,28 @@ between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc.") ("tk" ,tk))) (native-inputs `(("pkg-config" ,pkg-config) - ("python-sphinx" ,python-sphinx) - ("python-numpydoc" ,python-numpydoc) ("python-nose" ,python-nose) - ("python-mock" ,python-mock) - ("texlive" ,texlive) - ("texinfo" ,texinfo))) + ("python-mock" ,python-mock))) (arguments `(#:phases - (alist-cons-before - 'build 'configure-environment - (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((cairo (assoc-ref inputs "cairo")) - (gtk+ (assoc-ref inputs "gtk+"))) - ;; Setting these directories in the 'basedirlist' of 'setup.cfg' - ;; has not effect. - (setenv "LD_LIBRARY_PATH" - (string-append cairo "/lib:" gtk+ "/lib")) - (setenv "HOME" (getcwd)) - (call-with-output-file "setup.cfg" + (modify-phases %standard-phases + (add-before 'build 'configure-environment + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((cairo (assoc-ref inputs "cairo")) + (gtk+ (assoc-ref inputs "gtk+"))) + ;; Setting these directories in the 'basedirlist' of 'setup.cfg' + ;; has not effect. + (setenv "LD_LIBRARY_PATH" + (string-append cairo "/lib:" gtk+ "/lib")) + (setenv "HOME" (getcwd)) + (call-with-output-file "setup.cfg" (lambda (port) (format port "[directories]~% basedirlist = ~a,~a~% [rc_options]~% backend = TkAgg~%" (assoc-ref inputs "tcl") - (assoc-ref inputs "tk")))))) - (alist-cons-after - 'install 'install-doc - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((data (string-append (assoc-ref outputs "doc") "/share")) - (doc (string-append data "/doc/" ,name "-" ,version)) - (info (string-append data "/info")) - (html (string-append doc "/html"))) - ;; Make installed package available for building the - ;; documentation - (add-installed-pythonpath inputs outputs) - (with-directory-excursion "doc" - ;; Produce pdf in 'A4' format. - (substitute* (find-files "." "conf\\.py") - (("latex_paper_size = 'letter'") - "latex_paper_size = 'a4'")) - (mkdir-p html) - (mkdir-p info) - ;; The doc recommends to run the 'html' target twice. - (system* "python" "make.py" "html") - (system* "python" "make.py" "html") - (copy-recursively "build/html" html) - (system* "python" "make.py" "latex") - (system* "python" "make.py" "texinfo") - (symlink (string-append html "/_images") - (string-append info "/matplotlib-figures")) - (with-directory-excursion "build/texinfo" - (substitute* "matplotlib.texi" - (("@image\\{([^,]*)" all file) - (string-append "@image{matplotlib-figures/" file))) - (symlink (string-append html "/_images") - "./matplotlib-figures") - (system* "makeinfo" "--no-split" - "-o" "matplotlib.info" "matplotlib.texi")) - (copy-file "build/texinfo/matplotlib.info" - (string-append info "/matplotlib.info")) - (copy-file "build/latex/Matplotlib.pdf" - (string-append doc "/Matplotlib.pdf"))))) - %standard-phases)))) + (assoc-ref inputs "tk")))))))))) (home-page "http://matplotlib.org") (synopsis "2D plotting library for Python") (description @@ -3814,6 +3771,65 @@ toolkits.") ,@(fold alist-delete (package-propagated-inputs matplotlib) '("python-pycairo" "python-pygobject" "python-tkinter"))))))) +(define-public python-matplotlib-documentation + (package + (inherit python-matplotlib) + (name "python-matplotlib-documentation") + (native-inputs + `(("python-colorspacious" ,python-colorspacious) + ("python-sphinx" ,python-sphinx) + ("python-numpydoc" ,python-numpydoc) + ("python-ipython" ,python-ipython) + ("texlive" ,texlive) + ("texinfo" ,texinfo) + ,@(package-native-inputs python-matplotlib))) + (arguments + `(#:tests? #f ; we're only generating documentation + #:phases + (modify-phases %standard-phases + (delete 'build) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (let* ((data (string-append (assoc-ref outputs "out") "/share")) + (doc (string-append data "/doc/" ,name "-" + ,(package-version python-matplotlib))) + (info (string-append data "/info")) + (html (string-append doc "/html"))) + ;; Make installed package available for building the + ;; documentation + (with-directory-excursion "doc" + ;; Produce pdf in 'A4' format. + (substitute* (find-files "." "conf\\.py") + (("latex_paper_size = 'letter'") + "latex_paper_size = 'a4'")) + (mkdir-p html) + (mkdir-p info) + ;; The doc recommends to run the 'html' target twice. + (system* "python" "make.py" "html") + (system* "python" "make.py" "html") + (copy-recursively "build/html" html) + (system* "python" "make.py" "latex") + (system* "python" "make.py" "texinfo") + (symlink (string-append html "/_images") + (string-append info "/matplotlib-figures")) + (with-directory-excursion "build/texinfo" + (substitute* "matplotlib.texi" + (("@image\\{([^,]*)" all file) + (string-append "@image{matplotlib-figures/" file))) + (symlink (string-append html "/_images") + "./matplotlib-figures") + (system* "makeinfo" "--no-split" + "-o" "matplotlib.info" "matplotlib.texi")) + (copy-file "build/texinfo/matplotlib.info" + (string-append info "/matplotlib.info")) + (copy-file "build/latex/Matplotlib.pdf" + (string-append doc "/Matplotlib.pdf"))))))))) + (synopsis "Documentation for the python-matplotlib package"))) + +(define-public python2-matplotlib-documentation + (package-with-python2 python-matplotlib-documentation)) + (define-public python2-pysnptools (package (name "python2-pysnptools") -- 2.11.1 From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH 7/7] gnu: python-scipy: Update to 0.18.1. Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Feb 2017 16:36:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 25834@debbugs.gnu.org Cc: Thomas Danckaert Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148778135011685 (code B ref 25834); Wed, 22 Feb 2017 16:36:04 +0000 Received: (at 25834) by debbugs.gnu.org; 22 Feb 2017 16:35:50 +0000 Received: from localhost ([127.0.0.1]:51386 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgZtL-00032G-Tp for submit@debbugs.gnu.org; Wed, 22 Feb 2017 11:35:48 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:36554) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgV15-000243-Qv for 25834@debbugs.gnu.org; Wed, 22 Feb 2017 06:23:28 -0500 Received: by mail-wm0-f66.google.com with SMTP id r18so1745973wmd.3 for <25834@debbugs.gnu.org>; Wed, 22 Feb 2017 03:23:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eEt3JHtv1U2Ugu99S1FFAzinT4GKOUfpVjqqk9ESEBc=; b=L5reCbwaglCcD/MOPto/QbJmSXoQ/8NcURtnQQ4fPJkqRABtXct1/b/LDh8kAVHelt HSJhaspLMclJUK9VjSA4OHDmxevliVBrIX6qNyD/YZmZqkJ2o+nKlRancZfjxg5L/4Yk 55r+FO64CpRMzLplkXYDvRC6axpwsHbeyYm8T16W1jXJoo9rP7PnatxPT4f4QJyyOu3N UfNJm86nWkPVe04NgHmQV57EaIsfduUT0AJWKnr3uJSbkQKR0n8cyWALVQDcfcMAvW+F UFIJ2tov5ymnkCYjCMsy1LCJyY5tUSQTTt3ttCtrxK9bFC/tyEOsMpscp+iWtWag0FGT 3dog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eEt3JHtv1U2Ugu99S1FFAzinT4GKOUfpVjqqk9ESEBc=; b=CCAEbsa5/av/9QCAxu8C6Zn8OT/inYcI8gQ4OEsZT8SFStKS1FmpKe1ZuK5Vi3WEvH Ol5F0fNSgJPGUpBOZ4mjSsyQLP7EEH+rujiF3T2Gt5/yIcsF5PtGjFFnKj3VcUI64dzE VP5f0I/uo5YG/cuwkMySqKuFRzMkAK45Ss/PZOP5gh+22bDw7N6dTMaxydSzyMM8EnNr iuFmiskFxanLqP8L0IXqnw4PCXJpC4ZnQvDxq4/rqAnhYD8gFHbRsps4mD+CcbgpwFK1 aNz0Th2w+WXbVyCNjDBkr2zcshUcxwl9tqib+MfkcfnEkurF8WtB9WNzO4Ex19SAB8ZX BTkg== X-Gm-Message-State: AMke39nFc5u8TksbuwzImhKrh2u72wk8oXi7Z98HGiLgoo4As73xl4b6oIN5valWtJPqcQ== X-Received: by 10.28.37.195 with SMTP id l186mr1905593wml.73.1487762602249; Wed, 22 Feb 2017 03:23:22 -0800 (PST) Received: from localhost.localdomain (225.115-67-87.adsl-dyn.isp.belgacom.be. [87.67.115.225]) by smtp.gmail.com with ESMTPSA id t30sm1334196wra.52.2017.02.22.03.23.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Feb 2017 03:23:21 -0800 (PST) From: Thomas Danckaert Date: Wed, 22 Feb 2017 12:22:53 +0100 Message-Id: <20170222112253.30004-7-thomas.danckaert@gmail.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170222112253.30004-1-thomas.danckaert@gmail.com> References: <20170222.113015.1486949640371512143.post@thomasdanckaert.be> <20170222112253.30004-1-thomas.danckaert@gmail.com> X-Spam-Score: 0.5 (/) X-Mailman-Approved-At: Wed, 22 Feb 2017 11:35:40 -0500 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.5 (/) From: Thomas Danckaert * gnu/packages/python.scm (python-scipy): Update to 0.18.1. [source]: Use github instead of sourceforge. [native-inputs]: Add python-cython. --- gnu/packages/python.scm | 113 +++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 60 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9a842cbf7..0b60d4926 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3900,16 +3900,16 @@ functions.") (define-public python-scipy (package (name "python-scipy") - (version "0.16.0") + (version "0.18.1") (source (origin (method url-fetch) -; http://downloads.sourceforge.net/project/scipy/scipy/0.16.1/scipy-0.16.1.tar.gz - (uri (string-append "mirror://sourceforge/scipy/scipy/" version - "/scipy-" version ".tar.xz")) + (uri (string-append "https://github.com/scipy/scipy/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0wa0a4skpda3gx7lb12yn19nhbairlyxrvda2lz2bcawk3x5qzz2")))) + "17slsrfawjp7if6qrlx03zhgp05350ginxx8ddpw9zqx43x905sn")))) (build-system python-build-system) (propagated-inputs `(("python-numpy" ,python-numpy) @@ -3919,22 +3919,22 @@ functions.") `(("lapack" ,lapack) ("openblas" ,openblas))) (native-inputs - `(("python-nose" ,python-nose) + `(("python-cython" ,python-cython) + ("python-nose" ,python-nose) ("python-sphinx" ,python-sphinx) ("python-numpydoc" ,python-numpydoc) ("gfortran" ,gfortran) - ("texlive" ,texlive) ("perl" ,perl))) (outputs '("out" "doc")) (arguments `(#:phases - (alist-cons-before - 'build 'configure-openblas - (lambda* (#:key inputs #:allow-other-keys) - (call-with-output-file "site.cfg" - (lambda (port) - (format port - "[blas] + (modify-phases %standard-phases + (add-before 'build 'configure-openblas + (lambda* (#:key inputs #:allow-other-keys) + (call-with-output-file "site.cfg" + (lambda (port) + (format port + "[blas] libraries = openblas library_dirs = ~a/lib include_dirs = ~a/include @@ -3944,53 +3944,46 @@ include_dirs = ~a/include library_dirs = ~a/lib atlas_libs = openblas " - (assoc-ref inputs "openblas") - (assoc-ref inputs "openblas") - (assoc-ref inputs "openblas")))) - #t) - (alist-cons-after - 'install 'install-doc - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((data (string-append (assoc-ref outputs "doc") "/share")) - (doc (string-append data "/doc/" ,name "-" ,version)) - (html (string-append doc "/html")) - (pyver ,(string-append "PYVER="))) - ;; Make installed package available for building the - ;; documentation + (assoc-ref inputs "openblas") + (assoc-ref inputs "openblas") + (assoc-ref inputs "openblas")))) + #t)) + (add-after 'install 'install-doc + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((data (string-append (assoc-ref outputs "doc") "/share")) + (doc (string-append data "/doc/" ,name "-" ,version)) + (html (string-append doc "/html")) + (pyver ,(string-append "PYVER="))) + ;; Make installed package available for building the + ;; documentation + (add-installed-pythonpath inputs outputs) + (with-directory-excursion "doc" + ;; Fix generation of images for mathematical expressions. + (substitute* (find-files "source" "conf\\.py") + (("pngmath_use_preview = True") + "pngmath_use_preview = False")) + (mkdir-p html) + (system* "make" "html" pyver) + (with-directory-excursion "build/html" + (for-each (lambda (file) + (let* ((dir (dirname file)) + (tgt-dir (string-append html "/" dir))) + (install-file file html))) + (find-files "." ".*"))))))) + (add-after 'unpack 'fix-tests + (lambda _ + (substitute* "scipy/integrate/tests/test_quadpack.py" + (("libm.so") "libm.so.6")) + #t)) + ;; Tests can only be run after the library has been installed and not + ;; within the source directory. + (delete 'check) + (add-after 'install 'check + (lambda* (#:key inputs outputs #:allow-other-keys) (add-installed-pythonpath inputs outputs) - (with-directory-excursion "doc" - ;; Fix generation of images for mathematical expressions. - (substitute* (find-files "source" "conf\\.py") - (("pngmath_use_preview = True") - "pngmath_use_preview = False")) - (mkdir-p html) - (system* "make" "html" pyver) - (system* "make" "latex" "PAPER=a4" pyver) - (system* "make" "-C" "build/latex" "all-pdf" "PAPER=a4" pyver) - (copy-file "build/latex/scipy-ref.pdf" - (string-append doc "/scipy-ref.pdf")) - (with-directory-excursion "build/html" - (for-each (lambda (file) - (let* ((dir (dirname file)) - (tgt-dir (string-append html "/" dir))) - (install-file file html))) - (find-files "." ".*")))))) - ;; Tests can only be run after the library has been installed and not - ;; within the source directory. - (alist-cons-after - 'install 'check - (lambda _ - (with-directory-excursion "/tmp" - (zero? (system* "python" "-c" "import scipy; scipy.test()")))) - (alist-delete - 'check - (alist-cons-after - 'unpack 'fix-tests - (lambda _ - (substitute* "scipy/integrate/tests/test_quadpack.py" - (("libm.so") "libm.so.6")) - #t) - %standard-phases))))))) + (with-directory-excursion "/tmp" + (zero? (system* "python" "-c" + "import scipy; scipy.test('full', 2)")))))))) (home-page "http://www.scipy.org/") (synopsis "The Scipy library provides efficient numerical routines") (description "The SciPy library is one of the core packages that make up -- 2.11.1 From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH 5/7] gnu: python-matplotlib: Update to 2.0.0. Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Feb 2017 08:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 25834@debbugs.gnu.org Cc: post@thomasdanckaert.be Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148783975329945 (code B ref 25834); Thu, 23 Feb 2017 08:50:02 +0000 Received: (at 25834) by debbugs.gnu.org; 23 Feb 2017 08:49:13 +0000 Received: from localhost ([127.0.0.1]:51944 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgp5G-0007mn-Tk for submit@debbugs.gnu.org; Thu, 23 Feb 2017 03:49:13 -0500 Received: from s01-out.spamexperts.axc.nl ([185.175.203.25]:40551) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgp5B-0007mE-QZ for 25834@debbugs.gnu.org; Thu, 23 Feb 2017 03:49:05 -0500 Received: from vserver42.axc.nl ([159.253.0.80]) by s01.spamexperts.axc.nl with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86) (envelope-from ) id 1cgp54-0003qG-Sx for 25834@debbugs.gnu.org; Thu, 23 Feb 2017 09:48:55 +0100 Received: from mail.axc.nl ([159.253.0.157]:34416) by vserver42.axc.nl with esmtp (Exim 4.87) (envelope-from ) id 1cgp51-0006mZ-Fs; Thu, 23 Feb 2017 09:48:52 +0100 Date: Thu, 23 Feb 2017 09:48:46 +0100 (CET) Message-Id: <20170223.094846.2213896491546777533.post@thomasdanckaert.be> From: Thomas Danckaert In-Reply-To: <20170222112253.30004-5-thomas.danckaert@gmail.com> References: <20170222.113015.1486949640371512143.post@thomasdanckaert.be> <20170222112253.30004-1-thomas.danckaert@gmail.com> <20170222112253.30004-5-thomas.danckaert@gmail.com> X-Mailer: Mew version 6.7 on Emacs 25.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="--Next_Part(Thu_Feb_23_09_48_46_2017_174)--" Content-Transfer-Encoding: 7bit PrimaryMX: Accepted email from trusted host. Hint: This skips spam scanning so make sure other host is not vulnerable X-Relay-Host: 159.253.0.157 X-Spam-Score: 0.0 (/) X-Spam-Report: Spam detection software, running on the system "vserver42.axc.nl", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Thomas Danckaert Subject: bug#25834: [PATCH 5/7] gnu: python-matplotlib: Update to 2.0.0. Date: Wed, 22 Feb 2017 12:22:51 +0100 > From: Thomas Danckaert > > * gnu/packages/python.scm (python-matplotlib): Update to 2.0.0. > [source]: Remove Tk backend patch, use Github instead of Sourceforge. > [outputs]: Remove "doc" output. > [propagated-inputs]: Add python-cycler. > [native-inputs]: Remove python-sphinx, python-numpydoc, texlive and texinfo. > (python-matplotlib-documentation, python2-matplotlib-documentation): New > variable. > * gnu/packages/patches/matplotlib-setupext-tk.patch: Delete file. > * gnu/local.mk (dist_patch_DATA): Remove patch. [...] Content analysis details: (0.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- SpamTally: Final spam score: 0 X-Originating-IP: 159.253.0.80 X-SpamExperts-Domain: vserver42.axc.nl X-SpamExperts-Username: 159.253.0.80 Authentication-Results: spamexperts.axc.nl; auth=pass smtp.auth=159.253.0.80@vserver42.axc.nl X-SpamExperts-Outgoing-Class: ham X-SpamExperts-Outgoing-Evidence: Combined (0.17) X-Recommended-Action: accept X-Filter-ID: s0sct1PQhAABKnZB5plbIaExX4b9HB97Y0LqBeziPXa8B5kabb+8+DRlCqSxA333/bPom7IVowNb jNmNSGjlJADpxEq2QWue0NVTi1XPmXej1KRrf1Y8eevl1lZRQAkHO76XSTAwtV4mg4i2ouCDa4AU hvIWAV5xUW/+gAh4vXp7v9Iv0vJz+klJVu9KBOSLRcOb18WfxGyg6Om6u4YYm+N11mFrDEuR4FUM 6XhzeujEJmXb7Ar/H99E7t+JzjZEexI6JliONwAnIAZqFP/xQOWBOXp8nHKe0R+FkIqN7hkbx4Px vydb/x32mhLBChw5NNMPtXItjLG4t9x0O63zbyLpQCk9LN96ieg5guM8uFge9Gory97ytKcl8m2v CNJ8q16AUQgygDMMJTOfrbMny0RznYXX6F3WKpnZjOlz3jHJ+LDk+6c65WNHYJFrd5FIBZ6++Dfk TVlBWsR5QGkluYsktHOcNcA7Yit+vIPIFAQmEqN5fXoI0ArDZbumk3L6kihXO2fRb8rpv65HbpOd qmjDv/9lZWhS1i8CvLmhSHJulq+YCc1Jf9I1b2AZYErcjxqVInDtyLKdhpFYlh+5i0pJkzvQFD0n 4ZCeWWj00iQamUdylUIKhf3z2GAHxH7IDucbqyPscDcg4YAFlcEg0Tzlt0qfM+8esN3hLUMHrXH7 HQu9msG4HgZGq+LvjmREvZ1lzptptgCaKD2vAjUZLPpf6gRpr0cy1Rs9Y+3TGPm4JB1ks2EvBGu0 XnP7uzX+39Uh4ttSsZc8acEN4bpATvt/oTfTfe57D0XgfGPVgtu1mMuA/L16wvroWbJZP5LJMS+4 ayUpOtEhdxekWDmK9g== X-Report-Abuse-To: spam@s01.spamexperts.axc.nl X-Spam-Score: -0.0 (/) 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 (/) ----Next_Part(Thu_Feb_23_09_48_46_2017_174)-- Content-Type: Text/Plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit From: Thomas Danckaert Subject: bug#25834: [PATCH 5/7] gnu: python-matplotlib: Update to 2.0.0. Date: Wed, 22 Feb 2017 12:22:51 +0100 > From: Thomas Danckaert > > * gnu/packages/python.scm (python-matplotlib): Update to 2.0.0. > [source]: Remove Tk backend patch, use Github instead of Sourceforge. > [outputs]: Remove "doc" output. > [propagated-inputs]: Add python-cycler. > [native-inputs]: Remove python-sphinx, python-numpydoc, texlive and texinfo. > (python-matplotlib-documentation, python2-matplotlib-documentation): New > variable. > * gnu/packages/patches/matplotlib-setupext-tk.patch: Delete file. > * gnu/local.mk (dist_patch_DATA): Remove patch. I send an updated patch because I've realized that we now have python-qt as well. Adding python-qt enables the Qt5Agg backend (interactive plotting widget using Qt). I'm not sure if it should be a propagated input, though. With python-qt as a regular input, the users have to install python-qt into their profile if they want to use the Qt5Agg backend. When you ask matplotlib to use Qt5Agg but don't have python-qt in your profile, you get the following error: > ImportError: Matplotlib qt-based backends require an external PyQt4, > PyQt5, or PySide package to be installed, but it was not found. This is unlike the TkAgg backend (similar plotting widget using Tk), which is available immediately (I think because of the propagated python-tkinter). Is this OK, or do we want to propagate python-qt as well so everything works immediately? The GtkAgg backend seems work automatically when in Gnome shell, but not in xfce4 (and the error message is not helpful). My guess is that something is missing from $GI_TYPELIB_PATH in xfce4. In a Gnome session, $GI_TYPELIB_PATH contains a big list of entries, while in an xfce4, it only contains ${HOME}/.guix-profile/lib/girepository-1.0. Thomas ----Next_Part(Thu_Feb_23_09_48_46_2017_174)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0001-gnu-python-matplotlib-Update-to-2.0.0.patch" >From 548df3e2ee7288be93146d7164e8e0c37ce21ce8 Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Tue, 21 Feb 2017 22:18:45 +0100 Subject: [PATCH] gnu: python-matplotlib: Update to 2.0.0. * gnu/packages/python.scm (python-matplotlib): Update to 2.0.0. [source]: Remove Tk backend patch, use Github instead of Sourceforge. [outputs]: Remove "doc" output. [inputs]: Add python-pyqt. [propagated-inputs]: Add python-cycler. [native-inputs]: Remove python-sphinx, python-numpydoc, texlive and texinfo. (python-matplotlib-documentation, python2-matplotlib-documentation): New variables. * gnu/packages/patches/matplotlib-setupext-tk.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove patch. --- gnu/local.mk | 1 - gnu/packages/patches/matplotlib-setupext-tk.patch | 34 ----- gnu/packages/python.scm | 144 ++++++++++++---------- 3 files changed, 80 insertions(+), 99 deletions(-) delete mode 100644 gnu/packages/patches/matplotlib-setupext-tk.patch diff --git a/gnu/local.mk b/gnu/local.mk index ca415ec48..13faeeba8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -748,7 +748,6 @@ dist_patch_DATA = \ %D%/packages/patches/make-impure-dirs.patch \ %D%/packages/patches/mars-install.patch \ %D%/packages/patches/mars-sfml-2.3.patch \ - %D%/packages/patches/matplotlib-setupext-tk.patch \ %D%/packages/patches/maxima-defsystem-mkdir.patch \ %D%/packages/patches/mcron-install.patch \ %D%/packages/patches/mcrypt-CVE-2012-4409.patch \ diff --git a/gnu/packages/patches/matplotlib-setupext-tk.patch b/gnu/packages/patches/matplotlib-setupext-tk.patch deleted file mode 100644 index 37c3d686e..000000000 --- a/gnu/packages/patches/matplotlib-setupext-tk.patch +++ /dev/null @@ -1,34 +0,0 @@ -Use 'pkg-config' instead of heuristics to find 'tk' flags. - ---- matplotlib-1.4.3/setupext.py.orig 2015-12-01 14:21:19.554417453 +0100 -+++ matplotlib-1.4.3/setupext.py 2015-12-02 10:39:47.282363530 +0100 -@@ -1457,7 +1457,7 @@ - p = subprocess.Popen( - '. %s ; eval echo ${%s}' % (file, varname), - shell=True, -- executable="/bin/sh", -+ executable="sh", - stdout=subprocess.PIPE) - result = p.communicate()[0] - return result.decode('ascii') -@@ -1601,8 +1601,19 @@ - # of distros. - - # Query Tcl/Tk system for library paths and version string -+ def getoutput(s): -+ ret = os.popen(s).read().strip() -+ return ret - try: -- tcl_lib_dir, tk_lib_dir, tk_ver = self.query_tcltk() -+ pkg_config_libs = getoutput('pkg-config --libs-only-L tk').split() -+ # drop '-L' part of strings -+ pkg_config_libs = [s[2:] for s in pkg_config_libs] -+ pkg_config_ver = getoutput('pkg-config --modversion tk') -+ tk_ver = re.match(r"(\d+.\d+)[\d.]*", pkg_config_ver).group(1) -+ tcl_lib_dir = next(s for s in pkg_config_libs -+ if re.match(r".*-tcl-.*", s)) + '/tcl' + tk_ver -+ tk_lib_dir = next(s for s in pkg_config_libs -+ if re.match(r".*-tk-.*", s)) + '/tk' + tk_ver - except: - tk_ver = '' - result = self.hardcoded_tcl_config() diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c45cc9db4..cae01b841 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3675,21 +3675,20 @@ between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc.") (define-public python-matplotlib (package (name "python-matplotlib") - (version "1.4.3") + (version "2.0.0") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/matplotlib/matplotlib" - "/matplotlib-" version - "/matplotlib-" version ".tar.gz")) + (uri (string-append + "https://github.com/matplotlib/matplotlib/archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1dn05cvd0g984lzhh72wa0z93psgwshbbg93fkab6slx5m3l95av")) - (patches (search-patches "matplotlib-setupext-tk.patch")))) + "0w3k5m5qb3wsd7yhvmg042xddvligklvcq2visk2c5wnph3hhsln")))) (build-system python-build-system) - (outputs '("out" "doc")) (propagated-inputs ; the following packages are all needed at run time - `(("python-pyparsing" ,python-pyparsing) + `(("python-cycler" ,python-cycler) + ("python-pyparsing" ,python-pyparsing) ("python-pygobject" ,python-pygobject) ("gobject-introspection" ,gobject-introspection) ("python-tkinter" ,python "tk") @@ -3721,75 +3720,33 @@ between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc.") ("glib" ,glib) ;; FIXME: Add backends when available. ;("python-wxpython" ,python-wxpython) - ;("python-pyqt" ,python-pyqt) + ("python-pyqt" ,python-pyqt) ("tcl" ,tcl) ("tk" ,tk))) (native-inputs `(("pkg-config" ,pkg-config) - ("python-sphinx" ,python-sphinx) - ("python-numpydoc" ,python-numpydoc) ("python-nose" ,python-nose) - ("python-mock" ,python-mock) - ("texlive" ,texlive) - ("texinfo" ,texinfo))) + ("python-mock" ,python-mock))) (arguments `(#:phases - (alist-cons-before - 'build 'configure-environment - (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((cairo (assoc-ref inputs "cairo")) - (gtk+ (assoc-ref inputs "gtk+"))) - ;; Setting these directories in the 'basedirlist' of 'setup.cfg' - ;; has not effect. - (setenv "LD_LIBRARY_PATH" - (string-append cairo "/lib:" gtk+ "/lib")) - (setenv "HOME" (getcwd)) - (call-with-output-file "setup.cfg" + (modify-phases %standard-phases + (add-before 'build 'configure-environment + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((cairo (assoc-ref inputs "cairo")) + (gtk+ (assoc-ref inputs "gtk+"))) + ;; Setting these directories in the 'basedirlist' of 'setup.cfg' + ;; has not effect. + (setenv "LD_LIBRARY_PATH" + (string-append cairo "/lib:" gtk+ "/lib")) + (setenv "HOME" (getcwd)) + (call-with-output-file "setup.cfg" (lambda (port) (format port "[directories]~% basedirlist = ~a,~a~% [rc_options]~% backend = TkAgg~%" (assoc-ref inputs "tcl") - (assoc-ref inputs "tk")))))) - (alist-cons-after - 'install 'install-doc - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((data (string-append (assoc-ref outputs "doc") "/share")) - (doc (string-append data "/doc/" ,name "-" ,version)) - (info (string-append data "/info")) - (html (string-append doc "/html"))) - ;; Make installed package available for building the - ;; documentation - (add-installed-pythonpath inputs outputs) - (with-directory-excursion "doc" - ;; Produce pdf in 'A4' format. - (substitute* (find-files "." "conf\\.py") - (("latex_paper_size = 'letter'") - "latex_paper_size = 'a4'")) - (mkdir-p html) - (mkdir-p info) - ;; The doc recommends to run the 'html' target twice. - (system* "python" "make.py" "html") - (system* "python" "make.py" "html") - (copy-recursively "build/html" html) - (system* "python" "make.py" "latex") - (system* "python" "make.py" "texinfo") - (symlink (string-append html "/_images") - (string-append info "/matplotlib-figures")) - (with-directory-excursion "build/texinfo" - (substitute* "matplotlib.texi" - (("@image\\{([^,]*)" all file) - (string-append "@image{matplotlib-figures/" file))) - (symlink (string-append html "/_images") - "./matplotlib-figures") - (system* "makeinfo" "--no-split" - "-o" "matplotlib.info" "matplotlib.texi")) - (copy-file "build/texinfo/matplotlib.info" - (string-append info "/matplotlib.info")) - (copy-file "build/latex/Matplotlib.pdf" - (string-append doc "/Matplotlib.pdf"))))) - %standard-phases)))) + (assoc-ref inputs "tk")))))))))) (home-page "http://matplotlib.org") (synopsis "2D plotting library for Python") (description @@ -3814,6 +3771,65 @@ toolkits.") ,@(fold alist-delete (package-propagated-inputs matplotlib) '("python-pycairo" "python-pygobject" "python-tkinter"))))))) +(define-public python-matplotlib-documentation + (package + (inherit python-matplotlib) + (name "python-matplotlib-documentation") + (native-inputs + `(("python-colorspacious" ,python-colorspacious) + ("python-sphinx" ,python-sphinx) + ("python-numpydoc" ,python-numpydoc) + ("python-ipython" ,python-ipython) + ("texlive" ,texlive) + ("texinfo" ,texinfo) + ,@(package-native-inputs python-matplotlib))) + (arguments + `(#:tests? #f ; we're only generating documentation + #:phases + (modify-phases %standard-phases + (delete 'build) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (let* ((data (string-append (assoc-ref outputs "out") "/share")) + (doc (string-append data "/doc/" ,name "-" + ,(package-version python-matplotlib))) + (info (string-append data "/info")) + (html (string-append doc "/html"))) + ;; Make installed package available for building the + ;; documentation + (with-directory-excursion "doc" + ;; Produce pdf in 'A4' format. + (substitute* (find-files "." "conf\\.py") + (("latex_paper_size = 'letter'") + "latex_paper_size = 'a4'")) + (mkdir-p html) + (mkdir-p info) + ;; The doc recommends to run the 'html' target twice. + (system* "python" "make.py" "html") + (system* "python" "make.py" "html") + (copy-recursively "build/html" html) + (system* "python" "make.py" "latex") + (system* "python" "make.py" "texinfo") + (symlink (string-append html "/_images") + (string-append info "/matplotlib-figures")) + (with-directory-excursion "build/texinfo" + (substitute* "matplotlib.texi" + (("@image\\{([^,]*)" all file) + (string-append "@image{matplotlib-figures/" file))) + (symlink (string-append html "/_images") + "./matplotlib-figures") + (system* "makeinfo" "--no-split" + "-o" "matplotlib.info" "matplotlib.texi")) + (copy-file "build/texinfo/matplotlib.info" + (string-append info "/matplotlib.info")) + (copy-file "build/latex/Matplotlib.pdf" + (string-append doc "/Matplotlib.pdf"))))))))) + (synopsis "Documentation for the python-matplotlib package"))) + +(define-public python2-matplotlib-documentation + (package-with-python2 python-matplotlib-documentation)) + (define-public python2-pysnptools (package (name "python2-pysnptools") -- 2.11.1 ----Next_Part(Thu_Feb_23_09_48_46_2017_174)---- From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH 1/7] gnu: Add python2-backports-shutil-get-terminal-size. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Feb 2017 13:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Thomas Danckaert , 25834@debbugs.gnu.org Cc: Thomas Danckaert Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148785609728996 (code B ref 25834); Thu, 23 Feb 2017 13:22:02 +0000 Received: (at 25834) by debbugs.gnu.org; 23 Feb 2017 13:21:37 +0000 Received: from localhost ([127.0.0.1]:52051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgtKz-0007Xc-5S for submit@debbugs.gnu.org; Thu, 23 Feb 2017 08:21:37 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:52580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgtKw-0007XS-Jt for 25834@debbugs.gnu.org; Thu, 23 Feb 2017 08:21:35 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id D42372064C; Thu, 23 Feb 2017 08:21:32 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Thu, 23 Feb 2017 08:21:32 -0500 DKIM-Signature: v=1; a=rsa-sha1; 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=mesmtp; bh=I8RdNylynwryb/CKdPWr8d7AgCQ=; b=h36YDN sKhFjykTXv1V1/np6fkCNlndx4exuCR/P/1rYMSSYZN51ywY5sQbtqHjvkdZc65b 6WeJZua+xNRqoBAfbqZEjBwDGvR3n3jVQoKC+Eu26HAGpfLLJ7adxx6aOnWgyDcr zgk0hjMeKz2XSPDgHkIRsgBNV/pS4eC7uNiDY= DKIM-Signature: v=1; a=rsa-sha1; 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=smtpout; bh=I8RdNylynwryb/ CKdPWr8d7AgCQ=; b=aXGmB0b4hvpV852e0TJnUPS4V51nXqtRQmiTfkgoz8LQ7J tjzuFbkMMGdmJT6co2l5U/71RVup2nwLsY0Qi5NPGQ8eBTsS6GhBr4JI587uYQZZ 4aNaXHzYGam2e30gyDGNdlpml3g2meoKxAg8WVjoQ/q3ImepBeOjAvIC2P+sw= X-ME-Sender: X-Sasl-enc: 645KGFQDqYHw8gNYt3yyl7FObDO69CdHGKtSzqNDHd1I 1487856092 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 333F2240CA; Thu, 23 Feb 2017 08:21:32 -0500 (EST) From: Marius Bakke In-Reply-To: <20170222112253.30004-1-thomas.danckaert@gmail.com> References: <20170222.113015.1486949640371512143.post@thomasdanckaert.be> <20170222112253.30004-1-thomas.danckaert@gmail.com> User-Agent: Notmuch/0.23.5 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Thu, 23 Feb 2017 14:21:30 +0100 Message-ID: <87zihdgi05.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) 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 Thomas Danckaert writes: > From: Thomas Danckaert > > * gnu/packages/python.scm (python2-backports-shutil-get-terminal-size): N= ew > variable. [...] > +(define-public python2-backports-shutil-get-terminal-size > + (package-with-python2 The "package-with-python" procedure expects to get a py3 equipped package as argument. For python2-only packages, I prefer to have the inputs explicitly set to the python2 variants. > + (package > + (name "python-backports-shutil-get-terminal-size") python2* > + (version "1.0.0") > + (source > + (origin > + (method url-fetch) > + (uri (string-append > + "https://pypi.python.org/packages/ec/9c/" > + "368086faa9c016efce5da3e0e13ba392c9db79e3ab740b763fe28620b= 18b/" > + "backports.shutil_get_terminal_size-" version ".tar.gz")) Is it possible to use 'pypi-uri' here? > + (sha256 > + (base32 > + "107cmn7g3jnbkp826zlj8rrj19fam301qvaqf0f3905f5217lgki")))) > + (build-system python-build-system) > + (home-page > + "https://github.com/chrippa/backports.shutil_get_terminal_size") > + (synopsis > + "Backport of Python 3.3's @code{shutil.get_terminal_size()}") I don't think Texinfo syntax is supported in synopses. See e.g. https://www.gnu.org/software/guix/packages/r.html#ruby-minitest-bonus-asser= tions > + (description > + "A backport of the get_terminal_size function from Python 3.3's sh= util. > +Unlike the original version it is written in pure Python rather than C, = so it > +might be a tiny bit slower.") Here "get_terminal_size" and "shutil" would be clearer with an @code{} wrapper IMO. Otherwise LGTM. > + (license license:expat)))) > + > (define-public python-waf > (package > (name "python-waf") > --=20 > 2.11.1 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAliu4doACgkQoqBt8qM6 VPppYQgAgUrLCac8M0ENSKMD5sp/EXUamCk61wGPMtjJfyZksEaAT0zXSea2wCZX orRx04BRf/mjX3pgjmIgvL+TKvwY/qZmbprY2yU1wdvxP2ORuvhRvBWx/4bT/NfR V75Je83HKRGahieY8nhEF+LXz3H9LvxVRgNISkaYbveKTi2wNbAN7FpYJwODbHgD rj3nA4WyfCoy9OKz44fO1+2oFTWi0wgT4jEjrxireJRkO3fEpqRKEdux9/KJojR2 64Il4cCegtN+wTMlsafCunKIeEv/qeaYyNjPo+81Y0s+a08y8bt0X4YAU3WzH60l w/Far3Vun594Zyz4QQ+9NSo9jacfaw== =ZGsE -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH 3/7] gnu: python-sphinx: Update to 1.5.2. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Feb 2017 13:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Thomas Danckaert , 25834@debbugs.gnu.org Cc: Thomas Danckaert Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148785620129168 (code B ref 25834); Thu, 23 Feb 2017 13:24:01 +0000 Received: (at 25834) by debbugs.gnu.org; 23 Feb 2017 13:23:21 +0000 Received: from localhost ([127.0.0.1]:52055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgtMf-0007aO-Hv for submit@debbugs.gnu.org; Thu, 23 Feb 2017 08:23:21 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:60773) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgtMd-0007aG-VD for 25834@debbugs.gnu.org; Thu, 23 Feb 2017 08:23:20 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id D2CFD2093F; Thu, 23 Feb 2017 08:23:19 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Thu, 23 Feb 2017 08:23:19 -0500 DKIM-Signature: v=1; a=rsa-sha1; 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=mesmtp; bh=y8X7GbTkhMyE9g9Ofmy2Zt3wlQQ=; b=ij303O l0BRg+pN1FIEeQrLX7MN5w4o/Rw+RWbcpWgp+VX7WxnoYPVCY9+tYeZlEvYUD6uY bnJeCL7GMxX1SKYTZxB4rZy4u+71MNVOIXAcmOl6Y5KJvqAziqxZOfzoCY7Mvk28 3BdQzSjR+BxTyKeY1vJ/3StmzYFkVjqqrvS0k= DKIM-Signature: v=1; a=rsa-sha1; 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=smtpout; bh=y8X7GbTkhMyE9g 9Ofmy2Zt3wlQQ=; b=QjKxGJoWQx0Oo1HVu0GvbPlldKohgz3L+oynLHCbKB8p7l ILJENK/VrFnH+vvc1aq/8fJ0fgaL20jx5Fo/udGR8IsOrmq2mtI898pdwshoYzJM S6SF1HVxGvfimY9Rj5rAbo0lx4xiuBcvniXoPIm1Bqz4dOcjVhJw7wtmWld8I= X-ME-Sender: X-Sasl-enc: dJ6d8EnDKF3epDpi3XFglkvOsCHZlW+tiz3FfStDlUXk 1487856199 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 66C6C24323; Thu, 23 Feb 2017 08:23:19 -0500 (EST) From: Marius Bakke In-Reply-To: <20170222112253.30004-3-thomas.danckaert@gmail.com> References: <20170222.113015.1486949640371512143.post@thomasdanckaert.be> <20170222112253.30004-1-thomas.danckaert@gmail.com> <20170222112253.30004-3-thomas.danckaert@gmail.com> User-Agent: Notmuch/0.23.5 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Thu, 23 Feb 2017 14:23:17 +0100 Message-ID: <87wpchghx6.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) 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 Thomas Danckaert writes: > From: Thomas Danckaert > > * gnu/packages/python.scm (python-sphinx): Update to 1.5.2. > [propagated-inputs]: Add python-sphinx-alabaster-theme, > python-sphinx-rtd-theme, python-babel, python-requests, > python-snowballstemmer and python-imagesize. We already have sphinx 1.5.1 in 'python-tests'. In fact you should probably base this series off it! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAliu4kYACgkQoqBt8qM6 VPq9yAf+Mr2pmEADEn9DH0IzrRNpTqDl7nT7oes07D3EOvVjXYqc5V8yom5nLQzO 7nOukbzId66miFmBmEQWhcE0DSc/QG9DXWB3hmeggfbcIlZ4vz9SBr6CNPMgUQK9 FRL+Xrjh10nDn0NikX6c7hAAlyOq7fnogv0WGisTKeyLrudRL1j21F49sOjM3c+V CGgdYKACmgnwxkbss7mwE8aAW6CvbWkPt6AiL0DpS26lyLxSieaxBCA9tjcSAh9K R/K0wCo3L6KZcVbZzj7G1mAypxjhMC/CiPwRIdNwYTptHQnKx0KG0F5jAcADtvsH U+T0/V4bmIFKt+yxHasA2D6ViQlVuA== =HZS6 -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH 5/7] gnu: python-matplotlib: Update to 2.0.0. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Feb 2017 13:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Thomas Danckaert , 25834@debbugs.gnu.org Cc: post@thomasdanckaert.be Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148785641929469 (code B ref 25834); Thu, 23 Feb 2017 13:27:02 +0000 Received: (at 25834) by debbugs.gnu.org; 23 Feb 2017 13:26:59 +0000 Received: from localhost ([127.0.0.1]:52059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgtQB-0007fF-1e for submit@debbugs.gnu.org; Thu, 23 Feb 2017 08:26:59 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:59969) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgtQ6-0007f3-20 for 25834@debbugs.gnu.org; Thu, 23 Feb 2017 08:26:57 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id F106B209FB; Thu, 23 Feb 2017 08:26:53 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Thu, 23 Feb 2017 08:26:53 -0500 DKIM-Signature: v=1; a=rsa-sha1; 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=mesmtp; bh=C/zXH/IsyqWWJGT80RbFQc0BYOo=; b=v7ROpq Uo0VW8XK1D1C5O2AV7Sr4wYT4jcDf3Uc+p2+5xCwoBb9pdZ58cFIij4nuiR08L/Z zUf/5qTvLweY2IXh/I2T/u/DJeMVaV/2dMBwC5w4kZIugDxGMI27vayIcwlyIHTu 4ydg5Z5hdm/f86xAqsd7C/QD1g/4GBcwbKQB4= DKIM-Signature: v=1; a=rsa-sha1; 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=smtpout; bh=C/zXH/IsyqWWJG T80RbFQc0BYOo=; b=dnhYoM+iVp3303PDdMx6piMnWZd3qhbZCIvwTOY/8qcNuw JVfrcmzKqWCCFtJyREFFbJmPZHYP2yRViwpBqgHkWhhcpSXynPbF1Bm9JZPlgBNA KYIVz/TZsx4AoOVE2EEAnGvLGvOoZrw4pNbd3h4lWTJfd2ytU02cr9v0FKcDg= X-ME-Sender: X-Sasl-enc: VH0Pi45Mts6FMTtsbH6LUvB05VGK6OLZscodtnEtmxC7 1487856413 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 88B2424077; Thu, 23 Feb 2017 08:26:53 -0500 (EST) From: Marius Bakke In-Reply-To: <20170223.094846.2213896491546777533.post@thomasdanckaert.be> References: <20170222.113015.1486949640371512143.post@thomasdanckaert.be> <20170222112253.30004-1-thomas.danckaert@gmail.com> <20170222112253.30004-5-thomas.danckaert@gmail.com> <20170223.094846.2213896491546777533.post@thomasdanckaert.be> User-Agent: Notmuch/0.23.5 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Thu, 23 Feb 2017 14:26:52 +0100 Message-ID: <87tw7lghr7.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) 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 Thomas Danckaert writes: > From: Thomas Danckaert > Subject: bug#25834: [PATCH 5/7] gnu: python-matplotlib: Update to 2.0.0. > Date: Wed, 22 Feb 2017 12:22:51 +0100 > >> From: Thomas Danckaert >>=20 >> * gnu/packages/python.scm (python-matplotlib): Update to 2.0.0. >> [source]: Remove Tk backend patch, use Github instead of Sourceforge. >> [outputs]: Remove "doc" output. >> [propagated-inputs]: Add python-cycler. >> [native-inputs]: Remove python-sphinx, python-numpydoc, texlive and texi= nfo. >> (python-matplotlib-documentation, python2-matplotlib-documentation): New >> variable. >> * gnu/packages/patches/matplotlib-setupext-tk.patch: Delete file. >> * gnu/local.mk (dist_patch_DATA): Remove patch. > > I send an updated patch because I've realized that we now have python-qt = as well. Adding python-qt enables the Qt5Agg backend (interactive plotting= widget using Qt). > > I'm not sure if it should be a propagated input, though. With > python-qt as a regular input, the users have to install python-qt into > their profile if they want to use the Qt5Agg backend. When you ask matpl= otlib to use Qt5Agg but don't have python-qt in your profile, you get the f= ollowing error: > >> ImportError: Matplotlib qt-based backends require an external PyQt4, >> PyQt5, or PySide package to be installed, but it was not found. > > This is unlike the TkAgg backend (similar plotting widget using Tk), > which is available immediately (I think because of the propagated > python-tkinter). Is this OK, or do we want to propagate python-qt as > well so everything works immediately? Pulling in Qt for matplotlib sounds a bit much. Since it supports three different qt backends and handles them missing gracefully, I think it's better to leave this choice to the user. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAliu4xwACgkQoqBt8qM6 VPqLgwf/b4ltB3BeB/L34Y7lOloUUWf/Q03SMUl1mGRdki/w1/rFaIztnYXWghz2 Q70r2dYvtavYObe4ACsJkw1Z2U46nwP7wJWTNkY6YDq0OV3tVJYllgXi8tyZZRe6 aMksRxdsEzr2CX5gVXKiCysQ/46WsHk/hR8kc/b7bczajI/JDWAs8iH7C/BgFqT1 u1ucgCgKBLucsfBdqbUVseHNoYEGb/oDSpMUsZF1ne8e84YNSqpvkWxWrDtvVYIB wa/qjzQl3ICNfp/LZWbR5+ucidmTvjt2GouRJ0F8K+fYH64ujNzxxGiANCbPgXsf mrRVGhibUavCUM606S7TQpDPZdCJWQ== =SRKL -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH 3/7] gnu: python-sphinx: Update to 1.5.2. Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Feb 2017 10:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: mbakke@fastmail.com Cc: 25834@debbugs.gnu.org Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148793171018330 (code B ref 25834); Fri, 24 Feb 2017 10:22:02 +0000 Received: (at 25834) by debbugs.gnu.org; 24 Feb 2017 10:21:50 +0000 Received: from localhost ([127.0.0.1]:53563 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1chD0Y-0004la-6s for submit@debbugs.gnu.org; Fri, 24 Feb 2017 05:21:50 -0500 Received: from s01-out.spamexperts.axc.nl ([185.182.59.6]:46159) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1chD0W-0004lL-KG for 25834@debbugs.gnu.org; Fri, 24 Feb 2017 05:21:49 -0500 Received: from vserver42.axc.nl ([159.253.0.80]) by s01.spamexperts.axc.nl with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86) (envelope-from ) id 1chD0Q-0003Ol-5Y; Fri, 24 Feb 2017 11:21:42 +0100 Received: from mail.axc.nl ([159.253.0.157]:59813) by vserver42.axc.nl with esmtp (Exim 4.87) (envelope-from ) id 1chD0N-0002cE-9R; Fri, 24 Feb 2017 11:21:39 +0100 Date: Fri, 24 Feb 2017 11:21:30 +0100 (CET) Message-Id: <20170224.112130.1260506633380136109.post@thomasdanckaert.be> From: Thomas Danckaert In-Reply-To: <87wpchghx6.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <20170222112253.30004-1-thomas.danckaert@gmail.com> <20170222112253.30004-3-thomas.danckaert@gmail.com> <87wpchghx6.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> X-Mailer: Mew version 6.7 on Emacs 25.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=utf-8; format=flowed Content-Transfer-Encoding: base64 PrimaryMX: Accepted email from trusted host. Hint: This skips spam scanning so make sure other host is not vulnerable X-Relay-Host: 159.253.0.157 X-Spam-Score: 0.0 (/) X-Spam-Report: Spam detection software, running on the system "vserver42.axc.nl", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Marius Bakke Subject: Re: bug#25834: [PATCH 3/7] gnu: python-sphinx: Update to 1.5.2. Date: Thu, 23 Feb 2017 14:23:17 +0100 >> From: Thomas Danckaert >> >> * gnu/packages/python.scm (python-sphinx): Update to 1.5.2. >> [propagated-inputs]: Add python-sphinx-alabaster-theme, >> python-sphinx-rtd-theme, python-babel, python-requests, >> python-snowballstemmer and python-imagesize. > > We already have sphinx 1.5.1 in 'python-tests'. In fact you should > probably base this series off it! [...] Content analysis details: (0.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- SpamTally: Final spam score: 0 X-Originating-IP: 159.253.0.80 X-SpamExperts-Domain: vserver42.axc.nl X-SpamExperts-Username: 159.253.0.80 Authentication-Results: spamexperts.axc.nl; auth=pass smtp.auth=159.253.0.80@vserver42.axc.nl X-SpamExperts-Outgoing-Class: ham X-SpamExperts-Outgoing-Evidence: Combined (0.05) X-Recommended-Action: accept X-Filter-ID: s0sct1PQhAABKnZB5plbIaExX4b9HB97Y0LqBeziPXa8B5kabb+8+DRlCqSxA333/bPom7IVowNb jNmNSGjlJADpxEq2QWue0NVTi1XPmXej1KRrf1Y8eevl1lZRQAkHO76XSTAwtV4mg4i2ouCDa4AU hvIWAV5xUW/+gAh4vXqDF28c4JSwuxNNB9Tg35slRcOb18WfxGyg6Om6u4YYm8/KAmjmpcP4rtXP PMQjqIbEJmXb7Ar/H99E7t+JzjZEexI6JliONwAnIAZqFP/xQOWBOXp8nHKe0R+FkIqN7hkbx4Px vydb/x32mhLBChw5NNMPtXItjLG4t9x0O63zbyLpQCk9LN96ieg5guM8uFge9Gory97ytKcl8m2v CNJ8q16AUQgygDMMJTOfrbMny8m+7kyE0C3e0ewTpHIiqxPJ+LDk+6c65WNHYJFrd5FIBZ6++Dfk TVlBWsR5QGkluYsktHOcNcA7Yit+vIPIFAQmEqN5fXoI0ArDZbumk3L6kihXO2fRb8rpv65HbpOd qmjDv/9lZWhS1i8CvLmhSHJulq+YCc1Jf9I1b2AZYErcjxqVInDtyLKdhpFYlh+5i0pJkzvQFD0n 4ZCeWWj00iQamUdylUIKhf3z2GAHxH7IDucbqyPscDcg4YAFlcEg0Tzlt0qfM+8esN3hLUMHrXEf Z2eQMptnduNjoV7RRuVPvZ1lzptptgCaKD2vAjUZLPpf6gRpr0cy1Rs9Y+3TGPm4JB1ks2EvBGu0 XnP7uzX+39Uh4ttSsZc8acEN4bpATs38oXhwrzD/CBsPOqo0Fjezpm2xwHKVKx9sVA+FZbQTyS3D J9i17caAL0FSb4D9LWYWPO3eRMaw86eAIPk41Gw= X-Report-Abuse-To: spam@s01.spamexperts.axc.nl X-Spam-Score: -0.0 (/) 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 (/) RnJvbTogTWFyaXVzIEJha2tlIDxtYmFra2VAZmFzdG1haWwuY29tPg0KU3ViamVjdDogUmU6IGJ1 ZyMyNTgzNDogW1BBVENIIDMvN10gZ251OiBweXRob24tc3BoaW54OiBVcGRhdGUgdG8gDQoxLjUu Mi4NCkRhdGU6IFRodSwgMjMgRmViIDIwMTcgMTQ6MjM6MTcgKzAxMDANCg0KPj4gRnJvbTogVGhv bWFzIERhbmNrYWVydCA8cG9zdEB0aG9tYXNkYW5ja2FlcnQuYmU+DQo+Pg0KPj4gKiBnbnUvcGFj a2FnZXMvcHl0aG9uLnNjbSAocHl0aG9uLXNwaGlueCk6IFVwZGF0ZSB0byAxLjUuMi4NCj4+ICAg W3Byb3BhZ2F0ZWQtaW5wdXRzXTogQWRkIHB5dGhvbi1zcGhpbngtYWxhYmFzdGVyLXRoZW1lLA0K Pj4gICBweXRob24tc3BoaW54LXJ0ZC10aGVtZSwgcHl0aG9uLWJhYmVsLCBweXRob24tcmVxdWVz dHMsDQo+PiAgIHB5dGhvbi1zbm93YmFsbHN0ZW1tZXIgYW5kIHB5dGhvbi1pbWFnZXNpemUuDQo+ DQo+IFdlIGFscmVhZHkgaGF2ZSBzcGhpbnggMS41LjEgaW4gJ3B5dGhvbi10ZXN0cycuIEluIGZh Y3QgeW91IHNob3VsZA0KPiBwcm9iYWJseSBiYXNlIHRoaXMgc2VyaWVzIG9mZiBpdCENCg0KT2su ICBJIGhhdmUgYW4gdXBkYXRlZCBwYXRjaCBzZXJpZXMgYmFzZWQgb24gcHl0aG9uLXRlc3RzICgr eW91ciDigJxhZGQgDQpjeWNsZXLigJ0gY29tbWl0KS4gIERvIHlvdSBoYXZlIGZ1cnRoZXIgY29t bWVudHMgdGhlIG90aGVyIHBhdGNoZXMsIG9yIA0Kc2hhbGwgSSBzZW5kIHRoZSBuZXcgcGF0Y2hz ZXJpZXMgKG1heWJlIGFzIGEgc2luZ2xlIGF0dGFjaG1lbnQgdG8gbm90IA0KcG9sbHV0ZSB0aGUg bGlzdCB1bm5lY2Vzc2FyaWx5PykuDQoNClRob21hcw0K From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH 3/7] gnu: python-sphinx: Update to 1.5.2. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Feb 2017 10:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Thomas Danckaert Cc: 25834@debbugs.gnu.org Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148793289720039 (code B ref 25834); Fri, 24 Feb 2017 10:42:02 +0000 Received: (at 25834) by debbugs.gnu.org; 24 Feb 2017 10:41:37 +0000 Received: from localhost ([127.0.0.1]:53568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1chDJg-0005D8-Ux for submit@debbugs.gnu.org; Fri, 24 Feb 2017 05:41:37 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:43350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1chDJf-0005D1-Ml for 25834@debbugs.gnu.org; Fri, 24 Feb 2017 05:41:36 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 5C975206CC; Fri, 24 Feb 2017 05:41:33 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Fri, 24 Feb 2017 05:41:33 -0500 DKIM-Signature: v=1; a=rsa-sha1; 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=mesmtp; bh=rbUCtvQbyFv6zFovNbaKFEKKIB4=; b=TXi26X /LIOyyLtH7OZU2P8GrPwfFUfhpinxsb5B77bakodxcYtREboUltbuiXspQE/hLs9 YPnFm0JSwr6ZwuJIk8hMDZygd6SM8PGO7jlaOLNwmdgyOBAujxGx8dVNF6MzG927 OLawNjnO/l0tBWQ7fY26Wy/IvIKsXhPq9rjYI= DKIM-Signature: v=1; a=rsa-sha1; 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=smtpout; bh=rbUCtvQbyFv6zF ovNbaKFEKKIB4=; b=VLhVHpyyeF5KZu2qdrNRcXGy67yGK7W0t+XLsAnbIzlhYr 54LoWEXKlKAXSTxehNQl580rMuIhoO2IQxGC2HDyYAcpT10EBOM81l8BBW5i3xV/ z6H8PeNJl0ysPCnmDD7CuU1BvAWFG33PFyfUQxpdulM9dvjXqr3DtTLIYSh68= X-ME-Sender: X-Sasl-enc: JkLEWsans0RTq5N+yZf6pkuC4bTnyKfs71Ekn0fTwWG8 1487932892 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id D403D24432; Fri, 24 Feb 2017 05:41:32 -0500 (EST) From: Marius Bakke In-Reply-To: <20170224.112130.1260506633380136109.post@thomasdanckaert.be> References: <20170222112253.30004-1-thomas.danckaert@gmail.com> <20170222112253.30004-3-thomas.danckaert@gmail.com> <87wpchghx6.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <20170224.112130.1260506633380136109.post@thomasdanckaert.be> User-Agent: Notmuch/0.23.5 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Fri, 24 Feb 2017 11:41:31 +0100 Message-ID: <878tovhnvo.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) 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 Thomas Danckaert writes: > From: Marius Bakke > Subject: Re: bug#25834: [PATCH 3/7] gnu: python-sphinx: Update to=20 > 1.5.2. > Date: Thu, 23 Feb 2017 14:23:17 +0100 > >>> From: Thomas Danckaert >>> >>> * gnu/packages/python.scm (python-sphinx): Update to 1.5.2. >>> [propagated-inputs]: Add python-sphinx-alabaster-theme, >>> python-sphinx-rtd-theme, python-babel, python-requests, >>> python-snowballstemmer and python-imagesize. >> >> We already have sphinx 1.5.1 in 'python-tests'. In fact you should >> probably base this series off it! > > Ok. I have an updated patch series based on python-tests (+your =E2=80= =9Cadd=20 > cycler=E2=80=9D commit). Do you have further comments the other patches,= or=20 > shall I send the new patchseries (maybe as a single attachment to not=20 > pollute the list unnecessarily?). The only comment I have on the colorspacious commit is that a line is too long. Didn't read the updates thoroughly due to the mix of using modify-phases; but will do so next time around. Single file is great! Thank you! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAliwDdsACgkQoqBt8qM6 VPo31Af/UNGOuloN+j2L5fnpViQSxG+DC/Jaazp1jD+oMoF8hw6jGQ+1IOLisO1s pLXjtmIwMTB7U4/AOXzPNAAtvJnVyHKARpat5Un7KDr2pbJLdClt/T96tXcYzeYt 37Kc8K7XcScAGQUaUHdawrhbktw/BE3PrVRyIkSQRwpnGJV0lZaKSo6XbVaaUkyv NtCXZwFAxKutsg1hO0WGe+C6UNVwPdBlwZm+iKs8Ap7yzgaD7u/UhUOn7Kqhm0io E3+riYqAe5VhavPgrYC+WjopSt7MCj+kecgZfZ6vOnfVoIQD99wMcdmPvwDEjimQ C939RqeNhG6qOPwUH7VW4j/WukFEVw== =rvRK -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH] Update scipy stack. Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Feb 2017 09:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: mbakke@fastmail.com, 25834@debbugs.gnu.org Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148818931210884 (code B ref 25834); Mon, 27 Feb 2017 09:56:02 +0000 Received: (at 25834) by debbugs.gnu.org; 27 Feb 2017 09:55:12 +0000 Received: from localhost ([127.0.0.1]:57513 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ciI1E-0002oy-Im for submit@debbugs.gnu.org; Mon, 27 Feb 2017 04:55:12 -0500 Received: from s01.spamexperts.axc.nl ([185.182.56.9]:39912) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ciI19-0002oh-Gt for 25834@debbugs.gnu.org; Mon, 27 Feb 2017 04:54:59 -0500 Received: from vserver42.axc.nl ([159.253.0.80]) by s01.spamexperts.axc.nl with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86) (envelope-from ) id 1ciI12-0003kh-37; Mon, 27 Feb 2017 10:54:49 +0100 Received: from mail.axc.nl ([159.253.0.157]:35366) by vserver42.axc.nl with esmtp (Exim 4.87) (envelope-from ) id 1ciI0x-00073N-GR; Mon, 27 Feb 2017 10:54:47 +0100 Date: Mon, 27 Feb 2017 10:54:36 +0100 (CET) Message-Id: <20170227.105436.886364398192522191.post@thomasdanckaert.be> From: Thomas Danckaert In-Reply-To: <878tovhnvo.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <87zihdgi05.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <87wpchghx6.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <20170224.112130.1260506633380136109.post@thomasdanckaert.be> <878tovhnvo.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> X-Mailer: Mew version 6.7 on Emacs 25.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="--Next_Part(Mon_Feb_27_10_54_36_2017_047)--" Content-Transfer-Encoding: 7bit PrimaryMX: Accepted email from trusted host. Hint: This skips spam scanning so make sure other host is not vulnerable X-Relay-Host: 159.253.0.157 X-Spam-Score: 0.0 (/) X-Spam-Report: Spam detection software, running on the system "vserver42.axc.nl", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi, here's a new and improved patch series, on top of the python-tests branch. It also needs python-cycler, which is currently only in master (cherry-picked commit included here for convenience). some comments: [...] Content analysis details: (0.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- SpamTally: Final spam score: 0 X-Originating-IP: 159.253.0.80 X-SpamExperts-Domain: vserver42.axc.nl X-SpamExperts-Username: 159.253.0.80 Authentication-Results: spamexperts.axc.nl; auth=pass smtp.auth=159.253.0.80@vserver42.axc.nl X-SpamExperts-Outgoing-Class: ham X-SpamExperts-Outgoing-Evidence: Combined (0.12) X-Recommended-Action: accept X-Filter-ID: s0sct1PQhAABKnZB5plbIaExX4b9HB97Y0LqBeziPXa8B5kabb+8+DRlCqSxA333/bPom7IVowNb jNmNSGjlJADpxEq2QWue0NVTi1XPmXej1KRrf1Y8eevl1lZRQAkHO76XSTAwtV4mg4i2ouCDa4AU hvIWAV5xUW/+gAh4vXp/oQIOuF99xBguKJ/3YoFvRcOb18WfxGyg6Om6u4YYm7BNk/MOILxGSuLq sOBiQefEJmXb7Ar/H99E7t+JzjZEexI6JliONwAnIAZqFP/xQOWBOXp8nHKe0R+FkIqN7hkbx4Px vydb/x32mhLBChw5NNMPtXItjLG4t9x0O63zbyLpQCk9LN96ieg5guM8uFge9Gory97ytKcl8m2v CNJ8q16AUQgygDMMJTOfrbMnywX6iJjnqjIuw1Wwf+oxnX7J+LDk+6c65WNHYJFrd5FIBZ6++Dfk TVlBWsR5QGkluYsktHOcNcA7Yit+vIPIFAQmEqN5fXoI0ArDZbumk3L6kihXO2fRb8rpv65HbpOd qmjDv/9lZWhS1i8CvLmhSHJulq+YCc1Jf9I1b2AZYErcjxqVInDtyLKdhpFYlh+5i0pJkzvQFD0n 4ZCeWWj00iQamUdylUIKhf3z2GAHxH7IDucbqyPscDcg4YAFlcEg0Tzlt0qfM+8esN3hLUMHrXHa F0P8Scb8Ih0vVEjhLnnwvZ1lzptptgCaKD2vAjUZLPpf6gRpr0cy1Rs9Y+3TGPm4JB1ks2EvBGu0 XnP7uzX+39Uh4ttSsZc8acEN4bpATs38oXhwrzD/CBsPOqo0Fjezpm2xwHKVKx9sVA+FZbQTyS3D J9i17caAL0FSb4D9LWYWPO3eRMaw86eAIPk41Gw= X-Report-Abuse-To: spam@s01.spamexperts.axc.nl X-Spam-Score: -0.0 (/) 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 (/) ----Next_Part(Mon_Feb_27_10_54_36_2017_047)-- Content-Type: Text/Plain; charset=utf-8; format=flowed Content-Transfer-Encoding: base64 SGksDQoNCmhlcmUncyBhIG5ldyBhbmQgaW1wcm92ZWQgcGF0Y2ggc2VyaWVzLCBvbiB0b3Agb2Yg dGhlIHB5dGhvbi10ZXN0cyANCmJyYW5jaC4gIEl0IGFsc28gbmVlZHMgcHl0aG9uLWN5Y2xlciwg d2hpY2ggaXMgY3VycmVudGx5IG9ubHkgaW4gDQptYXN0ZXIgKGNoZXJyeS1waWNrZWQgY29tbWl0 IGluY2x1ZGVkIGhlcmUgZm9yIGNvbnZlbmllbmNlKS4NCg0Kc29tZSBjb21tZW50czoNCg0KMSkg bWF0cGxvdGxpYi1kb2N1bWVudGF0aW9uL251bXB5LWRvY3VtZW50YXRpb246IEkgZGVjaWRlZCBu b3QgdG8gdXNlIA0K4oCcKGluaGVyaXRzIC4uLinigJ0gYmVjYXVzZQ0KDQogIC0gaXQgZ290IG1l c3N5IGZvciBtYXRwbG90bGliLCB3aGVyZSBJIHRoaW5rIHRoZSDigJxweXRob24yLXZhcmlhbnTi gJ0gDQpvZg0KICAgIHRoZSBiYXNlIG1hdHBsb3RsaWIgcGFja2FnZSBpbnRlcmZlcmVkIHdoZW4g dHJ5aW5nIHRvDQogICAgKHBhY2thZ2Utd2l0aC1weXRob24yIG1hdHBsb3RsaWItZG9jdW1lbnRh dGlvbiksIGFuZA0KDQogIC0gYWxsIG9mIHRoZSBpbnB1dCBmaWVsZHMgbmVlZCB0byBiZSByZXdy aXR0ZW4gYW55d2F5ICh0aGUNCiAgICBkb2N1bWVudGF0aW9uIHBhY2thZ2VzIG9ubHkgbmVlZCBh IG51bWJlciBvZiBuYXRpdmUgaW5wdXRzKS4NCg0KMikgQnVpbGRpbmcgdGhlIGxhdGV4IHZlcnNp b24gb2Ygc2NpcHkncyBkb2N1bWVudGF0aW9uIG5vdyBmYWlscyBkdWUgDQp0byBtaXNzaW5nIHVu aWNvZGUgY2hhcmFjdGVycyBhbmQgYSBsb3Qgb2YgdW5lc2NhcGVkIGlubGluZSBtYXRoIA0KZm9y bXVsYXMsIHdoaWNoIGFyZSB1cHN0cmVhbSBpc3N1ZXMgSU1PIChJJ2xsIHN1Ym1pdCBhbiBpc3N1 ZSBvbiANCnRoZWlyIGdpdGh1YiBwYWdlKS4NCg0KMykNCkZyb206IE1hcml1cyBCYWtrZSA8bWJh a2tlQGZhc3RtYWlsLmNvbT4NCkRhdGU6IFRodSwgMjMgRmViIDIwMTcgMTQ6MjE6MzAgKzAxMDAN Cg0KPj4gKyAgICAgKHNvdXJjZQ0KPj4gKyAgICAgIChvcmlnaW4NCj4+ICsgICAgICAgIChtZXRo b2QgdXJsLWZldGNoKQ0KPj4gKyAgICAgICAgKHVyaSAoc3RyaW5nLWFwcGVuZA0KPj4gKyAgICAg ICAgICAgICAgImh0dHBzOi8vcHlwaS5weXRob24ub3JnL3BhY2thZ2VzL2VjLzljLyINCj4+ICsg ICAgICAgICAgICAgIA0KPj4gIjM2ODA4NmZhYTljMDE2ZWZjZTVkYTNlMGUxM2JhMzkyYzlkYjc5 ZTNhYjc0MGI3NjNmZTI4NjIwYjE4Yi8iDQo+PiArICAgICAgICAgICAgICAiYmFja3BvcnRzLnNo dXRpbF9nZXRfdGVybWluYWxfc2l6ZS0iIHZlcnNpb24gDQo+PiAiLnRhci5neiIpKQ0KPg0KPiBJ cyBpdCBwb3NzaWJsZSB0byB1c2UgJ3B5cGktdXJpJyBoZXJlPw0KDQpJIGNvdWxkbid0IGZpbmQg YSB3b3JraW5nIHB5cGktdXJpLCBoYXZpbmcgdHJpZWQgYWxsIHNvcnRzIG9mIA0KY29tYmluYXRp b25zIG9mIOKAnGJhY2twb3J0cy5zaHV0aWwtZ2V0LXRlcm1pbmFsLXNpemXigJ0gb3IgDQrigJxi YWNrcG9ydHMtc2h1dGlsLWdldC10ZXJtaW5hbC1zaXpl4oCdIChpcyB0aGVyZSBzb21lIHNvcnQg b2YgdHJpY2sgdG8gDQpmaW5kIHRoZXNlPyBUaGVzZSBzaW1wbGUgdXJscyBhcmUgbmV2ZXIgbGlz dGVkIG9uIHB5cGksIGlzIG15IA0KaW1wcmVzc2lvbi4pLg0KDQo0KSBJIHJlbW92ZWQgdGhlIHBh dGNoIHJlbGF0ZWQgdG8gdGhlIE1hdHBsb3RsaWIgVGsgYmFja2VuZCwgYmVjYXVzZSANCml0IG5v dyBzZWVtcyB0byB3b3JrIGp1c3QgZmluZSB3aXRob3V0IGl0LiAgQnV0IG1heWJlIEkgbWlzdW5k ZXJzdGFuZCANCnRoZSByZWFzb24gdGhlIHBhdGNoIHdhcyB0aGVyZS4uLiBjb21tZW50cz8NCg0K Y2hlZXJzLA0KDQpUaG9tYXMNCg== ----Next_Part(Mon_Feb_27_10_54_36_2017_047)-- Content-Type: Text/X-Patch; charset=utf-8 Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="update-scipy.patch" RnJvbSA1NTY3NjRjMTAyNzJiNDEyYjBiMWFhZDI2NDI5YmU1NjNiYzcxMWUzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQ0KRnJvbTogTWFyaXVzIEJha2tlIDxtYmFra2VAZmFzdG1haWwuY29tPg0K RGF0ZTogVGh1LCAxOSBKYW4gMjAxNyAxODozNToxOCArMDEwMA0KU3ViamVjdDogW1BBVENIIDEv OV0gZ251OiBBZGQgcHl0aG9uLWN5Y2xlci4NCg0KKiBnbnUvcGFja2FnZXMvcHl0aG9uLnNjbSAo cHl0aG9uLWN5Y2xlciwgcHl0aG9uMi1jeWNsZXIpOiBOZXcgdmFyaWFibGVzLg0KLS0tDQogZ251 L3BhY2thZ2VzL3B5dGhvbi5zY20gfCAzMCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysN CiAxIGZpbGUgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKQ0KDQpkaWZmIC0tZ2l0IGEvZ251L3Bh Y2thZ2VzL3B5dGhvbi5zY20gYi9nbnUvcGFja2FnZXMvcHl0aG9uLnNjbQ0KaW5kZXggZTI2ZTQ0 MmU1Li45ZDE5OTYzMTQgMTAwNjQ0DQotLS0gYS9nbnUvcGFja2FnZXMvcHl0aG9uLnNjbQ0KKysr IGIvZ251L3BhY2thZ2VzL3B5dGhvbi5zY20NCkBAIC0zNzMzLDYgKzM3MzMsMzYgQEAgdHJhbnNj ZW5kZW50YWwgZnVuY3Rpb25zKS4iKQ0KIChkZWZpbmUtcHVibGljIHB5dGhvbjItbnVtZXhwcg0K ICAgKHBhY2thZ2Utd2l0aC1weXRob24yIHB5dGhvbi1udW1leHByKSkNCiANCisoZGVmaW5lLXB1 YmxpYyBweXRob24tY3ljbGVyDQorICAocGFja2FnZQ0KKyAgICAobmFtZSAicHl0aG9uLWN5Y2xl ciIpDQorICAgICh2ZXJzaW9uICIwLjEwLjAiKQ0KKyAgICAoc291cmNlIChvcmlnaW4NCisgICAg ICAgICAgICAgIChtZXRob2QgdXJsLWZldGNoKQ0KKyAgICAgICAgICAgICAgKHVyaSAocHlwaS11 cmkgImN5Y2xlciIgdmVyc2lvbikpDQorICAgICAgICAgICAgICAoc2hhMjU2DQorICAgICAgICAg ICAgICAgKGJhc2UzMg0KKyAgICAgICAgICAgICAgICAiMW42OW4yM2ZhazFnanhscmJocWlzaTJi OXB2M2NrcmZqOThsbHgzcDUzOTUzMDgyc3l5ZCIpKSkpDQorICAgIChidWlsZC1zeXN0ZW0gcHl0 aG9uLWJ1aWxkLXN5c3RlbSkNCisgICAgKGFyZ3VtZW50cw0KKyAgICAgOzsgWFhYOiBUaGUgY3Vy cmVudCB2ZXJzaW9uIHJlcXVpcmVzICdjb3ZlcmFsbHMnIHdoaWNoIHdlIGRvbid0IGhhdmUuDQor ICAgICA7OyBFbmFibGUgdGhpcyBmb3IgdGhlIG5leHQgcmVsZWFzZSB3aGljaCB1c2VzICdweXRo b24tcHl0ZXN0Jy4NCisgICAgICcoIzp0ZXN0cz8gI2YpKQ0KKyAgICAocHJvcGFnYXRlZC1pbnB1 dHMNCisgICAgIGAoKCJweXRob24tc2l4IiAscHl0aG9uLXNpeCkpKQ0KKyAgICAoaG9tZS1wYWdl ICJodHRwOi8vbWF0cGxvdGxpYi5vcmcvY3ljbGVyLyIpDQorICAgIChzeW5vcHNpcyAiQ29tcG9z YWJsZSBrZXl3b3JkIGFyZ3VtZW50IGl0ZXJhdG9yIikNCisgICAgKGRlc2NyaXB0aW9uDQorICAg ICAiV2hlbiB1c2luZyBAY29kZXttYXRwbG90bGlifSBhbmQgcGxvdHRpbmcgbW9yZSB0aGFuIG9u ZSBsaW5lLCBpdCBpcw0KK2NvbW1vbiB0byB3YW50IHRvIGJlIGFibGUgdG8gd2FudCB0byBiZSBh YmxlIHRvIGN5Y2xlIG92ZXIgb25lIG9yIG1vcmUgYXJ0aXN0DQorc3R5bGVzOyBidXQgdGhlIHBs b3R0aW5nIGxvZ2ljIGNhbiBxdWlja2x5IGJlY29tZSBpbnZvbHZlZC4NCitUbyBhZGRyZXNzIHRo aXMgYW5kIGVuYWJsZSBlYXN5IGN5Y2xpbmcgb3ZlciBhcmJpdHJhcnkgQGNvZGV7a3dhcmdzfSwg dGhlDQorQGNvZGV7Q3ljbGVyfSBjbGFzcyB3YXMgZGV2ZWxvcGVkLiIpDQorICAgIChsaWNlbnNl IGxpY2Vuc2U6YnNkLTMpKSkNCisNCisoZGVmaW5lLXB1YmxpYyBweXRob24yLWN5Y2xlcg0KKyAg KHBhY2thZ2Utd2l0aC1weXRob24yIHB5dGhvbi1jeWNsZXIpKQ0KKw0KIChkZWZpbmUtcHVibGlj IHB5dGhvbi1tYXRwbG90bGliDQogICAocGFja2FnZQ0KICAgICAobmFtZSAicHl0aG9uLW1hdHBs b3RsaWIiKQ0KLS0gDQoyLjExLjENCg0KDQpGcm9tIDlmMjI5ZmNlMzUyYjYwYzE5NGM3MzAwZDll ZmU2NWQ1ZTczZTYwZjUgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxDQpGcm9tOiBUaG9tYXMgRGFu Y2thZXJ0IDxwb3N0QHRob21hc2RhbmNrYWVydC5iZT4NCkRhdGU6IFR1ZSwgMjEgRmViIDIwMTcg MTM6MzM6MjAgKzAxMDANClN1YmplY3Q6IFtQQVRDSCAyLzldIGdudTogQWRkIHB5dGhvbjItYmFj a3BvcnRzLXNodXRpbC1nZXQtdGVybWluYWwtc2l6ZS4NCg0KKiBnbnUvcGFja2FnZXMvcHl0aG9u LnNjbSAocHl0aG9uMi1iYWNrcG9ydHMtc2h1dGlsLWdldC10ZXJtaW5hbC1zaXplKTogTmV3DQog IHZhcmlhYmxlLg0KLS0tDQogZ251L3BhY2thZ2VzL3B5dGhvbi5zY20gfCAyOSArKysrKysrKysr KysrKysrKysrKysrKysrKysrLQ0KIDEgZmlsZSBjaGFuZ2VkLCAyOCBpbnNlcnRpb25zKCspLCAx IGRlbGV0aW9uKC0pDQoNCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvcHl0aG9uLnNjbSBiL2du dS9wYWNrYWdlcy9weXRob24uc2NtDQppbmRleCA5ZDE5OTYzMTQuLjU0Yzg3MGQ2MyAxMDA2NDQN Ci0tLSBhL2dudS9wYWNrYWdlcy9weXRob24uc2NtDQorKysgYi9nbnUvcGFja2FnZXMvcHl0aG9u LnNjbQ0KQEAgLTMzLDcgKzMzLDcgQEANCiA7OzsgQ29weXJpZ2h0IMKpIDIwMTYgQXJ1biBJc2Fh YyA8YXJ1bmlzYWFjQHN5c3RlbXJlYm9vdC5uZXQ+DQogOzs7IENvcHlyaWdodCDCqSAyMDE2LCAy MDE3IEp1bGllbiBMZXBpbGxlciA8anVsaWVuQGxlcGlsbGVyLmV1Pg0KIDs7OyBDb3B5cmlnaHQg wqkgMjAxNiwgMjAxNyBUb2JpYXMgR2VlcmluY2t4LVJpY2UgPG1lQHRvYmlhcy5ncj4NCi07Ozsg Q29weXJpZ2h0IMKpIDIwMTYgVGhvbWFzIERhbmNrYWVydCA8cG9zdEB0aG9tYXNkYW5ja2FlcnQu YmU+DQorOzs7IENvcHlyaWdodCDCqSAyMDE2LCAyMDE3IFRob21hcyBEYW5ja2FlcnQgPHBvc3RA dGhvbWFzZGFuY2thZXJ0LmJlPg0KIDs7OyBDb3B5cmlnaHQgwqkgMjAxNyBDYXJsbyBaYW5jYW5h cm8gPGNhcmxvQHphbmNhbmFyby5pZC5hdT4NCiA7OzsgQ29weXJpZ2h0IMKpIDIwMTcgRnJlZGVy aWNrIE0uIE11cmlpdGhpIDxmcmVkbWFuZ2xpc0BnbWFpbC5jb20+DQogOzs7DQpAQCAtNjAyNCw2 ICs2MDI0LDMzIEBAIGNvbm5lY3Rpb24gdG8gZWFjaCB1c2VyLiIpDQogKGRlZmluZS1wdWJsaWMg cHl0aG9uMi1iYWNrcG9ydHMtYWJjDQogICAocGFja2FnZS13aXRoLXB5dGhvbjIgcHl0aG9uLWJh Y2twb3J0cy1hYmMpKQ0KIA0KKyhkZWZpbmUtcHVibGljIHB5dGhvbjItYmFja3BvcnRzLXNodXRp bC1nZXQtdGVybWluYWwtc2l6ZQ0KKyAgKHBhY2thZ2UNCisgICAgKG5hbWUgInB5dGhvbjItYmFj a3BvcnRzLXNodXRpbC1nZXQtdGVybWluYWwtc2l6ZSIpDQorICAgICh2ZXJzaW9uICIxLjAuMCIp DQorICAgIChzb3VyY2UNCisgICAgIChvcmlnaW4NCisgICAgICAgKG1ldGhvZCB1cmwtZmV0Y2gp DQorICAgICAgICh1cmkgKHN0cmluZy1hcHBlbmQNCisgICAgICAgICAgICAgImh0dHBzOi8vcHlw aS5weXRob24ub3JnL3BhY2thZ2VzL2VjLzljLyINCisgICAgICAgICAgICAgIjM2ODA4NmZhYTlj MDE2ZWZjZTVkYTNlMGUxM2JhMzkyYzlkYjc5ZTNhYjc0MGI3NjNmZTI4NjIwYjE4Yi8iDQorICAg ICAgICAgICAgICJiYWNrcG9ydHMuc2h1dGlsX2dldF90ZXJtaW5hbF9zaXplLSIgdmVyc2lvbiAi LnRhci5neiIpKQ0KKyAgICAgICAoc2hhMjU2DQorICAgICAgICAoYmFzZTMyDQorICAgICAgICAg IjEwN2NtbjdnM2puYmtwODI2emxqOHJyajE5ZmFtMzAxcXZhcWYwZjM5MDVmNTIxN2xna2kiKSkp KQ0KKyAgICAoYnVpbGQtc3lzdGVtIHB5dGhvbi1idWlsZC1zeXN0ZW0pDQorICAgIChhcmd1bWVu dHMNCisgICAgIGAoIzpweXRob24gLHB5dGhvbi0yKSkNCisgICAgKGhvbWUtcGFnZQ0KKyAgICAg Imh0dHBzOi8vZ2l0aHViLmNvbS9jaHJpcHBhL2JhY2twb3J0cy5zaHV0aWxfZ2V0X3Rlcm1pbmFs X3NpemUiKQ0KKyAgICAoc3lub3BzaXMNCisgICAgICAiQmFja3BvcnQgb2YgUHl0aG9uIDMuMydz IHNodXRpbC5nZXRfdGVybWluYWxfc2l6ZSIpDQorICAgIChkZXNjcmlwdGlvbg0KKyAgICAgIkEg YmFja3BvcnQgb2YgdGhlIEBjb2Rle2dldF90ZXJtaW5hbF9zaXplIGZ1bmN0aW9ufSBmcm9tIFB5 dGhvbiAzLjMncyBAY29kZXtzaHV0aWx9Lg0KK1VubGlrZSB0aGUgb3JpZ2luYWwgdmVyc2lvbiBp dCBpcyB3cml0dGVuIGluIHB1cmUgUHl0aG9uIHJhdGhlciB0aGFuIEMsIHNvIGl0DQorbWlnaHQg YmUgYSB0aW55IGJpdCBzbG93ZXIuIikNCisgICAgKGxpY2Vuc2UgbGljZW5zZTpleHBhdCkpKQ0K Kw0KIChkZWZpbmUtcHVibGljIHB5dGhvbi13YWYNCiAgIChwYWNrYWdlDQogICAgIChuYW1lICJw eXRob24td2FmIikNCi0tIA0KMi4xMS4xDQoNCg0KRnJvbSA0OWNjODFhODhmODBiMmU0OGVlMjQ4 MjIxYjFiMjkwZjZiZmFmNjRhIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQ0KRnJvbTogVGhvbWFz IERhbmNrYWVydCA8cG9zdEB0aG9tYXNkYW5ja2FlcnQuYmU+DQpEYXRlOiBUdWUsIDIxIEZlYiAy MDE3IDIxOjMzOjAyICswMTAwDQpTdWJqZWN0OiBbUEFUQ0ggMy85XSBnbnU6IEFkZCBweXRob24t Y29sb3JzcGFjaW91cy4NCg0KKiBnbnUvcGFja2FnZXMvcHl0aG9uLnNjbSAocHl0aG9uLWNvbG9y c3BhY2lvdXMsIHB5dGhvbjItY29sb3JzcGFjaW91cyk6IE5ldw0KICB2YXJpYWJsZXMuDQotLS0N CiBnbnUvcGFja2FnZXMvcHl0aG9uLnNjbSB8IDI1ICsrKysrKysrKysrKysrKysrKysrKysrKysN CiAxIGZpbGUgY2hhbmdlZCwgMjUgaW5zZXJ0aW9ucygrKQ0KDQpkaWZmIC0tZ2l0IGEvZ251L3Bh Y2thZ2VzL3B5dGhvbi5zY20gYi9nbnUvcGFja2FnZXMvcHl0aG9uLnNjbQ0KaW5kZXggNTRjODcw ZDYzLi5iYWI1Zjg1ZTQgMTAwNjQ0DQotLS0gYS9nbnUvcGFja2FnZXMvcHl0aG9uLnNjbQ0KKysr IGIvZ251L3BhY2thZ2VzL3B5dGhvbi5zY20NCkBAIC0zNzYzLDYgKzM3NjMsMzEgQEAgVG8gYWRk cmVzcyB0aGlzIGFuZCBlbmFibGUgZWFzeSBjeWNsaW5nIG92ZXIgYXJiaXRyYXJ5IEBjb2Rle2t3 YXJnc30sIHRoZQ0KIChkZWZpbmUtcHVibGljIHB5dGhvbjItY3ljbGVyDQogICAocGFja2FnZS13 aXRoLXB5dGhvbjIgcHl0aG9uLWN5Y2xlcikpDQogDQorKGRlZmluZS1wdWJsaWMgcHl0aG9uLWNv bG9yc3BhY2lvdXMNCisgIChwYWNrYWdlDQorICAobmFtZSAicHl0aG9uLWNvbG9yc3BhY2lvdXMi KQ0KKyAgKHZlcnNpb24gIjEuMS4wIikNCisgIChzb3VyY2UNCisgICAgKG9yaWdpbg0KKyAgICAg IChtZXRob2QgdXJsLWZldGNoKQ0KKyAgICAgICh1cmkgKHN0cmluZy1hcHBlbmQNCisgICAgICAg ICAgICAiaHR0cHM6Ly9naXRodWIuY29tL25qc21pdGgvY29sb3JzcGFjaW91cy9hcmNoaXZlL3Yi DQorICAgICAgICAgICAgdmVyc2lvbiAiLnRhci5neiIpKQ0KKyAgICAgIChmaWxlLW5hbWUgKHN0 cmluZy1hcHBlbmQgbmFtZSAiLSIgdmVyc2lvbikpDQorICAgICAgKHNoYTI1Ng0KKyAgICAgICAo YmFzZTMyICIxdmZsaDVqbTMycWIwc2t6YTJpOHBqYWN2MDl3NmdxODRmcXBwMm5qNzdzMHJibXpn cjRrIikpKSkNCisgIChidWlsZC1zeXN0ZW0gcHl0aG9uLWJ1aWxkLXN5c3RlbSkNCisgIChwcm9w YWdhdGVkLWlucHV0cw0KKyAgIGAoKCJweXRob24tbnVtcHkiICxweXRob24tbnVtcHkpKSkNCisg IChob21lLXBhZ2UgImh0dHBzOi8vZ2l0aHViLmNvbS9uanNtaXRoL2NvbG9yc3BhY2lvdXMiKQ0K KyAgKHN5bm9wc2lzICJQeXRob24gbGlicmFyeSBmb3IgY29sb3JzcGFjZSBjb252ZXJzaW9ucyIp DQorICAoZGVzY3JpcHRpb24gIkNvbG9yc3BhY2lvdXMgaXMgYSBQeXRob24gbGlicmFyeSB0aGF0 IGxldHMgeW91IGVhc2lseSBjb252ZXJ0DQorYmV0d2VlbiBjb2xvcnNwYWNlcyBsaWtlIHNSR0Is IFhZWiwgQ0lFTCphKmIqLCBDSUVDQU0wMiwgQ0FNMDItVUNTLCBldGMuIikNCisgIChsaWNlbnNl IGxpY2Vuc2U6ZXhwYXQpKSkNCisNCisoZGVmaW5lLXB1YmxpYyBweXRob24yLWNvbG9yc3BhY2lv dXMNCisgIChwYWNrYWdlLXdpdGgtcHl0aG9uMiBweXRob24tY29sb3JzcGFjaW91cykpDQorDQog KGRlZmluZS1wdWJsaWMgcHl0aG9uLW1hdHBsb3RsaWINCiAgIChwYWNrYWdlDQogICAgIChuYW1l ICJweXRob24tbWF0cGxvdGxpYiIpDQotLSANCjIuMTEuMQ0KDQoNCkZyb20gNzBmNWNiYmFiMzA1 ZGJmMTNhOGMxYzYyMTVkZDI0ZTk5YmI2MjY4NCBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDENCkZy b206IFRob21hcyBEYW5ja2FlcnQgPHBvc3RAdGhvbWFzZGFuY2thZXJ0LmJlPg0KRGF0ZTogVHVl LCAyMSBGZWIgMjAxNyAyMDoyODoyNyArMDEwMA0KU3ViamVjdDogW1BBVENIIDQvOV0gZ251OiBw eXRob24tbnVtcHk6IFVwZGF0ZSB0byAxLjEyLjAuDQoNCiogZ251L3BhY2thZ2VzL3B5dGhvbi5z Y20gKHB5dGhvbi1udW1weSk6IFVwZGF0ZSB0byAxLjEyLjAuDQogIFtzb3VyY2VdOiBVc2UgZ2l0 aHViIGluc3RlYWQgb2Ygc291cmNlZm9yZ2UuDQogIFtuYXRpdmUtaW5wdXRzXTogQWRkIHB5dGhv bi1jeXRob24uDQoNCiAgVG8gc2ltcGxpZnkgdGhlIGhhbmRsaW5nIG9mIGRlcGVuZGVuY3kgY3lj bGVzIChudW1weSBkb2N1bWVudGF0aW9uIGRlcGVuZHMNCiAgb24gbWF0cGxvdGxpYiwgd2hpY2gg ZGVwZW5kcyBvbiBudW1weSksIHdlIHNwbGl0IG91dCB0aGUgZG9jdW1lbnRhdGlvbiBpbnRvDQog IGEgc2VwYXJhdGUgcGFja2FnZToNCiAgKHB5dGhvbi1udW1weS1ib290c3RyYXAsIHB5dGhvbjIt bnVtcHktYm9vdHN0cmFwKTogUmVtb3ZlIHZhcmlhYmxlcy4NCiAgKHB5dGhvbi1udW1weS1kb2N1 bWVudGF0aW9uLCBweXRob24yLW51bXB5LWRvY3VtZW50YXRpb24pOiBOZXcgdmFyaWFibGVzLg0K LS0tDQogZ251L3BhY2thZ2VzL3B5dGhvbi5zY20gfCAxNDggKysrKysrKysrKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQogMSBmaWxlIGNoYW5nZWQsIDgyIGluc2VydGlv bnMoKyksIDY2IGRlbGV0aW9ucygtKQ0KDQpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3B5dGhv bi5zY20gYi9nbnUvcGFja2FnZXMvcHl0aG9uLnNjbQ0KaW5kZXggYmFiNWY4NWU0Li40ZjEzNTkz MjQgMTAwNjQ0DQotLS0gYS9nbnUvcGFja2FnZXMvcHl0aG9uLnNjbQ0KKysrIGIvZ251L3BhY2th Z2VzL3B5dGhvbi5zY20NCkBAIC0zNDAyLDI0ICszNDAyLDI2IEBAIGJldHdlZW4gbGFuZ3VhZ2Ug c3BlY2lmaWNhdGlvbiBhbmQgaW1wbGVtZW50YXRpb24gYXNwZWN0cy4iKQ0KIA0KIDs7IFRoaXMg dmVyc2lvbiBvZiBudW1weSBpcyBtaXNzaW5nIHRoZSBkb2N1bWVudGF0aW9uIGFuZCBpcyBvbmx5 IHVzZWQgdG8NCiA7OyBidWlsZCBtYXRwbG90bGliIHdoaWNoIGlzIHJlcXVpcmVkIHRvIGJ1aWxk IG51bXB5J3MgZG9jdW1lbnRhdGlvbi4NCi0oZGVmaW5lIHB5dGhvbi1udW1weS1ib290c3RyYXAN CisoZGVmaW5lLXB1YmxpYyBweXRob24tbnVtcHkNCiAgIChwYWNrYWdlDQotICAgIChuYW1lICJw eXRob24tbnVtcHktYm9vdHN0cmFwIikNCi0gICAgKHZlcnNpb24gIjEuMTAuNCIpDQorICAgIChu YW1lICJweXRob24tbnVtcHkiKQ0KKyAgICAodmVyc2lvbiAiMS4xMi4wIikNCiAgICAgKHNvdXJj ZQ0KICAgICAgKG9yaWdpbg0KICAgICAgICAobWV0aG9kIHVybC1mZXRjaCkNCi0gICAgICAgKHVy aSAoc3RyaW5nLWFwcGVuZCAibWlycm9yOi8vc291cmNlZm9yZ2UvbnVtcHkvTnVtUHkvIiB2ZXJz aW9uDQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIi9udW1weS0iIHZlcnNpb24gIi50YXIu Z3oiKSkNCisgICAgICAgKHVyaSAoc3RyaW5nLWFwcGVuZA0KKyAgICAgICAgICAgICAiaHR0cHM6 Ly9naXRodWIuY29tL251bXB5L251bXB5L2FyY2hpdmUvdiIgdmVyc2lvbiAiLnRhci5neiIpKQ0K KyAgICAgICAoZmlsZS1uYW1lIChzdHJpbmctYXBwZW5kIG5hbWUgIi0iIHZlcnNpb24gIi50YXIu Z3oiKSkNCiAgICAgICAgKHNoYTI1Ng0KICAgICAgICAgKGJhc2UzMg0KLSAgICAgICAgICIxYmpq aHZuY3Jha2E1czZpNGxnNjQ0anJ4aWo2YnZ5Y3h5N2FuMjBnY3ozYTBtMTFpeWdwIikpKSkNCisg ICAgICAgICAiMDI1ZDRqNGFha2NwOHc1aTVkaXFoODEyY2JiamdhYzdqc3p4MWo1Nml2cmJpMWk4 dnY3ZCIpKSkpDQogICAgIChidWlsZC1zeXN0ZW0gcHl0aG9uLWJ1aWxkLXN5c3RlbSkNCiAgICAg KGlucHV0cw0KICAgICAgYCgoIm9wZW5ibGFzIiAsb3BlbmJsYXMpDQogICAgICAgICgibGFwYWNr IiAsbGFwYWNrKSkpDQogICAgIChuYXRpdmUtaW5wdXRzDQotICAgICBgKCgicHl0aG9uLW5vc2Ui ICxweXRob24tbm9zZSkNCisgICAgIGAoKCJweXRob24tY3l0aG9uIiAscHl0aG9uLWN5dGhvbikN CisgICAgICAgKCJweXRob24tbm9zZSIgLHB5dGhvbi1ub3NlKQ0KICAgICAgICAoImdmb3J0cmFu IiAsZ2ZvcnRyYW4pKSkNCiAgICAgKGFyZ3VtZW50cw0KICAgICAgYCgjOnBoYXNlcw0KQEAgLTM0 NjgsOCArMzQ3MCw4IEBAIGFuZCBGb3J0cmFuIGNvZGUsIHVzZWZ1bCBsaW5lYXIgYWxnZWJyYSwg Rm91cmllciB0cmFuc2Zvcm0sIGFuZCByYW5kb20gbnVtYmVyDQogY2FwYWJpbGl0aWVzLiIpDQog ICAgIChsaWNlbnNlIGxpY2Vuc2U6YnNkLTMpKSkNCiANCi0oZGVmaW5lIHB5dGhvbjItbnVtcHkt Ym9vdHN0cmFwDQotICAocGFja2FnZS13aXRoLXB5dGhvbjIgcHl0aG9uLW51bXB5LWJvb3RzdHJh cCkpDQorKGRlZmluZS1wdWJsaWMgcHl0aG9uMi1udW1weQ0KKyAgKHBhY2thZ2Utd2l0aC1weXRo b24yIHB5dGhvbi1udW1weSkpDQogDQogKGRlZmluZS1wdWJsaWMgcHl0aG9uLW11bmNoDQogICAo cGFja2FnZQ0KQEAgLTM1MjYsNjkgKzM1MjgsODMgQEAgTW9kZWxzLCBpcyBhIHByb2dyYW0gZm9y IHBlcmZvcm1pbmcgYm90aCBzaW5nbGUtU05QIGFuZCBTTlAtc2V0IGdlbm9tZS13aWRlDQogYXNz b2NpYXRpb24gc3R1ZGllcyAoR1dBUykgb24gZXh0cmVtZWx5IGxhcmdlIGRhdGEgc2V0cy4iKQ0K ICAgICAobGljZW5zZSBsaWNlbnNlOmFzbDIuMCkpKQ0KIA0KLShkZWZpbmUtcHVibGljIHB5dGhv bi1udW1weQ0KLSAgKHBhY2thZ2UgKGluaGVyaXQgcHl0aG9uLW51bXB5LWJvb3RzdHJhcCkNCi0g ICAgKG5hbWUgInB5dGhvbi1udW1weSIpDQotICAgIChvdXRwdXRzICcoIm91dCIgImRvYyIpKQ0K LSAgICAoaW5wdXRzDQotICAgICBgKCgid2hpY2giICx3aGljaCkNCi0gICAgICAgLEAocGFja2Fn ZS1pbnB1dHMgcHl0aG9uLW51bXB5LWJvb3RzdHJhcCkpKQ0KLSAgICAocHJvcGFnYXRlZC1pbnB1 dHMNCi0gICAgIGAoKCJweXRob24tbWF0cGxvdGxpYiIgLHB5dGhvbi1tYXRwbG90bGliKQ0KLSAg ICAgICAoInB5dGhvbi1weXBhcnNpbmciICxweXRob24tcHlwYXJzaW5nKQ0KLSAgICAgICAsQChw YWNrYWdlLXByb3BhZ2F0ZWQtaW5wdXRzIHB5dGhvbi1udW1weS1ib290c3RyYXApKSkNCisoZGVm aW5lLXB1YmxpYyBweXRob24tbnVtcHktZG9jdW1lbnRhdGlvbg0KKyAgKHBhY2thZ2UNCisgICAg KG5hbWUgInB5dGhvbi1udW1weS1kb2N1bWVudGF0aW9uIikNCisgICAgKHZlcnNpb24gKHBhY2th Z2UtdmVyc2lvbiBweXRob24tbnVtcHkpKQ0KKyAgICAoc291cmNlIChwYWNrYWdlLXNvdXJjZSBw eXRob24tbnVtcHkpKQ0KKyAgICAoYnVpbGQtc3lzdGVtIHB5dGhvbi1idWlsZC1zeXN0ZW0pDQog ICAgIChuYXRpdmUtaW5wdXRzDQotICAgICBgKCgicGtnLWNvbmZpZyIgLHBrZy1jb25maWcpDQor ICAgICBgKCgicHl0aG9uLW1hdHBsb3RsaWIiICxweXRob24tbWF0cGxvdGxpYikNCisgICAgICAg KCJweXRob24tbnVtcHkiICxweXRob24tbnVtcHkpDQorICAgICAgICgicGtnLWNvbmZpZyIgLHBr Zy1jb25maWcpDQogICAgICAgICgicHl0aG9uLXNwaGlueCIgLHB5dGhvbi1zcGhpbngpDQogICAg ICAgICgicHl0aG9uLW51bXB5ZG9jIiAscHl0aG9uLW51bXB5ZG9jKQ0KICAgICAgICAoInRleGxp dmUiICx0ZXhsaXZlKQ0KICAgICAgICAoInRleGluZm8iICx0ZXhpbmZvKQ0KICAgICAgICAoInBl cmwiICxwZXJsKQ0KLSAgICAgICAsQChwYWNrYWdlLW5hdGl2ZS1pbnB1dHMgcHl0aG9uLW51bXB5 LWJvb3RzdHJhcCkpKQ0KLSAgICAoYXJndW1lbnRzDQotICAgICBgKCxAKHN1YnN0aXR1dGUta2V5 d29yZC1hcmd1bWVudHMNCi0gICAgICAgICAgICAgKHBhY2thZ2UtYXJndW1lbnRzIHB5dGhvbi1u dW1weS1ib290c3RyYXApDQotICAgICAgICAgICAoKCM6cGhhc2VzIHBoYXNlcykNCi0gICAgICAg ICAgICBgKGFsaXN0LWNvbnMtYWZ0ZXINCi0gICAgICAgICAgICAgICdpbnN0YWxsICdpbnN0YWxs LWRvYw0KLSAgICAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyBvdXRwdXRzICM6YWxs b3ctb3RoZXIta2V5cykNCi0gICAgICAgICAgICAgICAgOzsgTWFrZSBpbnN0YWxsZWQgcGFja2Fn ZSBhdmFpbGFibGUgZm9yIGJ1aWxkaW5nIHRoZQ0KLSAgICAgICAgICAgICAgICA7OyBkb2N1bWVu dGF0aW9uDQotICAgICAgICAgICAgICAgIChhZGQtaW5zdGFsbGVkLXB5dGhvbnBhdGggaW5wdXRz IG91dHB1dHMpDQotICAgICAgICAgICAgICAgIChsZXQqICgoZGF0YSAoc3RyaW5nLWFwcGVuZCAo YXNzb2MtcmVmIG91dHB1dHMgImRvYyIpICIvc2hhcmUiKSkNCi0gICAgICAgICAgICAgICAgICAg ICAgIChkb2MgKHN0cmluZy1hcHBlbmQNCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRh dGEgIi9kb2MvIiAsbmFtZSAiLSINCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICwocGFj a2FnZS12ZXJzaW9uIHB5dGhvbi1udW1weS1ib290c3RyYXApKSkNCi0gICAgICAgICAgICAgICAg ICAgICAgIChpbmZvIChzdHJpbmctYXBwZW5kIGRhdGEgIi9pbmZvIikpDQotICAgICAgICAgICAg ICAgICAgICAgICAoaHRtbCAoc3RyaW5nLWFwcGVuZCBkb2MgIi9odG1sIikpDQotICAgICAgICAg ICAgICAgICAgICAgICAocHl2ZXIgLChzdHJpbmctYXBwZW5kICJQWVZFUj0iKSkpDQotICAgICAg ICAgICAgICAgICAgKHdpdGgtZGlyZWN0b3J5LWV4Y3Vyc2lvbiAiZG9jIg0KLSAgICAgICAgICAg ICAgICAgICAgKG1rZGlyLXAgaHRtbCkNCi0gICAgICAgICAgICAgICAgICAgIChzeXN0ZW0qICJt YWtlIiAiaHRtbCIgcHl2ZXIpDQotICAgICAgICAgICAgICAgICAgICAoc3lzdGVtKiAibWFrZSIg ImxhdGV4IiAiUEFQRVI9YTQiIHB5dmVyKQ0KLSAgICAgICAgICAgICAgICAgICAgKHN5c3RlbSog Im1ha2UiICItQyIgImJ1aWxkL2xhdGV4Ig0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ImFsbC1wZGYiICJQQVBFUj1hNCIgcHl2ZXIpDQotICAgICAgICAgICAgICAgICAgICA7OyBGSVhN RTogR2VuZXJhdGlvbiBvZiB0aGUgaW5mbyBmaWxlIGZhaWxzLg0KLSAgICAgICAgICAgICAgICAg ICAgOzsgKHN5c3RlbSogIm1ha2UiICJpbmZvIiBweXZlcikNCi0gICAgICAgICAgICAgICAgICAg IDs7IChta2Rpci1wIGluZm8pDQotICAgICAgICAgICAgICAgICAgICA7OyAoY29weS1maWxlICJi dWlsZC90ZXhpbmZvL251bXB5LmluZm8iDQotICAgICAgICAgICAgICAgICAgICA7OyAgICAgICAg ICAgIChzdHJpbmctYXBwZW5kIGluZm8gIi9udW1weS5pbmZvIikpDQotICAgICAgICAgICAgICAg ICAgICAoZm9yLWVhY2ggKGxhbWJkYSAoZmlsZSkNCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIChjb3B5LWZpbGUgKHN0cmluZy1hcHBlbmQgImJ1aWxkL2xhdGV4IiBmaWxlKQ0KLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCBk b2MgZmlsZSkpKQ0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICcoIi9udW1weS1yZWYu cGRmIiAiL251bXB5LXVzZXIucGRmIikpDQotICAgICAgICAgICAgICAgICAgICAod2l0aC1kaXJl Y3RvcnktZXhjdXJzaW9uICJidWlsZC9odG1sIg0KLSAgICAgICAgICAgICAgICAgICAgICAoZm9y LWVhY2ggKGxhbWJkYSAoZmlsZSkNCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg KGxldCogKChkaXIgKGRpcm5hbWUgZmlsZSkpDQotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAodGd0LWRpciAoc3RyaW5nLWFwcGVuZCBodG1sICIvIiBkaXIpKSkNCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAodW5sZXNzIChlcXVhbD8gIi4iIGRp cikNCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChta2Rpci1wIHRndC1k aXIpKQ0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChpbnN0YWxsLWZpbGUg ZmlsZSBodG1sKSkpDQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoZmluZC1maWxl cyAiLiIgIi4qIikpKSkpKQ0KLSAgICAgICAgICAgICAgLHBoYXNlcykpKSkpKSkNCisgICAgICAg KCJzY2lweS1zcGhpbngtdGhlbWUiDQorICAgICAgICAsKG9yaWdpbiA7IFRoZSBidWlsZCBzY3Jp cHQgZXhwZWN0cyBzY2lweS1zcGhpbngtdGhlbWUgYXMgYSBnaXQgc3VibW9kdWxlDQorICAgICAg ICAgICAobWV0aG9kIGdpdC1mZXRjaCkNCisgICAgICAgICAgICh1cmkgKGdpdC1yZWZlcmVuY2UN CisgICAgICAgICAgICAgICAgICh1cmwgImh0dHBzOi8vZ2l0aHViLmNvbS9zY2lweS9zY2lweS1z cGhpbngtdGhlbWUuZ2l0IikNCisgICAgICAgICAgICAgICAgIChjb21taXQgImM0NjY3NjRlMjIi KSkpDQorICAgICAgICAgICAoc2hhMjU2DQorICAgICAgICAgICAgKGJhc2UzMg0KKyAgICAgICAg ICAgICAgICAiMHEyeTg3Y2x3bHNnYzd3dmxzbjlwenlzc3liY3ExMHBsd2hxMncxeWR5a2ZzeXlx Ym1rbCIpKSkpDQorICAgICAgICxAKHBhY2thZ2UtbmF0aXZlLWlucHV0cyBweXRob24tbnVtcHkp KSkNCisgICAgKGFyZ3VtZW50cw0KKyAgICAgYCgjOnRlc3RzPyAjZiA7IHdlJ3JlIG9ubHkgZ2Vu ZXJhdGluZyB0aGUgZG9jdW1lbnRhdGlvbg0KKyAgICAgICAjOnBoYXNlcw0KKyAgICAgICAobW9k aWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzDQorICAgICAgICAgKGRlbGV0ZSAnYnVpbGQpDQor ICAgICAgICAgKHJlcGxhY2UgJ2luc3RhbGwNCisgICAgICAgICAgIChsYW1iZGEqICgjOmtleSBp bnB1dHMgb3V0cHV0cyAjOmFsbG93LW90aGVyLWtleXMpDQorICAgICAgICAgICAgIChsZXQqICgo ZGF0YSAoc3RyaW5nLWFwcGVuZCAoYXNzb2MtcmVmIG91dHB1dHMgIm91dCIpICIvc2hhcmUiKSkN CisgICAgICAgICAgICAgICAgICAgIChkb2MgKHN0cmluZy1hcHBlbmQNCisgICAgICAgICAgICAg ICAgICAgICAgICAgIGRhdGEgIi9kb2MvIiAsbmFtZSAiLSINCisgICAgICAgICAgICAgICAgICAg ICAgICAgICwocGFja2FnZS12ZXJzaW9uIHB5dGhvbi1udW1weSkpKQ0KKyAgICAgICAgICAgICAg ICAgICAgKGluZm8tcmVhZGVyIChzdHJpbmctYXBwZW5kIGRhdGEgIi9pbmZvIikpDQorICAgICAg ICAgICAgICAgICAgICAoaHRtbCAoc3RyaW5nLWFwcGVuZCBkb2MgIi9odG1sIikpDQorICAgICAg ICAgICAgICAgICAgICAoc2NpcHktc3BoaW54LXRoZW1lICJzY2lweS1zcGhpbngtdGhlbWUiKQ0K KyAgICAgICAgICAgICAgICAgICAgKHNwaGlueC10aGVtZS1jaGVja291dCAoYXNzb2MtcmVmIGlu cHV0cyBzY2lweS1zcGhpbngtdGhlbWUpKQ0KKyAgICAgICAgICAgICAgICAgICAgKHB5dmVyICwo c3RyaW5nLWFwcGVuZCAiUFlWRVI9IikpKQ0KKyAgICAgICAgICAgICAgICh3aXRoLWRpcmVjdG9y eS1leGN1cnNpb24gImRvYyINCisgICAgICAgICAgICAgICAgIChjb3B5LXJlY3Vyc2l2ZWx5IHNw aGlueC10aGVtZS1jaGVja291dCBzY2lweS1zcGhpbngtdGhlbWUpDQorICAgICAgICAgICAgICAg ICAobWtkaXItcCBodG1sKQ0KKyAgICAgICAgICAgICAgICAgKHN5c3RlbSogIm1ha2UiICJodG1s IiBweXZlcikNCisgICAgICAgICAgICAgICAgIChzeXN0ZW0qICJtYWtlIiAibGF0ZXgiICJQQVBF Uj1hNCIgcHl2ZXIpDQorICAgICAgICAgICAgICAgICAoc3lzdGVtKiAibWFrZSIgIi1DIiAiYnVp bGQvbGF0ZXgiDQorICAgICAgICAgICAgICAgICAgICAgICAgICAiYWxsLXBkZiIgIlBBUEVSPWE0 IiBweXZlcikNCisgICAgICAgICAgICAgICAgIDs7IEZJWE1FOiBHZW5lcmF0aW9uIG9mIHRoZSBp bmZvIGZpbGUgZmFpbHMuDQorICAgICAgICAgICAgICAgICA7OyAoc3lzdGVtKiAibWFrZSIgImlu Zm8iIHB5dmVyKQ0KKyAgICAgICAgICAgICAgICAgOzsgKG1rZGlyLXAgaW5mbykNCisgICAgICAg ICAgICAgICAgIDs7IChjb3B5LWZpbGUgImJ1aWxkL3RleGluZm8vbnVtcHkuaW5mbyINCisgICAg ICAgICAgICAgICAgIDs7ICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgaW5mbyAiL251bXB5Lmlu Zm8iKSkNCisgICAgICAgICAgICAgICAgIChmb3ItZWFjaCAobGFtYmRhIChmaWxlKQ0KKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKGNvcHktZmlsZSAoc3RyaW5nLWFwcGVuZCAiYnVpbGQv bGF0ZXgiIGZpbGUpDQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChz dHJpbmctYXBwZW5kIGRvYyBmaWxlKSkpDQorICAgICAgICAgICAgICAgICAgICAgICAgICAgJygi L251bXB5LXJlZi5wZGYiICIvbnVtcHktdXNlci5wZGYiKSkNCisgICAgICAgICAgICAgICAgICh3 aXRoLWRpcmVjdG9yeS1leGN1cnNpb24gImJ1aWxkL2h0bWwiDQorICAgICAgICAgICAgICAgICAg IChmb3ItZWFjaCAobGFtYmRhIChmaWxlKQ0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAobGV0KiAoKGRpciAoZGlybmFtZSBmaWxlKSkNCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICh0Z3QtZGlyIChzdHJpbmctYXBwZW5kIGh0bWwgIi8iIGRpcikpKQ0KKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICh1bmxlc3MgKGVxdWFsPyAiLiIgZGlyKQ0K KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG1rZGlyLXAgdGd0LWRpcikpDQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGluc3RhbGwtZmlsZSBmaWxlIGh0bWwp KSkNCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChmaW5kLWZpbGVzICIuIiAiLioiKSkp KSkNCisgICAgICAgICAgICAgI3QpKSkpKQ0KKyAgICAoaG9tZS1wYWdlIChwYWNrYWdlLWhvbWUt cGFnZSBweXRob24tbnVtcHkpKQ0KKyAgICAoc3lub3BzaXMgIkRvY3VtZW50YXRpb24gZm9yIHRo ZSBweXRob24tbnVtcHkgcGFja2FnZSIpDQorICAgIChkZXNjcmlwdGlvbiAocGFja2FnZS1kZXNj cmlwdGlvbiBweXRob24tbnVtcHkpKQ0KKyAgICAobGljZW5zZSAocGFja2FnZS1saWNlbnNlIHB5 dGhvbi1udW1weSkpKSkNCiANCi0oZGVmaW5lLXB1YmxpYyBweXRob24yLW51bXB5DQotICAocGFj a2FnZS13aXRoLXB5dGhvbjIgcHl0aG9uLW51bXB5KSkNCisoZGVmaW5lLXB1YmxpYyBweXRob24y LW51bXB5LWRvY3VtZW50YXRpb24NCisgIChsZXQgKChudW1weS1kb2N1bWVudGF0aW9uIChwYWNr YWdlLXdpdGgtcHl0aG9uMiBweXRob24tbnVtcHktZG9jdW1lbnRhdGlvbikpKQ0KKyAgICAocGFj a2FnZQ0KKyAgICAgIChpbmhlcml0IG51bXB5LWRvY3VtZW50YXRpb24pDQorICAgICAgKG5hdGl2 ZS1pbnB1dHMgYCgoInB5dGhvbjItZnVuY3Rvb2xzMzIiICxweXRob24yLWZ1bmN0b29sczMyKQ0K KyAgICAgICAgICAgICAgICAgICAgICAgLEAocGFja2FnZS1uYXRpdmUtaW5wdXRzIG51bXB5LWRv Y3VtZW50YXRpb24pKSkpKSkNCiANCiAoZGVmaW5lLXB1YmxpYyBweXRob24tcHlnaXQyDQogICAo cGFja2FnZQ0KQEAgLTM4MTAsNyArMzgyNiw3IEBAIGJldHdlZW4gY29sb3JzcGFjZXMgbGlrZSBz UkdCLCBYWVosIENJRUwqYSpiKiwgQ0lFQ0FNMDIsIENBTTAyLVVDUywgZXRjLiIpDQogICAgICAg ICgiZ29iamVjdC1pbnRyb3NwZWN0aW9uIiAsZ29iamVjdC1pbnRyb3NwZWN0aW9uKQ0KICAgICAg ICAoInB5dGhvbi10a2ludGVyIiAscHl0aG9uICJ0ayIpDQogICAgICAgICgicHl0aG9uLWRhdGV1 dGlsIiAscHl0aG9uLWRhdGV1dGlsKQ0KLSAgICAgICAoInB5dGhvbi1udW1weSIgLHB5dGhvbi1u dW1weS1ib290c3RyYXApDQorICAgICAgICgicHl0aG9uLW51bXB5IiAscHl0aG9uLW51bXB5KQ0K ICAgICAgICAoInB5dGhvbi1waWxsb3ciICxweXRob24tcGlsbG93KQ0KICAgICAgICAoInB5dGhv bi1weXR6IiAscHl0aG9uLXB5dHopDQogICAgICAgICgicHl0aG9uLXNpeCIgLHB5dGhvbi1zaXgp DQotLSANCjIuMTEuMQ0KDQoNCkZyb20gYzc2NmU5NzRkNWU3ODViMDk0MGE1ODg2ODc5ODZkZTc5 Zjk4ZmVkZSBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDENCkZyb206IFRob21hcyBEYW5ja2FlcnQg PHBvc3RAdGhvbWFzZGFuY2thZXJ0LmJlPg0KRGF0ZTogVHVlLCAyMSBGZWIgMjAxNyAyMjoxODo0 NSArMDEwMA0KU3ViamVjdDogW1BBVENIIDUvOV0gZ251OiBweXRob24tbWF0cGxvdGxpYjogVXBk YXRlIHRvIDIuMC4wLg0KDQoqIGdudS9wYWNrYWdlcy9weXRob24uc2NtIChweXRob24tbWF0cGxv dGxpYik6IFVwZGF0ZSB0byAyLjAuMC4NCltzb3VyY2VdOiBSZW1vdmUgVGsgYmFja2VuZCBwYXRj aCwgdXNlIEdpdGh1YiBpbnN0ZWFkIG9mIFNvdXJjZWZvcmdlLg0KW291dHB1dHNdOiBSZW1vdmUg ImRvYyIgb3V0cHV0Lg0KW2lucHV0c106IEFkZCBweXRob24tcHlxdC4NCltwcm9wYWdhdGVkLWlu cHV0c106IEFkZCBweXRob24tY3ljbGVyLg0KW25hdGl2ZS1pbnB1dHNdOiBSZW1vdmUgcHl0aG9u LXNwaGlueCwgcHl0aG9uLW51bXB5ZG9jLCB0ZXhsaXZlIGFuZCB0ZXhpbmZvLg0KKHB5dGhvbi1t YXRwbG90bGliLWRvY3VtZW50YXRpb24sIHB5dGhvbjItbWF0cGxvdGxpYi1kb2N1bWVudGF0aW9u KTogTmV3DQp2YXJpYWJsZXMuDQoqIGdudS9wYWNrYWdlcy9wYXRjaGVzL21hdHBsb3RsaWItc2V0 dXBleHQtdGsucGF0Y2g6IERlbGV0ZSBmaWxlLg0KKiBnbnUvbG9jYWwubWsgKGRpc3RfcGF0Y2hf REFUQSk6IFJlbW92ZSBwYXRjaC4NCi0tLQ0KIGdudS9sb2NhbC5tayAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgfCAgIDEgLQ0KIGdudS9wYWNrYWdlcy9wYXRjaGVzL21hdHBs b3RsaWItc2V0dXBleHQtdGsucGF0Y2ggfCAgMzQgLS0tLS0tLQ0KIGdudS9wYWNrYWdlcy9weXRo b24uc2NtICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAxMTggKysrKysrKysrKysrLS0tLS0t LS0tLQ0KIDMgZmlsZXMgY2hhbmdlZCwgNjcgaW5zZXJ0aW9ucygrKSwgODYgZGVsZXRpb25zKC0p DQogZGVsZXRlIG1vZGUgMTAwNjQ0IGdudS9wYWNrYWdlcy9wYXRjaGVzL21hdHBsb3RsaWItc2V0 dXBleHQtdGsucGF0Y2gNCg0KZGlmZiAtLWdpdCBhL2dudS9sb2NhbC5tayBiL2dudS9sb2NhbC5t aw0KaW5kZXggODk5ZGMwNmI4Li5iMmExNzZkNDUgMTAwNjQ0DQotLS0gYS9nbnUvbG9jYWwubWsN CisrKyBiL2dudS9sb2NhbC5taw0KQEAgLTc0Nyw3ICs3NDcsNiBAQCBkaXN0X3BhdGNoX0RBVEEg PQkJCQkJCVwNCiAgICVEJS9wYWNrYWdlcy9wYXRjaGVzL21ha2UtaW1wdXJlLWRpcnMucGF0Y2gJ CQlcDQogICAlRCUvcGFja2FnZXMvcGF0Y2hlcy9tYXJzLWluc3RhbGwucGF0Y2gJCQlcDQogICAl RCUvcGFja2FnZXMvcGF0Y2hlcy9tYXJzLXNmbWwtMi4zLnBhdGNoCQkJXA0KLSAgJUQlL3BhY2th Z2VzL3BhdGNoZXMvbWF0cGxvdGxpYi1zZXR1cGV4dC10ay5wYXRjaAkJXA0KICAgJUQlL3BhY2th Z2VzL3BhdGNoZXMvbWF4aW1hLWRlZnN5c3RlbS1ta2Rpci5wYXRjaAkJXA0KICAgJUQlL3BhY2th Z2VzL3BhdGNoZXMvbWNyb24taW5zdGFsbC5wYXRjaAkJCVwNCiAgICVEJS9wYWNrYWdlcy9wYXRj aGVzL21jcnlwdC1DVkUtMjAxMi00NDA5LnBhdGNoCQkJXA0KZGlmZiAtLWdpdCBhL2dudS9wYWNr YWdlcy9wYXRjaGVzL21hdHBsb3RsaWItc2V0dXBleHQtdGsucGF0Y2ggYi9nbnUvcGFja2FnZXMv cGF0Y2hlcy9tYXRwbG90bGliLXNldHVwZXh0LXRrLnBhdGNoDQpkZWxldGVkIGZpbGUgbW9kZSAx MDA2NDQNCmluZGV4IDM3YzNkNjg2ZS4uMDAwMDAwMDAwDQotLS0gYS9nbnUvcGFja2FnZXMvcGF0 Y2hlcy9tYXRwbG90bGliLXNldHVwZXh0LXRrLnBhdGNoDQorKysgL2Rldi9udWxsDQpAQCAtMSwz NCArMCwwIEBADQotVXNlICdwa2ctY29uZmlnJyBpbnN0ZWFkIG9mIGhldXJpc3RpY3MgdG8gZmlu ZCAndGsnIGZsYWdzLg0KLQ0KLS0tLSBtYXRwbG90bGliLTEuNC4zL3NldHVwZXh0LnB5Lm9yaWcJ MjAxNS0xMi0wMSAxNDoyMToxOS41NTQ0MTc0NTMgKzAxMDANCi0rKysgbWF0cGxvdGxpYi0xLjQu My9zZXR1cGV4dC5weQkyMDE1LTEyLTAyIDEwOjM5OjQ3LjI4MjM2MzUzMCArMDEwMA0KLUBAIC0x NDU3LDcgKzE0NTcsNyBAQA0KLSAgICAgICAgICAgICBwID0gc3VicHJvY2Vzcy5Qb3BlbigNCi0g ICAgICAgICAgICAgICAgICcuICVzIDsgZXZhbCBlY2hvICR7JXN9JyAlIChmaWxlLCB2YXJuYW1l KSwNCi0gICAgICAgICAgICAgICAgIHNoZWxsPVRydWUsDQotLSAgICAgICAgICAgICAgICBleGVj dXRhYmxlPSIvYmluL3NoIiwNCi0rICAgICAgICAgICAgICAgIGV4ZWN1dGFibGU9InNoIiwNCi0g ICAgICAgICAgICAgICAgIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUpDQotICAgICAgICAgICAgIHJl c3VsdCA9IHAuY29tbXVuaWNhdGUoKVswXQ0KLSAgICAgICAgICAgICByZXR1cm4gcmVzdWx0LmRl Y29kZSgnYXNjaWknKQ0KLUBAIC0xNjAxLDggKzE2MDEsMTkgQEANCi0gICAgICAgICAgICAgIyAg ICAgIG9mIGRpc3Ryb3MuDQotIA0KLSAgICAgICAgICAgICAjIFF1ZXJ5IFRjbC9UayBzeXN0ZW0g Zm9yIGxpYnJhcnkgcGF0aHMgYW5kIHZlcnNpb24gc3RyaW5nDQotKyAgICAgICAgICAgIGRlZiBn ZXRvdXRwdXQocyk6DQotKyAgICAgICAgICAgICAgICByZXQgPSBvcy5wb3BlbihzKS5yZWFkKCku c3RyaXAoKQ0KLSsgICAgICAgICAgICAgICAgcmV0dXJuIHJldA0KLSAgICAgICAgICAgICB0cnk6 DQotLSAgICAgICAgICAgICAgICB0Y2xfbGliX2RpciwgdGtfbGliX2RpciwgdGtfdmVyID0gc2Vs Zi5xdWVyeV90Y2x0aygpDQotKyAgICAgICAgICAgICAgICBwa2dfY29uZmlnX2xpYnMgPSBnZXRv dXRwdXQoJ3BrZy1jb25maWcgLS1saWJzLW9ubHktTCB0aycpLnNwbGl0KCkNCi0rICAgICAgICAg ICAgICAgICMgZHJvcCAnLUwnIHBhcnQgb2Ygc3RyaW5ncw0KLSsgICAgICAgICAgICAgICAgcGtn X2NvbmZpZ19saWJzID0gW3NbMjpdIGZvciBzIGluIHBrZ19jb25maWdfbGlic10NCi0rICAgICAg ICAgICAgICAgIHBrZ19jb25maWdfdmVyID0gZ2V0b3V0cHV0KCdwa2ctY29uZmlnIC0tbW9kdmVy c2lvbiB0aycpDQotKyAgICAgICAgICAgICAgICB0a192ZXIgPSByZS5tYXRjaChyIihcZCsuXGQr KVtcZC5dKiIsIHBrZ19jb25maWdfdmVyKS5ncm91cCgxKQ0KLSsgICAgICAgICAgICAgICAgdGNs X2xpYl9kaXIgPSBuZXh0KHMgZm9yIHMgaW4gcGtnX2NvbmZpZ19saWJzDQotKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgaWYgcmUubWF0Y2gociIuKi10Y2wtLioiLCBzKSkgKyAn L3RjbCcgKyB0a192ZXINCi0rICAgICAgICAgICAgICAgIHRrX2xpYl9kaXIgPSBuZXh0KHMgZm9y IHMgaW4gcGtnX2NvbmZpZ19saWJzDQotKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBpZiByZS5tYXRjaChyIi4qLXRrLS4qIiwgcykpICsgJy90aycgKyB0a192ZXINCi0gICAgICAg ICAgICAgZXhjZXB0Og0KLSAgICAgICAgICAgICAgICAgdGtfdmVyID0gJycNCi0gICAgICAgICAg ICAgICAgIHJlc3VsdCA9IHNlbGYuaGFyZGNvZGVkX3RjbF9jb25maWcoKQ0KZGlmZiAtLWdpdCBh L2dudS9wYWNrYWdlcy9weXRob24uc2NtIGIvZ251L3BhY2thZ2VzL3B5dGhvbi5zY20NCmluZGV4 IDRmMTM1OTMyNC4uNzhhN2NmMWYwIDEwMDY0NA0KLS0tIGEvZ251L3BhY2thZ2VzL3B5dGhvbi5z Y20NCisrKyBiL2dudS9wYWNrYWdlcy9weXRob24uc2NtDQpAQCAtODksNiArODksNyBAQA0KICAg Izp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgcGVybCkNCiAgICM6dXNlLW1vZHVsZSAoZ251IHBh Y2thZ2VzIHBrZy1jb25maWcpDQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBwcm90b2J1 ZikNCisgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHF0KQ0KICAgIzp1c2UtbW9kdWxlIChn bnUgcGFja2FnZXMgcmVhZGxpbmUpDQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBzZGwp DQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBzaGVsbHMpDQpAQCAtMzgwNywyMSArMzgw OCwyMCBAQCBiZXR3ZWVuIGNvbG9yc3BhY2VzIGxpa2Ugc1JHQiwgWFlaLCBDSUVMKmEqYiosIENJ RUNBTTAyLCBDQU0wMi1VQ1MsIGV0Yy4iKQ0KIChkZWZpbmUtcHVibGljIHB5dGhvbi1tYXRwbG90 bGliDQogICAocGFja2FnZQ0KICAgICAobmFtZSAicHl0aG9uLW1hdHBsb3RsaWIiKQ0KLSAgICAo dmVyc2lvbiAiMS40LjMiKQ0KKyAgICAodmVyc2lvbiAiMi4wLjAiKQ0KICAgICAoc291cmNlDQog ICAgICAob3JpZ2luDQogICAgICAgIChtZXRob2QgdXJsLWZldGNoKQ0KLSAgICAgICAodXJpIChz dHJpbmctYXBwZW5kICJtaXJyb3I6Ly9zb3VyY2Vmb3JnZS9tYXRwbG90bGliL21hdHBsb3RsaWIi DQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIi9tYXRwbG90bGliLSIgdmVyc2lvbg0KLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICIvbWF0cGxvdGxpYi0iIHZlcnNpb24gIi50YXIuZ3oi KSkNCisgICAgICAgKHVyaSAoc3RyaW5nLWFwcGVuZA0KKyAgICAgICAgICAgICAiaHR0cHM6Ly9n aXRodWIuY29tL21hdHBsb3RsaWIvbWF0cGxvdGxpYi9hcmNoaXZlL3YiIHZlcnNpb24gIi50YXIu Z3oiKSkNCisgICAgICAgKGZpbGUtbmFtZSAoc3RyaW5nLWFwcGVuZCBuYW1lICItIiB2ZXJzaW9u ICIudGFyLmd6IikpDQogICAgICAgIChzaGEyNTYNCiAgICAgICAgIChiYXNlMzINCi0gICAgICAg ICAiMWRuMDVjdmQwZzk4NGx6aGg3MndhMHo5M3BzZ3dzaGJiZzkzZmthYjZzbHg1bTNsOTVhdiIp KQ0KLSAgICAgICAocGF0Y2hlcyAoc2VhcmNoLXBhdGNoZXMgIm1hdHBsb3RsaWItc2V0dXBleHQt dGsucGF0Y2giKSkpKQ0KKyAgICAgICAgICIwdzNrNW01cWIzd3NkN3lodm1nMDQyeGRkdmxpZ2ts dmNxMnZpc2syYzV3bnBoM2hoc2xuIikpKSkNCiAgICAgKGJ1aWxkLXN5c3RlbSBweXRob24tYnVp bGQtc3lzdGVtKQ0KLSAgICAob3V0cHV0cyAnKCJvdXQiICJkb2MiKSkNCiAgICAgKHByb3BhZ2F0 ZWQtaW5wdXRzIDsgdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBhcmUgYWxsIG5lZWRlZCBhdCBydW4g dGltZQ0KLSAgICAgYCgoInB5dGhvbi1weXBhcnNpbmciICxweXRob24tcHlwYXJzaW5nKQ0KKyAg ICAgYCgoInB5dGhvbi1jeWNsZXIiICxweXRob24tY3ljbGVyKQ0KKyAgICAgICAoInB5dGhvbi1w eXBhcnNpbmciICxweXRob24tcHlwYXJzaW5nKQ0KICAgICAgICAoInB5dGhvbi1weWdvYmplY3Qi ICxweXRob24tcHlnb2JqZWN0KQ0KICAgICAgICAoImdvYmplY3QtaW50cm9zcGVjdGlvbiIgLGdv YmplY3QtaW50cm9zcGVjdGlvbikNCiAgICAgICAgKCJweXRob24tdGtpbnRlciIgLHB5dGhvbiAi dGsiKQ0KQEAgLTM4NTMsMTcgKzM4NTMsMTMgQEAgYmV0d2VlbiBjb2xvcnNwYWNlcyBsaWtlIHNS R0IsIFhZWiwgQ0lFTCphKmIqLCBDSUVDQU0wMiwgQ0FNMDItVUNTLCBldGMuIikNCiAgICAgICAg KCJnbGliIiAsZ2xpYikNCiAgICAgICAgOzsgRklYTUU6IEFkZCBiYWNrZW5kcyB3aGVuIGF2YWls YWJsZS4NCiAgICAgICAgOygicHl0aG9uLXd4cHl0aG9uIiAscHl0aG9uLXd4cHl0aG9uKQ0KLSAg ICAgICA7KCJweXRob24tcHlxdCIgLHB5dGhvbi1weXF0KQ0KKyAgICAgICAoInB5dGhvbi1weXF0 IiAscHl0aG9uLXB5cXQpDQogICAgICAgICgidGNsIiAsdGNsKQ0KICAgICAgICAoInRrIiAsdGsp KSkNCiAgICAgKG5hdGl2ZS1pbnB1dHMNCiAgICAgIGAoKCJwa2ctY29uZmlnIiAscGtnLWNvbmZp ZykNCi0gICAgICAgKCJweXRob24tc3BoaW54IiAscHl0aG9uLXNwaGlueC0xLjIuMykNCi0gICAg ICAgKCJweXRob24tbnVtcHlkb2MiICxweXRob24tbnVtcHlkb2MpDQogICAgICAgICgicHl0aG9u LW5vc2UiICxweXRob24tbm9zZSkNCi0gICAgICAgKCJweXRob24tbW9jayIgLHB5dGhvbi1tb2Nr KQ0KLSAgICAgICAoInRleGxpdmUiICx0ZXhsaXZlKQ0KLSAgICAgICAoInRleGluZm8iICx0ZXhp bmZvKSkpDQorICAgICAgICgicHl0aG9uLW1vY2siICxweXRob24tbW9jaykpKQ0KICAgICAoYXJn dW1lbnRzDQogICAgICBgKCM6cGhhc2VzDQogICAgICAgIChtb2RpZnktcGhhc2VzICVzdGFuZGFy ZC1waGFzZXMNCkBAIC0zODgyLDI2ICszODc4LDY2IEBAIGJldHdlZW4gY29sb3JzcGFjZXMgbGlr ZSBzUkdCLCBYWVosIENJRUwqYSpiKiwgQ0lFQ0FNMDIsIENBTTAyLVVDUywgZXRjLiIpDQogYmFz ZWRpcmxpc3QgPSB+YSx+YX4lDQogIFtyY19vcHRpb25zXX4lDQogYmFja2VuZCA9IFRrQWdnfiUi DQotICAgICAgICAgICAgICAgICAgICAgICAgICAgKGFzc29jLXJlZiBpbnB1dHMgInRjbCIpDQot ICAgICAgICAgICAgICAgICAgICAgICAgICAgKGFzc29jLXJlZiBpbnB1dHMgInRrIikpKSkNCi0g ICAgICAgICAgICAgICAjdCkpKQ0KLSAgICAgICAgIChhZGQtYWZ0ZXIgJ2luc3RhbGwgJ2luc3Rh bGwtZG9jDQorICAgICAgICAgICAgICAgICAgICAgICAgKGFzc29jLXJlZiBpbnB1dHMgInRjbCIp DQorICAgICAgICAgICAgICAgICAgICAgICAgKGFzc29jLXJlZiBpbnB1dHMgInRrIikpKSkpDQor ICAgICAgICAgICAgICN0KSkpKSkNCisgICAgKGhvbWUtcGFnZSAiaHR0cDovL21hdHBsb3RsaWIu b3JnIikNCisgICAgKHN5bm9wc2lzICIyRCBwbG90dGluZyBsaWJyYXJ5IGZvciBQeXRob24iKQ0K KyAgICAoZGVzY3JpcHRpb24NCisgICAgICJNYXRwbG90bGliIGlzIGEgUHl0aG9uIDJEIHBsb3R0 aW5nIGxpYnJhcnkgd2hpY2ggcHJvZHVjZXMgcHVibGljYXRpb24NCitxdWFsaXR5IGZpZ3VyZXMg aW4gYSB2YXJpZXR5IG9mIGhhcmRjb3B5IGZvcm1hdHMgYW5kIGludGVyYWN0aXZlIGVudmlyb25t ZW50cw0KK2Fjcm9zcyBwbGF0Zm9ybXMuICBNYXRwbG90bGliIGNhbiBiZSB1c2VkIGluIFB5dGhv biBzY3JpcHRzLCB0aGUgcHl0aG9uIGFuZA0KK2lweXRob24gc2hlbGwsIHdlYiBhcHBsaWNhdGlv biBzZXJ2ZXJzLCBhbmQgc2l4IGdyYXBoaWNhbCB1c2VyIGludGVyZmFjZQ0KK3Rvb2xraXRzLiIp DQorICAgIChsaWNlbnNlIGxpY2Vuc2U6cHNmbCkNCisgICAgKHByb3BlcnRpZXMgYCgocHl0aG9u Mi12YXJpYW50IC4gLChkZWxheSBweXRob24yLW1hdHBsb3RsaWIpKSkpKSkNCisNCisoZGVmaW5l LXB1YmxpYyBweXRob24yLW1hdHBsb3RsaWINCisgIChsZXQgKChtYXRwbG90bGliIChwYWNrYWdl LXdpdGgtcHl0aG9uMg0KKyAgICAgICAgICAgICAgICAgICAgIChzdHJpcC1weXRob24yLXZhcmlh bnQgcHl0aG9uLW1hdHBsb3RsaWIpKSkpDQorICAgIChwYWNrYWdlIChpbmhlcml0IG1hdHBsb3Rs aWIpDQorICAgICAgOzsgTWFrZSBzdXJlIHRvIHVzZSBzcGVjaWFsIHBhY2thZ2VzIGZvciBQeXRo b24gMiBpbnN0ZWFkDQorICAgICAgOzsgb2YgdGhvc2UgYXV0b21hdGljYWxseSByZXdyaXR0ZW4g YnkgcGFja2FnZS13aXRoLXB5dGhvbjIuDQorICAgICAgKHByb3BhZ2F0ZWQtaW5wdXRzDQorICAg ICAgIGAoKCJweXRob24yLXB5Y2Fpcm8iICxweXRob24yLXB5Y2Fpcm8pDQorICAgICAgICAgKCJw eXRob24yLXB5Z29iamVjdC0yIiAscHl0aG9uMi1weWdvYmplY3QtMikNCisgICAgICAgICAoInB5 dGhvbjItdGtpbnRlciIgLHB5dGhvbi0yICJ0ayIpDQorICAgICAgICAgLEAoZm9sZCBhbGlzdC1k ZWxldGUgKHBhY2thZ2UtcHJvcGFnYXRlZC1pbnB1dHMgbWF0cGxvdGxpYikNCisgICAgICAgICAg ICAgICAgICcoInB5dGhvbi1weWNhaXJvIiAicHl0aG9uLXB5Z29iamVjdCIgInB5dGhvbi10a2lu dGVyIikpKSkpKSkNCisNCisoZGVmaW5lLXB1YmxpYyBweXRob24tbWF0cGxvdGxpYi1kb2N1bWVu dGF0aW9uDQorICAocGFja2FnZQ0KKyAgICAobmFtZSAicHl0aG9uLW1hdHBsb3RsaWItZG9jdW1l bnRhdGlvbiIpDQorICAgICh2ZXJzaW9uIChwYWNrYWdlLXZlcnNpb24gcHl0aG9uLW1hdHBsb3Rs aWIpKQ0KKyAgICAoc291cmNlIChwYWNrYWdlLXNvdXJjZSBweXRob24tbWF0cGxvdGxpYikpDQor ICAgIChidWlsZC1zeXN0ZW0gcHl0aG9uLWJ1aWxkLXN5c3RlbSkNCisgICAgKG5hdGl2ZS1pbnB1 dHMNCisgICAgIGAoKCJweXRob24tbWF0cGxvdGxpYiIgLHB5dGhvbi1tYXRwbG90bGliKQ0KKyAg ICAgICAoInB5dGhvbi1jb2xvcnNwYWNpb3VzIiAscHl0aG9uLWNvbG9yc3BhY2lvdXMpDQorICAg ICAgICgicHl0aG9uLXNwaGlueCIgLHB5dGhvbi1zcGhpbngpDQorICAgICAgICgicHl0aG9uLW51 bXB5ZG9jIiAscHl0aG9uLW51bXB5ZG9jKQ0KKyAgICAgICAoInB5dGhvbi1pcHl0aG9uIiAscHl0 aG9uLWlweXRob24pDQorICAgICAgICgidGV4bGl2ZSIgLHRleGxpdmUpDQorICAgICAgICgidGV4 aW5mbyIgLHRleGluZm8pDQorICAgICAgICxAKHBhY2thZ2UtbmF0aXZlLWlucHV0cyBweXRob24t bWF0cGxvdGxpYikpKQ0KKyAgICAoYXJndW1lbnRzDQorICAgICBgKCM6dGVzdHM/ICNmIDsgd2Un cmUgb25seSBnZW5lcmF0aW5nIGRvY3VtZW50YXRpb24NCisgICAgICAgIzpwaGFzZXMNCisgICAg ICAgKG1vZGlmeS1waGFzZXMgJXN0YW5kYXJkLXBoYXNlcw0KKyAgICAgICAgIChkZWxldGUgJ2J1 aWxkKQ0KKyAgICAgICAgIChyZXBsYWNlICdpbnN0YWxsDQogICAgICAgICAgICAobGFtYmRhKiAo IzprZXkgaW5wdXRzIG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQ0KLSAgICAgICAgICAgICAo bGV0KiAoKGRhdGEgKHN0cmluZy1hcHBlbmQgKGFzc29jLXJlZiBvdXRwdXRzICJkb2MiKSAiL3No YXJlIikpDQorICAgICAgICAgICAgIChsZXQqICgoZGF0YSAoc3RyaW5nLWFwcGVuZCAoYXNzb2Mt cmVmIG91dHB1dHMgIm91dCIpICIvc2hhcmUiKSkNCiAgICAgICAgICAgICAgICAgICAgIChkb2Mg KHN0cmluZy1hcHBlbmQgZGF0YSAiL2RvYy8iICxuYW1lICItIiAsdmVyc2lvbikpDQogICAgICAg ICAgICAgICAgICAgICAoaW5mbyAoc3RyaW5nLWFwcGVuZCBkYXRhICIvaW5mbyIpKQ0KICAgICAg ICAgICAgICAgICAgICAgKGh0bWwgKHN0cmluZy1hcHBlbmQgZG9jICIvaHRtbCIpKSkNCiAgICAg ICAgICAgICAgICA7OyBNYWtlIGluc3RhbGxlZCBwYWNrYWdlIGF2YWlsYWJsZSBmb3IgYnVpbGRp bmcgdGhlDQogICAgICAgICAgICAgICAgOzsgZG9jdW1lbnRhdGlvbg0KLSAgICAgICAgICAgICAg IChhZGQtaW5zdGFsbGVkLXB5dGhvbnBhdGggaW5wdXRzIG91dHB1dHMpDQogICAgICAgICAgICAg ICAgKHdpdGgtZGlyZWN0b3J5LWV4Y3Vyc2lvbiAiZG9jIg0KICAgICAgICAgICAgICAgICAgOzsg UHJvZHVjZSBwZGYgaW4gJ0E0JyBmb3JtYXQuDQogICAgICAgICAgICAgICAgICAoc3Vic3RpdHV0 ZSogKGZpbmQtZmlsZXMgIi4iICJjb25mXFwucHkiKQ0KICAgICAgICAgICAgICAgICAgICAoKCJs YXRleF9wYXBlcl9zaXplID0gJ2xldHRlciciKQ0KICAgICAgICAgICAgICAgICAgICAgImxhdGV4 X3BhcGVyX3NpemUgPSAnYTQnIikpDQotICAgICAgICAgICAgICAgICAoc3Vic3RpdHV0ZSogInVz ZXJzL2ludHJvLnJzdCINCi0gICAgICAgICAgICAgICAgICAgOzsgRml4IHJlU1QgbWFya3VwIGVy cm9yIChzZWUgPGh0dHBzOi8vZ2l0aHViLmNvbS9zcGhpbngtZG9jL3NwaGlueC9pc3N1ZXMvMzA0 ND4pDQotICAgICAgICAgICAgICAgICAgICgoIltbXVsqXVtdXSIpICJbI10iKSkNCiAgICAgICAg ICAgICAgICAgIChta2Rpci1wIGh0bWwpDQogICAgICAgICAgICAgICAgICAobWtkaXItcCBpbmZv KQ0KICAgICAgICAgICAgICAgICAgOzsgVGhlIGRvYyByZWNvbW1lbmRzIHRvIHJ1biB0aGUgJ2h0 bWwnIHRhcmdldCB0d2ljZS4NCkBAIC0zOTIzLDM1ICszOTU5LDE1IEBAIGJhY2tlbmQgPSBUa0Fn Z34lIg0KICAgICAgICAgICAgICAgICAgKGNvcHktZmlsZSAiYnVpbGQvdGV4aW5mby9tYXRwbG90 bGliLmluZm8iDQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kIGlu Zm8gIi9tYXRwbG90bGliLmluZm8iKSkNCiAgICAgICAgICAgICAgICAgIChjb3B5LWZpbGUgImJ1 aWxkL2xhdGV4L01hdHBsb3RsaWIucGRmIg0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAo c3RyaW5nLWFwcGVuZCBkb2MgIi9NYXRwbG90bGliLnBkZiIpKSkNCi0gICAgICAgICAgICAgICAg ICN0KSkpKSkpDQotICAgIChob21lLXBhZ2UgImh0dHA6Ly9tYXRwbG90bGliLm9yZyIpDQotICAg IChzeW5vcHNpcyAiMkQgcGxvdHRpbmcgbGlicmFyeSBmb3IgUHl0aG9uIikNCi0gICAgKGRlc2Ny aXB0aW9uDQotICAgICAiTWF0cGxvdGxpYiBpcyBhIFB5dGhvbiAyRCBwbG90dGluZyBsaWJyYXJ5 IHdoaWNoIHByb2R1Y2VzIHB1YmxpY2F0aW9uDQotcXVhbGl0eSBmaWd1cmVzIGluIGEgdmFyaWV0 eSBvZiBoYXJkY29weSBmb3JtYXRzIGFuZCBpbnRlcmFjdGl2ZSBlbnZpcm9ubWVudHMNCi1hY3Jv c3MgcGxhdGZvcm1zLiAgTWF0cGxvdGxpYiBjYW4gYmUgdXNlZCBpbiBQeXRob24gc2NyaXB0cywg dGhlIHB5dGhvbiBhbmQNCi1pcHl0aG9uIHNoZWxsLCB3ZWIgYXBwbGljYXRpb24gc2VydmVycywg YW5kIHNpeCBncmFwaGljYWwgdXNlciBpbnRlcmZhY2UNCi10b29sa2l0cy4iKQ0KLSAgICAobGlj ZW5zZSBsaWNlbnNlOnBzZmwpDQotICAgIChwcm9wZXJ0aWVzIGAoKHB5dGhvbjItdmFyaWFudCAu ICwoZGVsYXkgcHl0aG9uMi1tYXRwbG90bGliKSkpKSkpDQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgIChzdHJpbmctYXBwZW5kIGRvYyAiL01hdHBsb3RsaWIucGRmIikpKSkNCisgICAgICAg ICAgICAgI3QpKSkpKQ0KKyAgICAoaG9tZS1wYWdlIChwYWNrYWdlLWhvbWUtcGFnZSBweXRob24t bWF0cGxvdGxpYikpDQorICAgIChzeW5vcHNpcyAiRG9jdW1lbnRhdGlvbiBmb3IgdGhlIHB5dGhv bi1tYXRwbG90bGliIHBhY2thZ2UiKQ0KKyAgICAoZGVzY3JpcHRpb24gKHBhY2thZ2UtZGVzY3Jp cHRpb24gcHl0aG9uLW1hdHBsb3RsaWIpKQ0KKyAgICAobGljZW5zZSAocGFja2FnZS1saWNlbnNl IHB5dGhvbi1tYXRwbG90bGliKSkpKQ0KIA0KLShkZWZpbmUtcHVibGljIHB5dGhvbjItbWF0cGxv dGxpYg0KLSAgKGxldCAoKG1hdHBsb3RsaWIgKHBhY2thZ2Utd2l0aC1weXRob24yDQotICAgICAg ICAgICAgICAgICAgICAgKHN0cmlwLXB5dGhvbjItdmFyaWFudCBweXRob24tbWF0cGxvdGxpYikp KSkNCi0gICAgKHBhY2thZ2UgKGluaGVyaXQgbWF0cGxvdGxpYikNCi0gICAgICA7OyBNYWtlIHN1 cmUgdG8gdXNlIHNwZWNpYWwgcGFja2FnZXMgZm9yIFB5dGhvbiAyIGluc3RlYWQNCi0gICAgICA7 OyBvZiB0aG9zZSBhdXRvbWF0aWNhbGx5IHJld3JpdHRlbiBieSBwYWNrYWdlLXdpdGgtcHl0aG9u Mi4NCi0gICAgICAobmF0aXZlLWlucHV0cw0KLSAgICAgICBgKCgicHl0aG9uMi1zcGhpbngiICxw eXRob24yLXNwaGlueC0xLjIuMykNCi0gICAgICAgICAsQChmb2xkIGFsaXN0LWRlbGV0ZSAocGFj a2FnZS1uYXRpdmUtaW5wdXRzIG1hdHBsb3RsaWIpDQotICAgICAgICAgICAgICAgICAnKCJweXRo b24tc3BoaW54IikpKSkNCi0gICAgICAocHJvcGFnYXRlZC1pbnB1dHMNCi0gICAgICAgYCgoInB5 dGhvbjItcHljYWlybyIgLHB5dGhvbjItcHljYWlybykNCi0gICAgICAgICAoInB5dGhvbjItcHln b2JqZWN0LTIiICxweXRob24yLXB5Z29iamVjdC0yKQ0KLSAgICAgICAgICgicHl0aG9uMi10a2lu dGVyIiAscHl0aG9uLTIgInRrIikNCi0gICAgICAgICAsQChmb2xkIGFsaXN0LWRlbGV0ZSAocGFj a2FnZS1wcm9wYWdhdGVkLWlucHV0cyBtYXRwbG90bGliKQ0KLSAgICAgICAgICAgICAgICAgJygi cHl0aG9uLXB5Y2Fpcm8iICJweXRob24tcHlnb2JqZWN0IiAicHl0aG9uLXRraW50ZXIiKSkpKSkp KQ0KKyhkZWZpbmUtcHVibGljIHB5dGhvbjItbWF0cGxvdGxpYi1kb2N1bWVudGF0aW9uDQorICAo cGFja2FnZS13aXRoLXB5dGhvbjIgcHl0aG9uLW1hdHBsb3RsaWItZG9jdW1lbnRhdGlvbikpDQog DQogKGRlZmluZS1wdWJsaWMgcHl0aG9uMi1weXNucHRvb2xzDQogICAocGFja2FnZQ0KLS0gDQoy LjExLjENCg0KDQpGcm9tIGRjYTdjNmFhYjVhMTVlYjIwNjQyODdjMmMzNTVlZDRmYzE5ZmRlMzkg TW9uIFNlcCAxNyAwMDowMDowMCAyMDAxDQpGcm9tOiBUaG9tYXMgRGFuY2thZXJ0IDxwb3N0QHRo b21hc2RhbmNrYWVydC5iZT4NCkRhdGU6IEZyaSwgMjQgRmViIDIwMTcgMTc6MDc6MjcgKzAxMDAN ClN1YmplY3Q6IFtQQVRDSCA2LzldIGdudTogcHl0aG9uLXRlc3RwYXRoOiBGaXggbGlicmFyeSBs b2NhdGlvbiBmb3IgcHl0aG9uMg0KIHZlcnNpb24uDQoNCiogZ251L3BhY2thZ2VzL3B5dGhvbi5z Y20gKHB5dGhvbi10ZXN0cGF0aClbYXJndW1lbnRzXTogSW5zdGFsbCBtb2R1bGUgaW4gdGhlIHBy b3Blcg0KImxpYi9weXRob254LnkiIGxvY2F0aW9uIGZvciBhbGwgUHl0aG9uIHZlcnNpb25zLg0K LS0tDQogZ251L3BhY2thZ2VzL3B5dGhvbi5zY20gfCAyNiArKysrKysrKysrKysrKysrLS0tLS0t LS0tLQ0KIDEgZmlsZSBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkN Cg0KZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9weXRob24uc2NtIGIvZ251L3BhY2thZ2VzL3B5 dGhvbi5zY20NCmluZGV4IDc4YTdjZjFmMC4uZDg5NDhkMWM1IDEwMDY0NA0KLS0tIGEvZ251L3Bh Y2thZ2VzL3B5dGhvbi5zY20NCisrKyBiL2dudS9wYWNrYWdlcy9weXRob24uc2NtDQpAQCAtNTE1 MywyMCArNTE1MywyNiBAQCBpbnN0YWxsaW5nIEBjb2Rle2tlcm5lbHNwZWN9cyBmb3IgdXNlIHdp dGggSnVweXRlciBmcm9udGVuZHMuIikNCiAgICAgKGJ1aWxkLXN5c3RlbSBweXRob24tYnVpbGQt c3lzdGVtKQ0KICAgICAoYXJndW1lbnRzDQogICAgICBgKCM6dGVzdHM/ICNmIDsgdGhpcyBwYWNr YWdlIGRvZXMgbm90IGV2ZW4gaGF2ZSBhIHNldHVwLnB5DQorICAgICAgICM6bW9kdWxlcyAoKGd1 aXggYnVpbGQgcHl0aG9uLWJ1aWxkLXN5c3RlbSkNCisgICAgICAgICAgICAgICAgICAoZ3VpeCBi dWlsZCB1dGlscykNCisgICAgICAgICAgICAgICAgICAoc3JmaSBzcmZpLTEpKQ0KKyAgICAgICAj OmltcG9ydGVkLW1vZHVsZXMgKCxAJXB5dGhvbi1idWlsZC1zeXN0ZW0tbW9kdWxlcw0KKyAgICAg ICAgICAgICAgICAgICAgICAgICAgIChzcmZpIHNyZmktMSkpDQogICAgICAgICM6cGhhc2VzDQog ICAgICAgIChtb2RpZnktcGhhc2VzICVzdGFuZGFyZC1waGFzZXMNCiAgICAgICAgICAoZGVsZXRl ICdpbnN0YWxsKQ0KICAgICAgICAgIChyZXBsYWNlICdidWlsZA0KLSAgICAgICAgICAgICAgICAg IChsYW1iZGEqICgjOmtleSBpbnB1dHMgb3V0cHV0cyAjOmFsbG93LW90aGVyLWtleXMpDQotICAg ICAgICAgICAgICAgICAgICAobGV0ICgoZGlyIChzdHJpbmctYXBwZW5kDQotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAoYXNzb2MtcmVmIG91dHB1dHMgIm91dCIpDQotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAiL2xpYi9weXRob24iDQotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAoc3RyaW5nLXRha2UgKHN0cmluZy10YWtlLXJpZ2h0DQotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChhc3NvYy1yZWYgaW5wdXRzICJw eXRob24iKSA1KSAzKQ0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIi9zaXRlLXBh Y2thZ2VzL3Rlc3RwYXRoIikpKQ0KLSAgICAgICAgICAgICAgICAgICAgICAobWtkaXItcCBkaXIp DQotICAgICAgICAgICAgICAgICAgICAgIChjb3B5LXJlY3Vyc2l2ZWx5ICJ0ZXN0cGF0aCIgZGly KSkNCi0gICAgICAgICAgICAgICAgICAgICN0KSkpKSkNCisgICAgICAgICAgIChsYW1iZGEqICgj OmtleSBpbnB1dHMgb3V0cHV0cyAjOmFsbG93LW90aGVyLWtleXMpDQorICAgICAgICAgICAgIChs ZXQqICgodmVyc2lvbiAobGFzdA0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChzdHJp bmctc3BsaXQgKGFzc29jLXJlZiBpbnB1dHMgInB5dGhvbiIpICNcLSkpKQ0KKyAgICAgICAgICAg ICAgICAgICAgKHgueSAoc3RyaW5nLWpvaW4gKHRha2UgKHN0cmluZy1zcGxpdCB2ZXJzaW9uICNc LikgMikNCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIi4iKSkNCisg ICAgICAgICAgICAgICAgICAgIChkaXIgKHN0cmluZy1hcHBlbmQNCisgICAgICAgICAgICAgICAg ICAgICAgICAgIChhc3NvYy1yZWYgb3V0cHV0cyAib3V0IikNCisgICAgICAgICAgICAgICAgICAg ICAgICAgICIvbGliL3B5dGhvbiIgeC55ICIvc2l0ZS1wYWNrYWdlcy90ZXN0cGF0aCIpKSkNCisg ICAgICAgICAgICAgICAobWtkaXItcCBkaXIpDQorICAgICAgICAgICAgICAgKGNvcHktcmVjdXJz aXZlbHkgInRlc3RwYXRoIiBkaXIpKQ0KKyAgICAgICAgICAgICAjdCkpKSkpDQogICAgIChob21l LXBhZ2UgImh0dHBzOi8vZ2l0aHViLmNvbS90YWtsdXl2ZXIvdGVzdHBhdGgiKQ0KICAgICAoc3lu b3BzaXMgIlRlc3QgdXRpbGl0aWVzIGZvciBjb2RlIHdvcmtpbmcgd2l0aCBmaWxlcyBhbmQgY29t bWFuZHMiKQ0KICAgICAoZGVzY3JpcHRpb24NCi0tIA0KMi4xMS4xDQoNCg0KRnJvbSAwZGRlNjM4 N2RmYjYxZjExMWU4NjMzMTA2NGZiMzAzNDBlZDNkOTcyIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAw MQ0KRnJvbTogVGhvbWFzIERhbmNrYWVydCA8cG9zdEB0aG9tYXNkYW5ja2FlcnQuYmU+DQpEYXRl OiBUdWUsIDIxIEZlYiAyMDE3IDEyOjQxOjA5ICswMTAwDQpTdWJqZWN0OiBbUEFUQ0ggNy85XSBn bnU6IHB5dGhvbi1pcHl0aG9uOiBVcGRhdGUgdG8gNS4yLjIuDQoNCiogZ251L3BhY2thZ2VzL3B5 dGhvbi5zY20gKHB5dGhvbi1pcHl0aG9uKTogVXBkYXRlIHRvIDUuMi4yLg0KW3Byb3BhZ2F0ZWQt aW5wdXRzXTogQWRkIHB5aG9uLXByb21wdC10b29sa2l0IGFuZCBweXRob24tbmJmb3JtYXQuDQoo cHl0aG9uMi1pcHl0aG9uKSBbYXJndW1lbnRzXTogRW5hYmxlIHRlc3RzLg0KW3Byb3BhZ2F0ZWQt aW5wdXRzXTogQWRkIHB5dGhvbjItYmFja3BvcnRzLXNodXRpbC1nZXQtdGVybWluYWwtc2l6ZS4N Ci0tLQ0KIGdudS9wYWNrYWdlcy9weXRob24uc2NtIHwgMjIgKysrKysrKysrKysrKystLS0tLS0t LQ0KIDEgZmlsZSBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQ0KDQpk aWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3B5dGhvbi5zY20gYi9nbnUvcGFja2FnZXMvcHl0aG9u LnNjbQ0KaW5kZXggZDg5NDhkMWM1Li42OTFlMTE3NTcgMTAwNjQ0DQotLS0gYS9nbnUvcGFja2Fn ZXMvcHl0aG9uLnNjbQ0KKysrIGIvZ251L3BhY2thZ2VzL3B5dGhvbi5zY20NCkBAIC01MTg3LDE3 ICs1MTg3LDE4IEBAIHRvb2xzIGZvciBtb2NraW5nIHN5c3RlbSBjb21tYW5kcyBhbmQgcmVjb3Jk aW5nIGNhbGxzIHRvIHRob3NlLiIpDQogKGRlZmluZS1wdWJsaWMgcHl0aG9uLWlweXRob24NCiAg IChwYWNrYWdlDQogICAgIChuYW1lICJweXRob24taXB5dGhvbiIpDQotICAgICh2ZXJzaW9uICI0 LjAuMyIpDQorICAgICh2ZXJzaW9uICI1LjIuMiIpDQogICAgIChzb3VyY2UNCiAgICAgIChvcmln aW4NCiAgICAgICAgKG1ldGhvZCB1cmwtZmV0Y2gpDQogICAgICAgICh1cmkgKHB5cGktdXJpICJp cHl0aG9uIiB2ZXJzaW9uICIudGFyLmd6IikpDQogICAgICAgIChzaGEyNTYNCi0gICAgICAgIChi YXNlMzIgIjFoMmdwMXAwNnN3dzlyemZrZnpxeTQ4OWJoNDdnajM5MTB5MmIxd2RrM2RjeDFjcXo0 aXMiKSkpKQ0KKyAgICAgICAgKGJhc2UzMiAiMXFoandhOWN5ejFucDdyaHYzcDRpcDEzbGtnYnFz YWQ2MmwyNHhrd2lxMWljMmd3aXFiZiIpKSkpDQogICAgIChidWlsZC1zeXN0ZW0gcHl0aG9uLWJ1 aWxkLXN5c3RlbSkNCiAgICAgKG91dHB1dHMgJygib3V0IiAiZG9jIikpDQogICAgIChwcm9wYWdh dGVkLWlucHV0cw0KICAgICAgYCgoInB5dGhvbi1weXptcSIgLHB5dGhvbi1weXptcSkNCisgICAg ICAgKCJweXRob24tcHJvbXB0LXRvb2xraXQiICxweXRob24tcHJvbXB0LXRvb2xraXQpDQogICAg ICAgICgicHl0aG9uLXRlcm1pbmFkbyIgLHB5dGhvbi10ZXJtaW5hZG8pDQogICAgICAgICgicHl0 aG9uLW1hdHBsb3RsaWIiICxweXRob24tbWF0cGxvdGxpYikNCiAgICAgICAgKCJweXRob24tbnVt cHkiICxweXRob24tbnVtcHkpDQpAQCAtNTIxMCw2ICs1MjExLDcgQEAgdG9vbHMgZm9yIG1vY2tp bmcgc3lzdGVtIGNvbW1hbmRzIGFuZCByZWNvcmRpbmcgY2FsbHMgdG8gdGhvc2UuIikNCiAgICAg ICAgKCJweXRob24tanNvbnNjaGVtYSIgLHB5dGhvbi1qc29uc2NoZW1hKQ0KICAgICAgICAoInB5 dGhvbi10cmFpdGxldHMiICxweXRob24tdHJhaXRsZXRzKQ0KICAgICAgICAoInB5dGhvbi1pcHlr ZXJuZWwiICxweXRob24taXB5a2VybmVsKQ0KKyAgICAgICAoInB5dGhvbi1uYmZvcm1hdCIgLHB5 dGhvbi1uYmZvcm1hdCkNCiAgICAgICAgKCJweXRob24tcHlnbWVudHMiICxweXRob24tcHlnbWVu dHMpKSkNCiAgICAgKGlucHV0cw0KICAgICAgYCgoInJlYWRsaW5lIiAscmVhZGxpbmUpDQpAQCAt NTIyMCw2ICs1MjIyLDcgQEAgdG9vbHMgZm9yIG1vY2tpbmcgc3lzdGVtIGNvbW1hbmRzIGFuZCBy ZWNvcmRpbmcgY2FsbHMgdG8gdGhvc2UuIikNCiAgICAgICAgKCJweXRob24tdGVzdHBhdGgiICxw eXRob24tdGVzdHBhdGgpDQogICAgICAgICgicHl0aG9uLW5vc2UiICxweXRob24tbm9zZSkNCiAg ICAgICAgKCJweXRob24tc3BoaW54IiAscHl0aG9uLXNwaGlueCkNCisgICAgICAgKCJweXRob24t c2hwaW54LXJ0ZC10aGVtZSIgLHB5dGhvbi1zcGhpbngtcnRkLXRoZW1lKQ0KICAgICAgICAoInRl eGxpdmUiICx0ZXhsaXZlKQ0KICAgICAgICAoInRleGluZm8iICx0ZXhpbmZvKSkpDQogICAgIChh cmd1bWVudHMNCkBAIC01MjMzLDE1ICs1MjM2LDE2IEBAIHRvb2xzIGZvciBtb2NraW5nIHN5c3Rl bSBjb21tYW5kcyBhbmQgcmVjb3JkaW5nIGNhbGxzIHRvIHRob3NlLiIpDQogICAgICAgICAgICAg ICAgICAgIChodG1sIChzdHJpbmctYXBwZW5kIGRvYyAiL2h0bWwiKSkNCiAgICAgICAgICAgICAg ICAgICAgKG1hbjEgKHN0cmluZy1hcHBlbmQgZGF0YSAiL21hbi9tYW4xIikpDQogICAgICAgICAg ICAgICAgICAgIChpbmZvIChzdHJpbmctYXBwZW5kIGRhdGEgIi9pbmZvIikpDQotICAgICAgICAg ICAgICAgICAgIChleGFtcGxlcyAoc3RyaW5nLWFwcGVuZCBkb2MgIi9leGFtcGxlcyIpKSkNCisg ICAgICAgICAgICAgICAgICAgKGV4YW1wbGVzIChzdHJpbmctYXBwZW5kIGRvYyAiL2V4YW1wbGVz IikpDQorICAgICAgICAgICAgICAgICAgIChweXRob24tYXJnIChzdHJpbmctYXBwZW5kICJQWVRI T049IiAod2hpY2ggInB5dGhvbiIpKSkpDQogICAgICAgICAgICAgICAoc2V0ZW52ICJMQU5HIiAi ZW5fVVMudXRmOCIpDQogICAgICAgICAgICAgICA7OyBNYWtlIGluc3RhbGxlZCBwYWNrYWdlIGF2 YWlsYWJsZSBmb3IgcnVubmluZyB0aGUgdGVzdHMNCiAgICAgICAgICAgICAgIChhZGQtaW5zdGFs bGVkLXB5dGhvbnBhdGggaW5wdXRzIG91dHB1dHMpDQogICAgICAgICAgICAgICAod2l0aC1kaXJl Y3RvcnktZXhjdXJzaW9uICJkb2NzIg0KICAgICAgICAgICAgICAgICA7OyBGSVhNRTogcGRmIGZh aWxzIHRvIGJ1aWxkDQogICAgICAgICAgICAgICAgIDs7KHN5c3RlbSogIm1ha2UiICJwZGYiICJQ QVBFUj1hNCIpDQotICAgICAgICAgICAgICAgIChzeXN0ZW0qICJtYWtlIiAiaHRtbCIpDQotICAg ICAgICAgICAgICAgIChzeXN0ZW0qICJtYWtlIiAiaW5mbyIpKQ0KKyAgICAgICAgICAgICAgICAo c3lzdGVtKiAibWFrZSIgcHl0aG9uLWFyZyAiaHRtbCIpDQorICAgICAgICAgICAgICAgIChzeXN0 ZW0qICJtYWtlIiBweXRob24tYXJnICJpbmZvIikpDQogICAgICAgICAgICAgICAoY29weS1yZWN1 cnNpdmVseSAiZG9jcy9tYW4iIG1hbjEpDQogICAgICAgICAgICAgICAoY29weS1yZWN1cnNpdmVs eSAiZXhhbXBsZXMiIGV4YW1wbGVzKQ0KICAgICAgICAgICAgICAgKGNvcHktcmVjdXJzaXZlbHkg ImRvY3MvYnVpbGQvaHRtbCIgaHRtbCkNCkBAIC01MjkxLDEwICs1Mjk1LDEyIEBAIGNvbXB1dGlu Zy4iKQ0KICAgKGxldCAoKGlweXRob24gKHBhY2thZ2Utd2l0aC1weXRob24yIChzdHJpcC1weXRo b24yLXZhcmlhbnQgcHl0aG9uLWlweXRob24pKSkpDQogICAgIChwYWNrYWdlDQogICAgICAgKGlu aGVyaXQgaXB5dGhvbikNCi0gICAgICA7OyBGSVhNRTogc29tZSB0ZXN0cyBhcmUgZmFpbGluZw0K LSAgICAgIChhcmd1bWVudHMNCi0gICAgICAgYCgjOnRlc3RzPyAjZiAsQChwYWNrYWdlLWFyZ3Vt ZW50cyBpcHl0aG9uKSkpDQogICAgICAgOzsgRklYTUU6IGFkZCBweXJlYWRsaW5lIG9uY2UgYXZh aWxhYmxlLg0KKyAgICAgIChwcm9wYWdhdGVkLWlucHV0cw0KKyAgICAgICBgKCgicHl0aG9uMi1i YWNrcG9ydHMtc2h1dGlsLWdldC10ZXJtaW5hbC1zaXplIg0KKyAgICAgICAgICAscHl0aG9uMi1i YWNrcG9ydHMtc2h1dGlsLWdldC10ZXJtaW5hbC1zaXplKQ0KKyAgICAgICAgICgicHl0aG9uMi1w YXRobGliMiIgLHB5dGhvbjItcGF0aGxpYjIpDQorICAgICAgICAgLEAocGFja2FnZS1wcm9wYWdh dGVkLWlucHV0cyBpcHl0aG9uKSkpDQogICAgICAgKG5hdGl2ZS1pbnB1dHMNCiAgICAgICAgYCgo InB5dGhvbjItbW9jayIgLHB5dGhvbjItbW9jaykNCiAgICAgICAgICAsQChwYWNrYWdlLW5hdGl2 ZS1pbnB1dHMgaXB5dGhvbikpKSkpKQ0KLS0gDQoyLjExLjENCg0KDQpGcm9tIDFhNGM2ZDNmMWYx OGM2OTY4MDliMjk4N2FiYWM0MjhjNDI5YmViNWYgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxDQpG cm9tOiBUaG9tYXMgRGFuY2thZXJ0IDxwb3N0QHRob21hc2RhbmNrYWVydC5iZT4NCkRhdGU6IFR1 ZSwgMjEgRmViIDIwMTcgMTE6NDU6MDYgKzAxMDANClN1YmplY3Q6IFtQQVRDSCA4LzldIGdudTog cHl0aG9uLXNjaXB5OiBVcGRhdGUgdG8gMC4xOC4xLg0KDQoqIGdudS9wYWNrYWdlcy9weXRob24u c2NtIChweXRob24tc2NpcHkpOiBVcGRhdGUgdG8gMC4xOC4xLg0KW3NvdXJjZV06IFVzZSBnaXRo dWIgaW5zdGVhZCBvZiBzb3VyY2Vmb3JnZS4NCltuYXRpdmUtaW5wdXRzXTogQWRkIHB5dGhvbi1j eXRob24uDQotLS0NCiBnbnUvcGFja2FnZXMvcHl0aG9uLnNjbSB8IDEwNCArKysrKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCiAxIGZpbGUgY2hhbmdlZCwgNDgg aW5zZXJ0aW9ucygrKSwgNTYgZGVsZXRpb25zKC0pDQoNCmRpZmYgLS1naXQgYS9nbnUvcGFja2Fn ZXMvcHl0aG9uLnNjbSBiL2dudS9wYWNrYWdlcy9weXRob24uc2NtDQppbmRleCA2OTFlMTE3NTcu LmYxNjRmZmYxMyAxMDA2NDQNCi0tLSBhL2dudS9wYWNrYWdlcy9weXRob24uc2NtDQorKysgYi9n bnUvcGFja2FnZXMvcHl0aG9uLnNjbQ0KQEAgLTQwNDksMTYgKzQwNDksMTYgQEAgZnVuY3Rpb25z LiIpDQogKGRlZmluZS1wdWJsaWMgcHl0aG9uLXNjaXB5DQogICAocGFja2FnZQ0KICAgICAobmFt ZSAicHl0aG9uLXNjaXB5IikNCi0gICAgKHZlcnNpb24gIjAuMTYuMCIpDQorICAgICh2ZXJzaW9u ICIwLjE4LjEiKQ0KICAgICAoc291cmNlDQogICAgICAob3JpZ2luDQogICAgICAgIChtZXRob2Qg dXJsLWZldGNoKQ0KLTsgaHR0cDovL2Rvd25sb2Fkcy5zb3VyY2Vmb3JnZS5uZXQvcHJvamVjdC9z Y2lweS9zY2lweS8wLjE2LjEvc2NpcHktMC4xNi4xLnRhci5neg0KLSAgICAgICAodXJpIChzdHJp bmctYXBwZW5kICJtaXJyb3I6Ly9zb3VyY2Vmb3JnZS9zY2lweS9zY2lweS8iIHZlcnNpb24NCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAiL3NjaXB5LSIgdmVyc2lvbiAiLnRhci54eiIpKQ0K KyAgICAgICAodXJpIChzdHJpbmctYXBwZW5kICJodHRwczovL2dpdGh1Yi5jb20vc2NpcHkvc2Np cHkvYXJjaGl2ZS92Ig0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgIHZlcnNpb24gIi50YXIu Z3oiKSkNCisgICAgICAgKGZpbGUtbmFtZSAoc3RyaW5nLWFwcGVuZCBuYW1lICItIiB2ZXJzaW9u ICIudGFyLmd6IikpDQogICAgICAgIChzaGEyNTYNCiAgICAgICAgIChiYXNlMzINCi0gICAgICAg ICAiMHdhMGE0c2twZGEzZ3g3bGIxMnluMTluaGJhaXJseXhydmRhMmx6MmJjYXdrM3g1cXp6MiIp KSkpDQorICAgICAgICAgIjE3c2xzcmZhd2pwN2lmNnFybHgwM3poZ3AwNTM1MGdpbnh4OGRkcHc5 enF4NDN4OTA1c24iKSkpKQ0KICAgICAoYnVpbGQtc3lzdGVtIHB5dGhvbi1idWlsZC1zeXN0ZW0p DQogICAgIChwcm9wYWdhdGVkLWlucHV0cw0KICAgICAgYCgoInB5dGhvbi1udW1weSIgLHB5dGhv bi1udW1weSkNCkBAIC00MDY4LDIxICs0MDY4LDE2IEBAIGZ1bmN0aW9ucy4iKQ0KICAgICAgYCgo ImxhcGFjayIgLGxhcGFjaykNCiAgICAgICAgKCJvcGVuYmxhcyIgLG9wZW5ibGFzKSkpDQogICAg IChuYXRpdmUtaW5wdXRzDQotICAgICBgKCgicHl0aG9uLW5vc2UiICxweXRob24tbm9zZSkNCi0g ICAgICAgKCJweXRob24tc3BoaW54IiAscHl0aG9uLXNwaGlueC0xLjIuMykNCisgICAgIGAoKCJw eXRob24tY3l0aG9uIiAscHl0aG9uLWN5dGhvbikNCisgICAgICAgKCJweXRob24tbm9zZSIgLHB5 dGhvbi1ub3NlKQ0KKyAgICAgICAoInB5dGhvbi1zcGhpbngiICxweXRob24tc3BoaW54KQ0KICAg ICAgICAoInB5dGhvbi1udW1weWRvYyIgLHB5dGhvbi1udW1weWRvYykNCiAgICAgICAgKCJnZm9y dHJhbiIgLGdmb3J0cmFuKQ0KLSAgICAgICAoInRleGxpdmUiICx0ZXhsaXZlKQ0KICAgICAgICAo InBlcmwiICxwZXJsKSkpDQogICAgIChvdXRwdXRzICcoIm91dCIgImRvYyIpKQ0KICAgICAoYXJn dW1lbnRzDQogICAgICBgKCM6cGhhc2VzDQogICAgICAgIChtb2RpZnktcGhhc2VzICVzdGFuZGFy ZC1waGFzZXMNCi0gICAgICAgICAoYWRkLWFmdGVyICd1bnBhY2sgJ2ZpeC10ZXN0cw0KLSAgICAg ICAgICAgKGxhbWJkYSBfDQotICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAic2NpcHkvaW50ZWdy YXRlL3Rlc3RzL3Rlc3RfcXVhZHBhY2sucHkiDQotICAgICAgICAgICAgICAgKCgibGlibS5zbyIp ICJsaWJtLnNvLjYiKSkNCi0gICAgICAgICAgICAgI3QpKQ0KICAgICAgICAgIChhZGQtYmVmb3Jl ICdidWlsZCAnY29uZmlndXJlLW9wZW5ibGFzDQogICAgICAgICAgICAobGFtYmRhKiAoIzprZXkg aW5wdXRzICM6YWxsb3ctb3RoZXIta2V5cykNCiAgICAgICAgICAgICAgKGNhbGwtd2l0aC1vdXRw dXQtZmlsZSAic2l0ZS5jZmciDQpAQCAtNDEwMiw0MCArNDA5Nyw0NCBAQCBhdGxhc19saWJzID0g b3BlbmJsYXMNCiAgICAgICAgICAgICAgICAgICAgICAgICAgKGFzc29jLXJlZiBpbnB1dHMgIm9w ZW5ibGFzIikNCiAgICAgICAgICAgICAgICAgICAgICAgICAgKGFzc29jLXJlZiBpbnB1dHMgIm9w ZW5ibGFzIikpKSkNCiAgICAgICAgICAgICAgI3QpKQ0KLSAgICAgICAgICAgKGRlbGV0ZSAnY2hl Y2spDQotICAgICAgICAgICAoYWRkLWFmdGVyICdpbnN0YWxsICdpbnN0YWxsLWRvYw0KLSAgICAg ICAgICAgICAobGFtYmRhKiAoIzprZXkgaW5wdXRzIG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlz KQ0KLSAgICAgICAgICAgICAgIChsZXQqICgoZGF0YSAoc3RyaW5nLWFwcGVuZCAoYXNzb2MtcmVm IG91dHB1dHMgImRvYyIpICIvc2hhcmUiKSkNCi0gICAgICAgICAgICAgICAgICAgICAgKGRvYyAo c3RyaW5nLWFwcGVuZCBkYXRhICIvZG9jLyIgLG5hbWUgIi0iICx2ZXJzaW9uKSkNCi0gICAgICAg ICAgICAgICAgICAgICAgKGh0bWwgKHN0cmluZy1hcHBlbmQgZG9jICIvaHRtbCIpKQ0KLSAgICAg ICAgICAgICAgICAgICAgICAocHl2ZXIgLChzdHJpbmctYXBwZW5kICJQWVZFUj0iKSkpDQotICAg ICAgICAgICAgICAgICA7OyBNYWtlIGluc3RhbGxlZCBwYWNrYWdlIGF2YWlsYWJsZSBmb3IgYnVp bGRpbmcgdGhlDQotICAgICAgICAgICAgICAgICA7OyBkb2N1bWVudGF0aW9uDQotICAgICAgICAg ICAgICAgICAoYWRkLWluc3RhbGxlZC1weXRob25wYXRoIGlucHV0cyBvdXRwdXRzKQ0KLSAgICAg ICAgICAgICAgICAgKHdpdGgtZGlyZWN0b3J5LWV4Y3Vyc2lvbiAiZG9jIg0KLSAgICAgICAgICAg ICAgICAgICA7OyBGaXggZ2VuZXJhdGlvbiBvZiBpbWFnZXMgZm9yIG1hdGhlbWF0aWNhbCBleHBy ZXNzaW9ucy4NCi0gICAgICAgICAgICAgICAgICAgKHN1YnN0aXR1dGUqIChmaW5kLWZpbGVzICJz b3VyY2UiICJjb25mXFwucHkiKQ0KLSAgICAgICAgICAgICAgICAgICAgICgoInBuZ21hdGhfdXNl X3ByZXZpZXcgPSBUcnVlIikNCi0gICAgICAgICAgICAgICAgICAgICAgInBuZ21hdGhfdXNlX3By ZXZpZXcgPSBGYWxzZSIpKQ0KLSAgICAgICAgICAgICAgICAgICAobWtkaXItcCBodG1sKQ0KLSAg ICAgICAgICAgICAgICAgICAoc3lzdGVtKiAibWFrZSIgImh0bWwiIHB5dmVyKQ0KLSAgICAgICAg ICAgICAgICAgICAoc3lzdGVtKiAibWFrZSIgImxhdGV4IiAiUEFQRVI9YTQiIHB5dmVyKQ0KLSAg ICAgICAgICAgICAgICAgICAoc3lzdGVtKiAibWFrZSIgIi1DIiAiYnVpbGQvbGF0ZXgiICJhbGwt cGRmIiAiUEFQRVI9YTQiIHB5dmVyKQ0KLSAgICAgICAgICAgICAgICAgICAoY29weS1maWxlICJi dWlsZC9sYXRleC9zY2lweS1yZWYucGRmIg0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IChzdHJpbmctYXBwZW5kIGRvYyAiL3NjaXB5LXJlZi5wZGYiKSkNCi0gICAgICAgICAgICAgICAg ICAgKHdpdGgtZGlyZWN0b3J5LWV4Y3Vyc2lvbiAiYnVpbGQvaHRtbCINCi0gICAgICAgICAgICAg ICAgICAgICAoZm9yLWVhY2ggKGxhbWJkYSAoZmlsZSkNCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAobGV0KiAoKGRpciAoZGlybmFtZSBmaWxlKSkNCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKHRndC1kaXIgKHN0cmluZy1hcHBlbmQgaHRtbCAiLyIg ZGlyKSkpDQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoaW5zdGFsbC1maWxl IGZpbGUgaHRtbCkpKQ0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoZmluZC1maWxl cyAiLiIgIi4qIikpKSkNCi0gICAgICAgICAgICAgICAgICN0KSkpDQotICAgICAgICAgICAoYWRk LWFmdGVyICdpbnN0YWxsLWRvYyAnY2hlY2sNCi0gICAgICAgICAgICAgKGxhbWJkYSBfDQotICAg ICAgICAgICAgICAgOzsgVGVzdHMgY2FuIG9ubHkgYmUgcnVuIGFmdGVyIHRoZSBsaWJyYXJ5IGhh cyBiZWVuIGluc3RhbGxlZCBhbmQgbm90DQotICAgICAgICAgICAgICAgOzsgd2l0aGluIHRoZSBz b3VyY2UgZGlyZWN0b3J5Lg0KLSAgICAgICAgICAgICAgICh3aXRoLWRpcmVjdG9yeS1leGN1cnNp b24gIi90bXAiDQotICAgICAgICAgICAgICAgICAoemVybz8gKHN5c3RlbSogInB5dGhvbiIgIi1j IiAiaW1wb3J0IHNjaXB5OyBzY2lweS50ZXN0KCkiKSkpKSkpKSkNCisgICAgICAgICAoYWRkLWFm dGVyICdpbnN0YWxsICdpbnN0YWxsLWRvYw0KKyAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlu cHV0cyBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykNCisgICAgICAgICAgICAgKGxldCogKChk YXRhIChzdHJpbmctYXBwZW5kIChhc3NvYy1yZWYgb3V0cHV0cyAiZG9jIikgIi9zaGFyZSIpKQ0K KyAgICAgICAgICAgICAgICAgICAgKGRvYyAoc3RyaW5nLWFwcGVuZCBkYXRhICIvZG9jLyIgLG5h bWUgIi0iICx2ZXJzaW9uKSkNCisgICAgICAgICAgICAgICAgICAgIChodG1sIChzdHJpbmctYXBw ZW5kIGRvYyAiL2h0bWwiKSkNCisgICAgICAgICAgICAgICAgICAgIChweXZlciAsKHN0cmluZy1h cHBlbmQgIlBZVkVSPSIpKSkNCisgICAgICAgICAgICAgICA7OyBNYWtlIGluc3RhbGxlZCBwYWNr YWdlIGF2YWlsYWJsZSBmb3IgYnVpbGRpbmcgdGhlDQorICAgICAgICAgICAgICAgOzsgZG9jdW1l bnRhdGlvbg0KKyAgICAgICAgICAgICAgIChhZGQtaW5zdGFsbGVkLXB5dGhvbnBhdGggaW5wdXRz IG91dHB1dHMpDQorICAgICAgICAgICAgICAgKHdpdGgtZGlyZWN0b3J5LWV4Y3Vyc2lvbiAiZG9j Ig0KKyAgICAgICAgICAgICAgICAgOzsgRml4IGdlbmVyYXRpb24gb2YgaW1hZ2VzIGZvciBtYXRo ZW1hdGljYWwgZXhwcmVzc2lvbnMuDQorICAgICAgICAgICAgICAgICAoc3Vic3RpdHV0ZSogKGZp bmQtZmlsZXMgInNvdXJjZSIgImNvbmZcXC5weSIpDQorICAgICAgICAgICAgICAgICAgICgoInBu Z21hdGhfdXNlX3ByZXZpZXcgPSBUcnVlIikNCisgICAgICAgICAgICAgICAgICAgICJwbmdtYXRo X3VzZV9wcmV2aWV3ID0gRmFsc2UiKSkNCisgICAgICAgICAgICAgICAgIChta2Rpci1wIGh0bWwp DQorICAgICAgICAgICAgICAgICAoc3lzdGVtKiAibWFrZSIgImh0bWwiIHB5dmVyKQ0KKyAgICAg ICAgICAgICAgICAgKHdpdGgtZGlyZWN0b3J5LWV4Y3Vyc2lvbiAiYnVpbGQvaHRtbCINCisgICAg ICAgICAgICAgICAgICAgKGZvci1lYWNoIChsYW1iZGEgKGZpbGUpDQorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIChsZXQqICgoZGlyIChkaXJuYW1lIGZpbGUpKQ0KKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgKHRndC1kaXIgKHN0cmluZy1hcHBlbmQgaHRtbCAi LyIgZGlyKSkpDQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGluc3RhbGwtZmls ZSBmaWxlIGh0bWwpKSkNCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChmaW5kLWZpbGVz ICIuIiAiLioiKSkpKSkNCisgICAgICAgICAgICAgI3QpKQ0KKyAgICAgICAgIChhZGQtYWZ0ZXIg J3VucGFjayAnZml4LXRlc3RzDQorICAgICAgICAgICAobGFtYmRhIF8NCisgICAgICAgICAgICAg KHN1YnN0aXR1dGUqICJzY2lweS9pbnRlZ3JhdGUvdGVzdHMvdGVzdF9xdWFkcGFjay5weSINCisg ICAgICAgICAgICAgICAoKCJsaWJtLnNvIikgImxpYm0uc28uNiIpKQ0KKyAgICAgICAgICAgICAj dCkpDQorICAgICAgICAgICA7OyBUZXN0cyBjYW4gb25seSBiZSBydW4gYWZ0ZXIgdGhlIGxpYnJh cnkgaGFzIGJlZW4gaW5zdGFsbGVkIGFuZCBub3QNCisgICAgICAgICAgIDs7IHdpdGhpbiB0aGUg c291cmNlIGRpcmVjdG9yeS4NCisgICAgICAgICAoZGVsZXRlICdjaGVjaykNCisgICAgICAgICAo YWRkLWFmdGVyICdpbnN0YWxsICdjaGVjaw0KKyAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlu cHV0cyBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykNCisgICAgICAgICAgICAgKGFkZC1pbnN0 YWxsZWQtcHl0aG9ucGF0aCBpbnB1dHMgb3V0cHV0cykNCisgICAgICAgICAgICAgKHdpdGgtZGly ZWN0b3J5LWV4Y3Vyc2lvbiAiL3RtcCINCisgICAgICAgICAgICAgICAoemVybz8gKHN5c3RlbSog InB5dGhvbiIgIi1jIg0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiaW1wb3J0IHNj aXB5OyBzY2lweS50ZXN0KCdmdWxsJykiKSkpDQorICAgICAgICAgICAgICN0KSkpKSkNCiAgICAg KGhvbWUtcGFnZSAiaHR0cDovL3d3dy5zY2lweS5vcmcvIikNCiAgICAgKHN5bm9wc2lzICJUaGUg U2NpcHkgbGlicmFyeSBwcm92aWRlcyBlZmZpY2llbnQgbnVtZXJpY2FsIHJvdXRpbmVzIikNCiAg ICAgKGRlc2NyaXB0aW9uICJUaGUgU2NpUHkgbGlicmFyeSBpcyBvbmUgb2YgdGhlIGNvcmUgcGFj a2FnZXMgdGhhdCBtYWtlIHVwDQpAQCAtNDE0NSwxNSArNDE0NCw4IEBAIHJvdXRpbmVzIHN1Y2gg YXMgcm91dGluZXMgZm9yIG51bWVyaWNhbCBpbnRlZ3JhdGlvbiBhbmQgb3B0aW1pemF0aW9uLiIp DQogICAgIChsaWNlbnNlIGxpY2Vuc2U6YnNkLTMpKSkNCiANCiAoZGVmaW5lLXB1YmxpYyBweXRo b24yLXNjaXB5DQotICAobGV0ICgoc2NpcHkgKHBhY2thZ2Utd2l0aC1weXRob24yDQotICAgICAg ICAgICAgICAgIChzdHJpcC1weXRob24yLXZhcmlhbnQgcHl0aG9uLXNjaXB5KSkpKQ0KLSAgICAo cGFja2FnZSAoaW5oZXJpdCBzY2lweSkNCi0gICAgICAgICAgICAgOzsgTWFrZSBzdXJlIHRvIHVz ZSBzcGVjaWFsIHBhY2thZ2VzIGZvciBQeXRob24gMiBpbnN0ZWFkDQotICAgICAgICAgICAgIDs7 IG9mIHRob3NlIGF1dG9tYXRpY2FsbHkgcmV3cml0dGVuIGJ5IHBhY2thZ2Utd2l0aC1weXRob24y Lg0KLSAgICAgICAgICAgICAobmF0aXZlLWlucHV0cw0KLSAgICAgICAgICAgICAgYCgoInB5dGhv bjItc3BoaW54IiAscHl0aG9uMi1zcGhpbngtMS4yLjMpDQotICAgICAgICAgICAgICAgICxAKGZv bGQgYWxpc3QtZGVsZXRlIChwYWNrYWdlLW5hdGl2ZS1pbnB1dHMgc2NpcHkpDQotICAgICAgICAg ICAgICAgICAgICAgICAgJygicHl0aG9uLXNwaGlueCIpKSkpKSkpDQorICAocGFja2FnZS13aXRo LXB5dGhvbjINCisgICAoc3RyaXAtcHl0aG9uMi12YXJpYW50IHB5dGhvbi1zY2lweSkpKQ0KIA0K IChkZWZpbmUtcHVibGljIHB5dGhvbi1zb2Nrc2lweS1icmFuY2gNCiAgIChwYWNrYWdlDQotLSAN CjIuMTEuMQ0KDQoNCkZyb20gZjQ4YzRhZTg2N2UyMWYwODQzYmQxNDg3YTljMWNjNTRiZDJkNzhk NiBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDENCkZyb206IFRob21hcyBEYW5ja2FlcnQgPHRob21h cy5kYW5ja2FlcnRAZ21haWwuY29tPg0KRGF0ZTogU2F0LCAyNSBGZWIgMjAxNyAyMzozNToyMiAr MDEwMA0KU3ViamVjdDogW1BBVENIIDkvOV0gZ251OiBSZW1vdmUgcHl0aG9uLXNwaGlueC0xLjIu My4NCg0KKiBnbnUvcGFja2FnZXMvcHl0aG9uLnNjbSAocHl0aG9uLXNwaGlueC0xLjIuMywgcHl0 aG9uMi1zcGhpbngtMS4yLjMpOiBSZW1vdmUgdmFyaWFibGVzLg0KLS0tDQogZ251L3BhY2thZ2Vz L3B5dGhvbi5zY20gfCAxOCAtLS0tLS0tLS0tLS0tLS0tLS0NCiAxIGZpbGUgY2hhbmdlZCwgMTgg ZGVsZXRpb25zKC0pDQoNCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvcHl0aG9uLnNjbSBiL2du dS9wYWNrYWdlcy9weXRob24uc2NtDQppbmRleCBmMTY0ZmZmMTMuLjIyYzRkN2FhZSAxMDA2NDQN Ci0tLSBhL2dudS9wYWNrYWdlcy9weXRob24uc2NtDQorKysgYi9nbnUvcGFja2FnZXMvcHl0aG9u LnNjbQ0KQEAgLTMwMjksMjQgKzMwMjksNiBAQCBzb3VyY2VzLiIpDQogICAgICAgKHByb3BhZ2F0 ZWQtaW5wdXRzIGAoKCJweXRob24yLXB5dHoiICxweXRob24yLXB5dHopDQogICAgICAgICAgICAg ICAgICAgICAgICAsQChwYWNrYWdlLXByb3BhZ2F0ZWQtaW5wdXRzIGJhc2UpKSkpKSkNCiANCi07 OyBUaGlzIGlzIG5lZWRlZCBmb3IgcHl0aG9uLW1hdHBsb3RsaWJAMS40IGFuZCBweXRob24tc2Np cHlAMC4xNiwgYXQgbGVhc3QuDQotOzsgVHJ5IHJlbW92aW5nIHRoaXMgd2hlbiB0aGV5IGFyZSB1 cGRhdGVkLg0KLShkZWZpbmUtcHVibGljIHB5dGhvbi1zcGhpbngtMS4yLjMNCi0gIChwYWNrYWdl IChpbmhlcml0IHB5dGhvbi1zcGhpbngpDQotICAgICAgICAgICAodmVyc2lvbiAiMS4yLjMiKQ0K LSAgICAgICAgICAgKHNvdXJjZSAob3JpZ2luDQotICAgICAgICAgICAgICAgICAgICAgKG1ldGhv ZCB1cmwtZmV0Y2gpDQotICAgICAgICAgICAgICAgICAgICAgKHVyaSAocHlwaS11cmkgIlNwaGlu eCIgdmVyc2lvbikpDQotICAgICAgICAgICAgICAgICAgICAgKHNoYTI1Ng0KLSAgICAgICAgICAg ICAgICAgICAgICAoYmFzZTMyDQotICAgICAgICAgICAgICAgICAgICAgICAiMDExeGl6bTNqbm1m NGN2czVpNmtnZjZjNW5uMDQ2aDc5aThqMHZkMGYyN3l3OWozcDR3bCIpKSkpDQotICAgICAgICAg ICA7OyBYWFg6ICInTm9uZVR5cGUnIG9iamVjdCBoYXMgbm8gYXR0cmlidXRlICdzcGxpdCciLg0K LSAgICAgICAgICAgKGFyZ3VtZW50cyAnKCM6dGVzdHM/ICNmKSkpKQ0KLQ0KLShkZWZpbmUtcHVi bGljIHB5dGhvbjItc3BoaW54LTEuMi4zDQotICAocGFja2FnZSAoaW5oZXJpdCAocGFja2FnZS13 aXRoLXB5dGhvbjINCi0gICAgICAgICAgICAgICAgICAgICAoc3RyaXAtcHl0aG9uMi12YXJpYW50 IHB5dGhvbi1zcGhpbngtMS4yLjMpKSkpKQ0KLQ0KIChkZWZpbmUtcHVibGljIHB5dGhvbi1zcGhp bngtcnRkLXRoZW1lDQogICAocGFja2FnZQ0KICAgICAobmFtZSAicHl0aG9uLXNwaGlueC1ydGQt dGhlbWUiKQ0KLS0gDQoyLjExLjENCg0K ----Next_Part(Mon_Feb_27_10_54_36_2017_047)---- From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH] Update scipy stack. Resent-From: Ben Woodcroft Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Feb 2017 10:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Thomas Danckaert , mbakke@fastmail.com, 25834@debbugs.gnu.org Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148819160014244 (code B ref 25834); Mon, 27 Feb 2017 10:34:01 +0000 Received: (at 25834) by debbugs.gnu.org; 27 Feb 2017 10:33:20 +0000 Received: from localhost ([127.0.0.1]:57539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ciIcK-0003hf-Ee for submit@debbugs.gnu.org; Mon, 27 Feb 2017 05:33:20 -0500 Received: from mailhub2.soe.uq.edu.au ([130.102.132.209]:56388 helo=newmailhub.uq.edu.au) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ciIcI-0003hV-2b for 25834@debbugs.gnu.org; Mon, 27 Feb 2017 05:33:19 -0500 Received: from smtp1.soe.uq.edu.au (smtp1.soe.uq.edu.au [10.138.113.40]) by newmailhub.uq.edu.au (8.14.5/8.14.5) with ESMTP id v1RAX9aL002762; Mon, 27 Feb 2017 20:33:10 +1000 Received: from [192.168.1.105] (static.customers.nuskope.com.au [103.25.181.216] (may be forged)) (authenticated bits=0) by smtp1.soe.uq.edu.au (8.14.5/8.14.5) with ESMTP id v1RAX7g6005558 (version=TLSv1.2 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 27 Feb 2017 20:33:09 +1000 References: <87wpchghx6.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <20170224.112130.1260506633380136109.post@thomasdanckaert.be> <878tovhnvo.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <20170227.105436.886364398192522191.post@thomasdanckaert.be> From: Ben Woodcroft Message-ID: Date: Mon, 27 Feb 2017 20:33:07 +1000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <20170227.105436.886364398192522191.post@thomasdanckaert.be> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-UQ-FilterTime: 1488191595 X-Scanned-By: MIMEDefang 2.73 on UQ Mailhub X-Spam-Score: -2.3 (--) 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.3 (--) Hi Thomas. On 27/02/17 19:54, Thomas Danckaert wrote: [..] >>> + (source >>> + (origin >>> + (method url-fetch) >>> + (uri (string-append >>> + "https://pypi.python.org/packages/ec/9c/" >>> + "368086faa9c016efce5da3e0e13ba392c9db79e3ab740b763fe28620b18b/" >>> + "backports.shutil_get_terminal_size-" version >>> ".tar.gz")) >> >> Is it possible to use 'pypi-uri' here? > > I couldn't find a working pypi-uri, having tried all sorts of > combinations of “backports.shutil-get-terminal-size” or > “backports-shutil-get-terminal-size” (is there some sort of trick to > find these? These simple urls are never listed on pypi, is my > impression.). I managed to get it downloading something with (uri (pypi-uri "backports.shutil_get_terminal_size" version)) which I ascertained by looking at the "name" in setup.py at https://github.com/chrippa/backports.shutil_get_terminal_size/blob/master/setup.py ben From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 27 06:24:33 2017 Received: (at control) by debbugs.gnu.org; 27 Feb 2017 11:24:33 +0000 Received: from localhost ([127.0.0.1]:57571 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ciJPt-0004sE-Eh for submit@debbugs.gnu.org; Mon, 27 Feb 2017 06:24:33 -0500 Received: from s01.spamexperts.axc.nl ([185.182.56.9]:40948) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ciJPr-0004s0-S4 for control@debbugs.gnu.org; Mon, 27 Feb 2017 06:24:32 -0500 Received: from vserver42.axc.nl ([159.253.0.80]) by s01.spamexperts.axc.nl with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86) (envelope-from ) id 1ciJPj-0006Zr-Qf for control@debbugs.gnu.org; Mon, 27 Feb 2017 12:24:24 +0100 Received: from mail.axc.nl ([159.253.0.157]:55198) by vserver42.axc.nl with esmtp (Exim 4.87) (envelope-from ) id 1ciJPh-0005Xi-Bg for control@debbugs.gnu.org; Mon, 27 Feb 2017 12:24:21 +0100 Date: Mon, 27 Feb 2017 12:24:16 +0100 (CET) Message-Id: <20170227.122416.2251493955201523004.post@thomasdanckaert.be> To: control@debbugs.gnu.org Subject: control message for bug #25705 From: Thomas Danckaert X-Mailer: Mew version 6.7 on Emacs 25.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit PrimaryMX: Accepted email from trusted host. Hint: This skips spam scanning so make sure other host is not vulnerable X-Relay-Host: 159.253.0.157 X-Spam-Score: 0.0 (/) X-Spam-Report: Spam detection software, running on the system "vserver42.axc.nl", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: merge 25705 25834 [...] Content analysis details: (0.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- SpamTally: Final spam score: 0 X-Originating-IP: 159.253.0.80 X-SpamExperts-Domain: vserver42.axc.nl X-SpamExperts-Username: 159.253.0.80 Authentication-Results: spamexperts.axc.nl; auth=pass smtp.auth=159.253.0.80@vserver42.axc.nl X-SpamExperts-Outgoing-Class: unsure X-SpamExperts-Outgoing-Evidence: Combined (0.31) X-Recommended-Action: accept X-Filter-ID: s0sct1PQhAABKnZB5plbIaExX4b9HB97Y0LqBeziPXa8B5kabb+8+DRlCqSxA333/bPom7IVowNb jNmNSGjlJADpxEq2QWue0NVTi1XPmXej1KRrf1Y8eevl1lZRQAkHO76XSTAwtV4mg4i2ouCDa4AU hvIWAV5xUW/+gAh4vXoGDYT1OayXjztnumJVsC/qRcOb18WfxGyg6Om6u4YYm9fiFNg0JhTL3CRm guGzrH/EJmXb7Ar/H99E7t+JzjZEexI6JliONwAnIAZqFP/xQOWBOXp8nHKe0R+FkIqN7hkbx4Px vydb/x32mhLBChw5NNMPtXItjLG4t9x0O63zbyLpQCk9LN96ieg5guM8uFge9Gory97ytKcl8m2v CNJ8q16AUQgygDMMJTOfrbMny/gaP9eL/rK2mdwKhexyKezJ+LDk+6c65WNHYJFrd5FIBZ6++Dfk TVlBWsR5QGkluYsktHOcNcA7Yit+vIPIFAQmEqN5fXoI0ArDZbumk3L6kihXO2fRb8rpv65HbpOd qmjDv/9lZWhS1i8CvLmhSHJulq+YCc1Jf9I1b2AZYErcjxqVInDtyLKdhpFYlh+5iwrwZePlKAja dVACXd5CVMStI4g+l6rCWbY0MZcgnbHscInbHxcQ7Yqf+SyeuX7VEg4xvSXNEuNAac1x4Dq+Rw53 tTSEPxEA3yRT06Mac5g1Hl+n4wJpi0aO64WmIrQSsoiOiAWzgWYfW4v6sNykXCUhQhivpDmZttuJ xBIdw0/3PmQkm/R/q0s7MghuhwYFI56Ved3VppztrPyX5TKCha+1mMuA/L16wvroWbJZP5LJMS+4 ayUpOtEhdxekWDmK9g== X-Report-Abuse-To: spam@s01.spamexperts.axc.nl X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control 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 (/) merge 25705 25834 From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH] Update scipy stack. Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2017 14:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: b.woodcroft@uq.edu.au Cc: mbakke@fastmail.com, 25834@debbugs.gnu.org Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148846407718483 (code B ref 25834); Thu, 02 Mar 2017 14:15:02 +0000 Received: (at 25834) by debbugs.gnu.org; 2 Mar 2017 14:14:37 +0000 Received: from localhost ([127.0.0.1]:35555 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjRUv-0004ns-Pm for submit@debbugs.gnu.org; Thu, 02 Mar 2017 09:14:36 -0500 Received: from s02-out.spamexperts.axc.nl ([185.175.200.125]:39071) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjRUr-0004nc-0B for 25834@debbugs.gnu.org; Thu, 02 Mar 2017 09:14:24 -0500 Received: from vserver42.axc.nl ([185.182.56.92]) by s02.spamexperts.axc.nl with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86) (envelope-from ) id 1cjRUb-0002qx-PB; Thu, 02 Mar 2017 15:14:09 +0100 Received: from mail.axc.nl ([159.253.0.157]:59627) by vserver42.axc.nl with esmtp (Exim 4.88) (envelope-from ) id 1cjRUM-0004FN-P2; Thu, 02 Mar 2017 15:14:03 +0100 Date: Thu, 02 Mar 2017 15:13:43 +0100 (CET) Message-Id: <20170302.151343.231642285456771916.post@thomasdanckaert.be> From: Thomas Danckaert In-Reply-To: References: <878tovhnvo.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <20170227.105436.886364398192522191.post@thomasdanckaert.be> X-Mailer: Mew version 6.7 on Emacs 25.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="--Next_Part(Thu_Mar__2_15_13_43_2017_513)--" Content-Transfer-Encoding: 7bit PrimaryMX: Accepted email from trusted host. Hint: This skips spam scanning so make sure other host is not vulnerable X-Relay-Host: 159.253.0.157 X-Spam-Score: 0.0 (/) X-Spam-Report: Spam detection software, running on the system "vserver42.axc.nl", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Ben Woodcroft Subject: Re: bug#25834: [PATCH] Update scipy stack. Date: Mon, 27 Feb 2017 20:33:07 +1000 > I managed to get it downloading something with > > (uri (pypi-uri "backports.shutil_get_terminal_size" version)) > > which I ascertained by looking at the "name" in setup.py at > https://github.com/chrippa/backports.shutil_get_terminal_size/blob/master/setup.py [...] Content analysis details: (0.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: matplotlib.org] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [159.253.0.157 listed in list.dnswl.org] SpamTally: Final spam score: 0 X-Originating-IP: 185.182.56.92 X-SpamExperts-Domain: vserver42.axc.nl X-SpamExperts-Username: 185.182.56.92 Authentication-Results: spamexperts.axc.nl; auth=pass smtp.auth=185.182.56.92@vserver42.axc.nl X-SpamExperts-Outgoing-Class: ham X-SpamExperts-Outgoing-Evidence: Combined (0.02) X-Recommended-Action: accept X-Filter-ID: s0sct1PQhAABKnZB5plbIaExX4b9HB97Y0LqBeziPXa8B5kabb+8+DRlCqSxA333/bPom7IVowNb jNmNSGjlJADpxEq2QWue0NVTi1XPmXej1KRrf1Y8eevl1lZRQAkHO76XSTAwtV4mg4i2ouCDa4AU hvIWAV5xUW/+gAh4vXqJjmQZwAOMqkrWJ3RS0TQURcOb18WfxGyg6Om6u4YYmyVbEH6BxGc3Nb1N HigXF+gvPRYKza70yK2TxRJHcdD+oEAP/to+02F3J4r01qcN199fxN2oReTDHAyOynaY0Cldue3r +qEeQYBWND7fDPGoUqYOv6lKxxeboK+YPP3g5J9Wyy39ARVu6lpph/EphEmSUaqSECP9/MJNMfS9 WPFvnoS2AVj6//SToZgb1mT9yJPbuCRWt1gvz81k1WgbKaeaAhK2Zy195toe7JJ6SP71qYdnvHq7 0Gt3yliK1PJv4ihw/xEAT0TmN6Xf2ky74vtdIKbCJNtVZL0IROty0Gn0Oopr/l7l54YU9J9+GDrb VP6n8M623VdP93tp3HtvPT2BdUwIZ37qzNHDyPk7IofFAW/kzbGRlYSWsLyTjV7KYcYtZj4yAdjF 9G0q24CyPWX74O4hBSz/kkmPgL+fgIguTLnDg25Yq/V2HQVXMpEq4BJQRAvgsPllzlYB8cGHkSwD 1VSurm6yjTKY7ZEDPpg5waGUyA5CmLl1Ll2znDOjcxrWAIelWHnp3fin48MfrBCIRzdhwJQMGXc4 ZXrllBQu5DRi3qwFd6N8kmWI9iv52ZcrRv5heDyV1U84B7Masg2dAw2MYAD+zya7kLPM8IC1QrG1 0iyZQ1fJe8xQ20vWZgzzYphcTQl7+Q8pUuNt/pLenjhZwkR0rgWtoe7aTWyuwvSc8mRbyBIlTxwv ohUNkg== X-Report-Abuse-To: spam@s01.spamexperts.axc.nl X-Spam-Score: -0.0 (/) 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 (/) ----Next_Part(Thu_Mar__2_15_13_43_2017_513)-- Content-Type: Text/Plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit From: Ben Woodcroft Subject: Re: bug#25834: [PATCH] Update scipy stack. Date: Mon, 27 Feb 2017 20:33:07 +1000 > I managed to get it downloading something with > > (uri (pypi-uri "backports.shutil_get_terminal_size" version)) > > which I ascertained by looking at the "name" in setup.py at > https://github.com/chrippa/backports.shutil_get_terminal_size/blob/master/setup.py Thanks (again), Ben. I've attached an updated patch series (rebased on current python-tests branch). Thomas ----Next_Part(Thu_Mar__2_15_13_43_2017_513)-- Content-Type: Text/X-Patch; charset=utf-8 Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="numpy-updates.patch" RnJvbSBiMWRhMzQwMGRkZWEyZjY5MjFlNjU5NTMxMDJiZGU1YzQ1NDEyODdlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQ0KRnJvbTogVGhvbWFzIERhbmNrYWVydCA8cG9zdEB0aG9tYXNkYW5ja2Fl cnQuYmU+DQpEYXRlOiBUdWUsIDIxIEZlYiAyMDE3IDEzOjMzOjIwICswMTAwDQpTdWJqZWN0OiBb UEFUQ0ggMS84XSBnbnU6IEFkZCBweXRob24yLWJhY2twb3J0cy1zaHV0aWwtZ2V0LXRlcm1pbmFs LXNpemUuDQoNCiogZ251L3BhY2thZ2VzL3B5dGhvbi5zY20gKHB5dGhvbjItYmFja3BvcnRzLXNo dXRpbC1nZXQtdGVybWluYWwtc2l6ZSk6IE5ldw0KICB2YXJpYWJsZS4NCi0tLQ0KIGdudS9wYWNr YWdlcy9weXRob24uc2NtIHwgMjYgKysrKysrKysrKysrKysrKysrKysrKysrKy0NCiAxIGZpbGUg Y2hhbmdlZCwgMjUgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQ0KDQpkaWZmIC0tZ2l0IGEv Z251L3BhY2thZ2VzL3B5dGhvbi5zY20gYi9nbnUvcGFja2FnZXMvcHl0aG9uLnNjbQ0KaW5kZXgg YThiYTFiOGM3Li4wM2E5ZGU1NzYgMTAwNjQ0DQotLS0gYS9nbnUvcGFja2FnZXMvcHl0aG9uLnNj bQ0KKysrIGIvZ251L3BhY2thZ2VzL3B5dGhvbi5zY20NCkBAIC0zMyw3ICszMyw3IEBADQogOzs7 IENvcHlyaWdodCDCqSAyMDE2IEFydW4gSXNhYWMgPGFydW5pc2FhY0BzeXN0ZW1yZWJvb3QubmV0 Pg0KIDs7OyBDb3B5cmlnaHQgwqkgMjAxNiwgMjAxNyBKdWxpZW4gTGVwaWxsZXIgPGp1bGllbkBs ZXBpbGxlci5ldT4NCiA7OzsgQ29weXJpZ2h0IMKpIDIwMTYsIDIwMTcgVG9iaWFzIEdlZXJpbmNr eC1SaWNlIDxtZUB0b2JpYXMuZ3I+DQotOzs7IENvcHlyaWdodCDCqSAyMDE2IFRob21hcyBEYW5j a2FlcnQgPHBvc3RAdGhvbWFzZGFuY2thZXJ0LmJlPg0KKzs7OyBDb3B5cmlnaHQgwqkgMjAxNiwg MjAxNyBUaG9tYXMgRGFuY2thZXJ0IDxwb3N0QHRob21hc2RhbmNrYWVydC5iZT4NCiA7OzsgQ29w eXJpZ2h0IMKpIDIwMTcgQ2FybG8gWmFuY2FuYXJvIDxjYXJsb0B6YW5jYW5hcm8uaWQuYXU+DQog Ozs7IENvcHlyaWdodCDCqSAyMDE3IEZyZWRlcmljayBNLiBNdXJpaXRoaSA8ZnJlZG1hbmdsaXNA Z21haWwuY29tPg0KIDs7Ow0KQEAgLTYwMjQsNiArNjAyNCwzMCBAQCBjb25uZWN0aW9uIHRvIGVh Y2ggdXNlci4iKQ0KIChkZWZpbmUtcHVibGljIHB5dGhvbjItYmFja3BvcnRzLWFiYw0KICAgKHBh Y2thZ2Utd2l0aC1weXRob24yIHB5dGhvbi1iYWNrcG9ydHMtYWJjKSkNCiANCisoZGVmaW5lLXB1 YmxpYyBweXRob24yLWJhY2twb3J0cy1zaHV0aWwtZ2V0LXRlcm1pbmFsLXNpemUNCisgIChwYWNr YWdlDQorICAgIChuYW1lICJweXRob24yLWJhY2twb3J0cy1zaHV0aWwtZ2V0LXRlcm1pbmFsLXNp emUiKQ0KKyAgICAodmVyc2lvbiAiMS4wLjAiKQ0KKyAgICAoc291cmNlDQorICAgICAob3JpZ2lu DQorICAgICAgIChtZXRob2QgdXJsLWZldGNoKQ0KKyAgICAgICAodXJpIChweXBpLXVyaSAiYmFj a3BvcnRzLnNodXRpbF9nZXRfdGVybWluYWxfc2l6ZSIgdmVyc2lvbikpDQorICAgICAgIChzaGEy NTYNCisgICAgICAgIChiYXNlMzINCisgICAgICAgICAiMTA3Y21uN2czam5ia3A4MjZ6bGo4cnJq MTlmYW0zMDFxdmFxZjBmMzkwNWY1MjE3bGdraSIpKSkpDQorICAgIChidWlsZC1zeXN0ZW0gcHl0 aG9uLWJ1aWxkLXN5c3RlbSkNCisgICAgKGFyZ3VtZW50cw0KKyAgICAgYCgjOnB5dGhvbiAscHl0 aG9uLTIpKQ0KKyAgICAoaG9tZS1wYWdlDQorICAgICAiaHR0cHM6Ly9naXRodWIuY29tL2Nocmlw cGEvYmFja3BvcnRzLnNodXRpbF9nZXRfdGVybWluYWxfc2l6ZSIpDQorICAgIChzeW5vcHNpcw0K KyAgICAgICJCYWNrcG9ydCBvZiBQeXRob24gMy4zJ3Mgc2h1dGlsLmdldF90ZXJtaW5hbF9zaXpl IikNCisgICAgKGRlc2NyaXB0aW9uDQorICAgICAiQSBiYWNrcG9ydCBvZiB0aGUgQGNvZGV7Z2V0 X3Rlcm1pbmFsX3NpemUgZnVuY3Rpb259IGZyb20gUHl0aG9uIDMuMydzIEBjb2Rle3NodXRpbH0u DQorVW5saWtlIHRoZSBvcmlnaW5hbCB2ZXJzaW9uIGl0IGlzIHdyaXR0ZW4gaW4gcHVyZSBQeXRo b24gcmF0aGVyIHRoYW4gQywgc28gaXQNCittaWdodCBiZSBhIHRpbnkgYml0IHNsb3dlci4iKQ0K KyAgICAobGljZW5zZSBsaWNlbnNlOmV4cGF0KSkpDQorDQogKGRlZmluZS1wdWJsaWMgcHl0aG9u LXdhZg0KICAgKHBhY2thZ2UNCiAgICAgKG5hbWUgInB5dGhvbi13YWYiKQ0KLS0gDQoyLjExLjEN Cg0KDQpGcm9tIDVkZTU2YmFkNzU2ZDgxNmUyODY3OTdiMzk5ZjM0NDJiOWViNjhmMjEgTW9uIFNl cCAxNyAwMDowMDowMCAyMDAxDQpGcm9tOiBUaG9tYXMgRGFuY2thZXJ0IDxwb3N0QHRob21hc2Rh bmNrYWVydC5iZT4NCkRhdGU6IFR1ZSwgMjEgRmViIDIwMTcgMjE6MzM6MDIgKzAxMDANClN1Ympl Y3Q6IFtQQVRDSCAyLzhdIGdudTogQWRkIHB5dGhvbi1jb2xvcnNwYWNpb3VzLg0KDQoqIGdudS9w YWNrYWdlcy9weXRob24uc2NtIChweXRob24tY29sb3JzcGFjaW91cywgcHl0aG9uMi1jb2xvcnNw YWNpb3VzKTogTmV3DQogIHZhcmlhYmxlcy4NCi0tLQ0KIGdudS9wYWNrYWdlcy9weXRob24uc2Nt IHwgMjUgKysrKysrKysrKysrKysrKysrKysrKysrKw0KIDEgZmlsZSBjaGFuZ2VkLCAyNSBpbnNl cnRpb25zKCspDQoNCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvcHl0aG9uLnNjbSBiL2dudS9w YWNrYWdlcy9weXRob24uc2NtDQppbmRleCAwM2E5ZGU1NzYuLmM0NDljY2I2ZSAxMDA2NDQNCi0t LSBhL2dudS9wYWNrYWdlcy9weXRob24uc2NtDQorKysgYi9nbnUvcGFja2FnZXMvcHl0aG9uLnNj bQ0KQEAgLTM3NjMsNiArMzc2MywzMSBAQCBUbyBhZGRyZXNzIHRoaXMgYW5kIGVuYWJsZSBlYXN5 IGN5Y2xpbmcgb3ZlciBhcmJpdHJhcnkgQGNvZGV7a3dhcmdzfSwgdGhlDQogKGRlZmluZS1wdWJs aWMgcHl0aG9uMi1jeWNsZXINCiAgIChwYWNrYWdlLXdpdGgtcHl0aG9uMiBweXRob24tY3ljbGVy KSkNCiANCisoZGVmaW5lLXB1YmxpYyBweXRob24tY29sb3JzcGFjaW91cw0KKyAgKHBhY2thZ2UN CisgIChuYW1lICJweXRob24tY29sb3JzcGFjaW91cyIpDQorICAodmVyc2lvbiAiMS4xLjAiKQ0K KyAgKHNvdXJjZQ0KKyAgICAob3JpZ2luDQorICAgICAgKG1ldGhvZCB1cmwtZmV0Y2gpDQorICAg ICAgKHVyaSAoc3RyaW5nLWFwcGVuZA0KKyAgICAgICAgICAgICJodHRwczovL2dpdGh1Yi5jb20v bmpzbWl0aC9jb2xvcnNwYWNpb3VzL2FyY2hpdmUvdiINCisgICAgICAgICAgICB2ZXJzaW9uICIu dGFyLmd6IikpDQorICAgICAgKGZpbGUtbmFtZSAoc3RyaW5nLWFwcGVuZCBuYW1lICItIiB2ZXJz aW9uKSkNCisgICAgICAoc2hhMjU2DQorICAgICAgIChiYXNlMzIgIjF2ZmxoNWptMzJxYjBza3ph Mmk4cGphY3YwOXc2Z3E4NGZxcHAybmo3N3MwcmJtemdyNGsiKSkpKQ0KKyAgKGJ1aWxkLXN5c3Rl bSBweXRob24tYnVpbGQtc3lzdGVtKQ0KKyAgKHByb3BhZ2F0ZWQtaW5wdXRzDQorICAgYCgoInB5 dGhvbi1udW1weSIgLHB5dGhvbi1udW1weSkpKQ0KKyAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9naXRo dWIuY29tL25qc21pdGgvY29sb3JzcGFjaW91cyIpDQorICAoc3lub3BzaXMgIlB5dGhvbiBsaWJy YXJ5IGZvciBjb2xvcnNwYWNlIGNvbnZlcnNpb25zIikNCisgIChkZXNjcmlwdGlvbiAiQ29sb3Jz cGFjaW91cyBpcyBhIFB5dGhvbiBsaWJyYXJ5IHRoYXQgbGV0cyB5b3UgZWFzaWx5IGNvbnZlcnQN CitiZXR3ZWVuIGNvbG9yc3BhY2VzIGxpa2Ugc1JHQiwgWFlaLCBDSUVMKmEqYiosIENJRUNBTTAy LCBDQU0wMi1VQ1MsIGV0Yy4iKQ0KKyAgKGxpY2Vuc2UgbGljZW5zZTpleHBhdCkpKQ0KKw0KKyhk ZWZpbmUtcHVibGljIHB5dGhvbjItY29sb3JzcGFjaW91cw0KKyAgKHBhY2thZ2Utd2l0aC1weXRo b24yIHB5dGhvbi1jb2xvcnNwYWNpb3VzKSkNCisNCiAoZGVmaW5lLXB1YmxpYyBweXRob24tbWF0 cGxvdGxpYg0KICAgKHBhY2thZ2UNCiAgICAgKG5hbWUgInB5dGhvbi1tYXRwbG90bGliIikNCi0t IA0KMi4xMS4xDQoNCg0KRnJvbSBiNzNlMjZjZTEyZGMyZmQwYjM4OTM3YmM2MTVmNTA3MTU1NmRm ZDVhIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQ0KRnJvbTogVGhvbWFzIERhbmNrYWVydCA8cG9z dEB0aG9tYXNkYW5ja2FlcnQuYmU+DQpEYXRlOiBUdWUsIDIxIEZlYiAyMDE3IDIwOjI4OjI3ICsw MTAwDQpTdWJqZWN0OiBbUEFUQ0ggMy84XSBnbnU6IHB5dGhvbi1udW1weTogVXBkYXRlIHRvIDEu MTIuMC4NCg0KKiBnbnUvcGFja2FnZXMvcHl0aG9uLnNjbSAocHl0aG9uLW51bXB5KTogVXBkYXRl IHRvIDEuMTIuMC4NCiAgW3NvdXJjZV06IFVzZSBnaXRodWIgaW5zdGVhZCBvZiBzb3VyY2Vmb3Jn ZS4NCiAgW25hdGl2ZS1pbnB1dHNdOiBBZGQgcHl0aG9uLWN5dGhvbi4NCg0KICBUbyBzaW1wbGlm eSB0aGUgaGFuZGxpbmcgb2YgZGVwZW5kZW5jeSBjeWNsZXMgKG51bXB5IGRvY3VtZW50YXRpb24g ZGVwZW5kcw0KICBvbiBtYXRwbG90bGliLCB3aGljaCBkZXBlbmRzIG9uIG51bXB5KSwgd2Ugc3Bs aXQgb3V0IHRoZSBkb2N1bWVudGF0aW9uIGludG8NCiAgYSBzZXBhcmF0ZSBwYWNrYWdlOg0KICAo cHl0aG9uLW51bXB5LWJvb3RzdHJhcCwgcHl0aG9uMi1udW1weS1ib290c3RyYXApOiBSZW1vdmUg dmFyaWFibGVzLg0KICAocHl0aG9uLW51bXB5LWRvY3VtZW50YXRpb24sIHB5dGhvbjItbnVtcHkt ZG9jdW1lbnRhdGlvbik6IE5ldyB2YXJpYWJsZXMuDQotLS0NCiBnbnUvcGFja2FnZXMvcHl0aG9u LnNjbSB8IDE0OCArKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0t LS0NCiAxIGZpbGUgY2hhbmdlZCwgODIgaW5zZXJ0aW9ucygrKSwgNjYgZGVsZXRpb25zKC0pDQoN CmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvcHl0aG9uLnNjbSBiL2dudS9wYWNrYWdlcy9weXRo b24uc2NtDQppbmRleCBjNDQ5Y2NiNmUuLmQyOTZlZTFkOSAxMDA2NDQNCi0tLSBhL2dudS9wYWNr YWdlcy9weXRob24uc2NtDQorKysgYi9nbnUvcGFja2FnZXMvcHl0aG9uLnNjbQ0KQEAgLTM0MDIs MjQgKzM0MDIsMjYgQEAgYmV0d2VlbiBsYW5ndWFnZSBzcGVjaWZpY2F0aW9uIGFuZCBpbXBsZW1l bnRhdGlvbiBhc3BlY3RzLiIpDQogDQogOzsgVGhpcyB2ZXJzaW9uIG9mIG51bXB5IGlzIG1pc3Np bmcgdGhlIGRvY3VtZW50YXRpb24gYW5kIGlzIG9ubHkgdXNlZCB0bw0KIDs7IGJ1aWxkIG1hdHBs b3RsaWIgd2hpY2ggaXMgcmVxdWlyZWQgdG8gYnVpbGQgbnVtcHkncyBkb2N1bWVudGF0aW9uLg0K LShkZWZpbmUgcHl0aG9uLW51bXB5LWJvb3RzdHJhcA0KKyhkZWZpbmUtcHVibGljIHB5dGhvbi1u dW1weQ0KICAgKHBhY2thZ2UNCi0gICAgKG5hbWUgInB5dGhvbi1udW1weS1ib290c3RyYXAiKQ0K LSAgICAodmVyc2lvbiAiMS4xMC40IikNCisgICAgKG5hbWUgInB5dGhvbi1udW1weSIpDQorICAg ICh2ZXJzaW9uICIxLjEyLjAiKQ0KICAgICAoc291cmNlDQogICAgICAob3JpZ2luDQogICAgICAg IChtZXRob2QgdXJsLWZldGNoKQ0KLSAgICAgICAodXJpIChzdHJpbmctYXBwZW5kICJtaXJyb3I6 Ly9zb3VyY2Vmb3JnZS9udW1weS9OdW1QeS8iIHZlcnNpb24NCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAiL251bXB5LSIgdmVyc2lvbiAiLnRhci5neiIpKQ0KKyAgICAgICAodXJpIChzdHJp bmctYXBwZW5kDQorICAgICAgICAgICAgICJodHRwczovL2dpdGh1Yi5jb20vbnVtcHkvbnVtcHkv YXJjaGl2ZS92IiB2ZXJzaW9uICIudGFyLmd6IikpDQorICAgICAgIChmaWxlLW5hbWUgKHN0cmlu Zy1hcHBlbmQgbmFtZSAiLSIgdmVyc2lvbiAiLnRhci5neiIpKQ0KICAgICAgICAoc2hhMjU2DQog ICAgICAgICAoYmFzZTMyDQotICAgICAgICAgIjFiampodm5jcmFrYTVzNmk0bGc2NDRqcnhpajZi dnljeHk3YW4yMGdjejNhMG0xMWl5Z3AiKSkpKQ0KKyAgICAgICAgICIwMjVkNGo0YWFrY3A4dzVp NWRpcWg4MTJjYmJqZ2FjN2pzengxajU2aXZyYmkxaTh2djdkIikpKSkNCiAgICAgKGJ1aWxkLXN5 c3RlbSBweXRob24tYnVpbGQtc3lzdGVtKQ0KICAgICAoaW5wdXRzDQogICAgICBgKCgib3BlbmJs YXMiICxvcGVuYmxhcykNCiAgICAgICAgKCJsYXBhY2siICxsYXBhY2spKSkNCiAgICAgKG5hdGl2 ZS1pbnB1dHMNCi0gICAgIGAoKCJweXRob24tbm9zZSIgLHB5dGhvbi1ub3NlKQ0KKyAgICAgYCgo InB5dGhvbi1jeXRob24iICxweXRob24tY3l0aG9uKQ0KKyAgICAgICAoInB5dGhvbi1ub3NlIiAs cHl0aG9uLW5vc2UpDQogICAgICAgICgiZ2ZvcnRyYW4iICxnZm9ydHJhbikpKQ0KICAgICAoYXJn dW1lbnRzDQogICAgICBgKCM6cGhhc2VzDQpAQCAtMzQ2OCw4ICszNDcwLDggQEAgYW5kIEZvcnRy YW4gY29kZSwgdXNlZnVsIGxpbmVhciBhbGdlYnJhLCBGb3VyaWVyIHRyYW5zZm9ybSwgYW5kIHJh bmRvbSBudW1iZXINCiBjYXBhYmlsaXRpZXMuIikNCiAgICAgKGxpY2Vuc2UgbGljZW5zZTpic2Qt MykpKQ0KIA0KLShkZWZpbmUgcHl0aG9uMi1udW1weS1ib290c3RyYXANCi0gIChwYWNrYWdlLXdp dGgtcHl0aG9uMiBweXRob24tbnVtcHktYm9vdHN0cmFwKSkNCisoZGVmaW5lLXB1YmxpYyBweXRo b24yLW51bXB5DQorICAocGFja2FnZS13aXRoLXB5dGhvbjIgcHl0aG9uLW51bXB5KSkNCiANCiAo ZGVmaW5lLXB1YmxpYyBweXRob24tbXVuY2gNCiAgIChwYWNrYWdlDQpAQCAtMzUyNiw2OSArMzUy OCw4MyBAQCBNb2RlbHMsIGlzIGEgcHJvZ3JhbSBmb3IgcGVyZm9ybWluZyBib3RoIHNpbmdsZS1T TlAgYW5kIFNOUC1zZXQgZ2Vub21lLXdpZGUNCiBhc3NvY2lhdGlvbiBzdHVkaWVzIChHV0FTKSBv biBleHRyZW1lbHkgbGFyZ2UgZGF0YSBzZXRzLiIpDQogICAgIChsaWNlbnNlIGxpY2Vuc2U6YXNs Mi4wKSkpDQogDQotKGRlZmluZS1wdWJsaWMgcHl0aG9uLW51bXB5DQotICAocGFja2FnZSAoaW5o ZXJpdCBweXRob24tbnVtcHktYm9vdHN0cmFwKQ0KLSAgICAobmFtZSAicHl0aG9uLW51bXB5IikN Ci0gICAgKG91dHB1dHMgJygib3V0IiAiZG9jIikpDQotICAgIChpbnB1dHMNCi0gICAgIGAoKCJ3 aGljaCIgLHdoaWNoKQ0KLSAgICAgICAsQChwYWNrYWdlLWlucHV0cyBweXRob24tbnVtcHktYm9v dHN0cmFwKSkpDQotICAgIChwcm9wYWdhdGVkLWlucHV0cw0KLSAgICAgYCgoInB5dGhvbi1tYXRw bG90bGliIiAscHl0aG9uLW1hdHBsb3RsaWIpDQotICAgICAgICgicHl0aG9uLXB5cGFyc2luZyIg LHB5dGhvbi1weXBhcnNpbmcpDQotICAgICAgICxAKHBhY2thZ2UtcHJvcGFnYXRlZC1pbnB1dHMg cHl0aG9uLW51bXB5LWJvb3RzdHJhcCkpKQ0KKyhkZWZpbmUtcHVibGljIHB5dGhvbi1udW1weS1k b2N1bWVudGF0aW9uDQorICAocGFja2FnZQ0KKyAgICAobmFtZSAicHl0aG9uLW51bXB5LWRvY3Vt ZW50YXRpb24iKQ0KKyAgICAodmVyc2lvbiAocGFja2FnZS12ZXJzaW9uIHB5dGhvbi1udW1weSkp DQorICAgIChzb3VyY2UgKHBhY2thZ2Utc291cmNlIHB5dGhvbi1udW1weSkpDQorICAgIChidWls ZC1zeXN0ZW0gcHl0aG9uLWJ1aWxkLXN5c3RlbSkNCiAgICAgKG5hdGl2ZS1pbnB1dHMNCi0gICAg IGAoKCJwa2ctY29uZmlnIiAscGtnLWNvbmZpZykNCisgICAgIGAoKCJweXRob24tbWF0cGxvdGxp YiIgLHB5dGhvbi1tYXRwbG90bGliKQ0KKyAgICAgICAoInB5dGhvbi1udW1weSIgLHB5dGhvbi1u dW1weSkNCisgICAgICAgKCJwa2ctY29uZmlnIiAscGtnLWNvbmZpZykNCiAgICAgICAgKCJweXRo b24tc3BoaW54IiAscHl0aG9uLXNwaGlueCkNCiAgICAgICAgKCJweXRob24tbnVtcHlkb2MiICxw eXRob24tbnVtcHlkb2MpDQogICAgICAgICgidGV4bGl2ZSIgLHRleGxpdmUpDQogICAgICAgICgi dGV4aW5mbyIgLHRleGluZm8pDQogICAgICAgICgicGVybCIgLHBlcmwpDQotICAgICAgICxAKHBh Y2thZ2UtbmF0aXZlLWlucHV0cyBweXRob24tbnVtcHktYm9vdHN0cmFwKSkpDQotICAgIChhcmd1 bWVudHMNCi0gICAgIGAoLEAoc3Vic3RpdHV0ZS1rZXl3b3JkLWFyZ3VtZW50cw0KLSAgICAgICAg ICAgICAocGFja2FnZS1hcmd1bWVudHMgcHl0aG9uLW51bXB5LWJvb3RzdHJhcCkNCi0gICAgICAg ICAgICgoIzpwaGFzZXMgcGhhc2VzKQ0KLSAgICAgICAgICAgIGAoYWxpc3QtY29ucy1hZnRlcg0K LSAgICAgICAgICAgICAgJ2luc3RhbGwgJ2luc3RhbGwtZG9jDQotICAgICAgICAgICAgICAobGFt YmRhKiAoIzprZXkgaW5wdXRzIG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQ0KLSAgICAgICAg ICAgICAgICA7OyBNYWtlIGluc3RhbGxlZCBwYWNrYWdlIGF2YWlsYWJsZSBmb3IgYnVpbGRpbmcg dGhlDQotICAgICAgICAgICAgICAgIDs7IGRvY3VtZW50YXRpb24NCi0gICAgICAgICAgICAgICAg KGFkZC1pbnN0YWxsZWQtcHl0aG9ucGF0aCBpbnB1dHMgb3V0cHV0cykNCi0gICAgICAgICAgICAg ICAgKGxldCogKChkYXRhIChzdHJpbmctYXBwZW5kIChhc3NvYy1yZWYgb3V0cHV0cyAiZG9jIikg Ii9zaGFyZSIpKQ0KLSAgICAgICAgICAgICAgICAgICAgICAgKGRvYyAoc3RyaW5nLWFwcGVuZA0K LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGF0YSAiL2RvYy8iICxuYW1lICItIg0KLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgLChwYWNrYWdlLXZlcnNpb24gcHl0aG9uLW51bXB5 LWJvb3RzdHJhcCkpKQ0KLSAgICAgICAgICAgICAgICAgICAgICAgKGluZm8gKHN0cmluZy1hcHBl bmQgZGF0YSAiL2luZm8iKSkNCi0gICAgICAgICAgICAgICAgICAgICAgIChodG1sIChzdHJpbmct YXBwZW5kIGRvYyAiL2h0bWwiKSkNCi0gICAgICAgICAgICAgICAgICAgICAgIChweXZlciAsKHN0 cmluZy1hcHBlbmQgIlBZVkVSPSIpKSkNCi0gICAgICAgICAgICAgICAgICAod2l0aC1kaXJlY3Rv cnktZXhjdXJzaW9uICJkb2MiDQotICAgICAgICAgICAgICAgICAgICAobWtkaXItcCBodG1sKQ0K LSAgICAgICAgICAgICAgICAgICAgKHN5c3RlbSogIm1ha2UiICJodG1sIiBweXZlcikNCi0gICAg ICAgICAgICAgICAgICAgIChzeXN0ZW0qICJtYWtlIiAibGF0ZXgiICJQQVBFUj1hNCIgcHl2ZXIp DQotICAgICAgICAgICAgICAgICAgICAoc3lzdGVtKiAibWFrZSIgIi1DIiAiYnVpbGQvbGF0ZXgi DQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiYWxsLXBkZiIgIlBBUEVSPWE0IiBweXZl cikNCi0gICAgICAgICAgICAgICAgICAgIDs7IEZJWE1FOiBHZW5lcmF0aW9uIG9mIHRoZSBpbmZv IGZpbGUgZmFpbHMuDQotICAgICAgICAgICAgICAgICAgICA7OyAoc3lzdGVtKiAibWFrZSIgImlu Zm8iIHB5dmVyKQ0KLSAgICAgICAgICAgICAgICAgICAgOzsgKG1rZGlyLXAgaW5mbykNCi0gICAg ICAgICAgICAgICAgICAgIDs7IChjb3B5LWZpbGUgImJ1aWxkL3RleGluZm8vbnVtcHkuaW5mbyIN Ci0gICAgICAgICAgICAgICAgICAgIDs7ICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgaW5mbyAi L251bXB5LmluZm8iKSkNCi0gICAgICAgICAgICAgICAgICAgIChmb3ItZWFjaCAobGFtYmRhIChm aWxlKQ0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGNvcHktZmlsZSAoc3RyaW5n LWFwcGVuZCAiYnVpbGQvbGF0ZXgiIGZpbGUpDQotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kIGRvYyBmaWxlKSkpDQotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgJygiL251bXB5LXJlZi5wZGYiICIvbnVtcHktdXNlci5wZGYiKSkN Ci0gICAgICAgICAgICAgICAgICAgICh3aXRoLWRpcmVjdG9yeS1leGN1cnNpb24gImJ1aWxkL2h0 bWwiDQotICAgICAgICAgICAgICAgICAgICAgIChmb3ItZWFjaCAobGFtYmRhIChmaWxlKQ0KLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAobGV0KiAoKGRpciAoZGlybmFtZSBmaWxl KSkNCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICh0Z3QtZGlyIChz dHJpbmctYXBwZW5kIGh0bWwgIi8iIGRpcikpKQ0KLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICh1bmxlc3MgKGVxdWFsPyAiLiIgZGlyKQ0KLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgKG1rZGlyLXAgdGd0LWRpcikpDQotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgKGluc3RhbGwtZmlsZSBmaWxlIGh0bWwpKSkNCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIChmaW5kLWZpbGVzICIuIiAiLioiKSkpKSkpDQotICAgICAg ICAgICAgICAscGhhc2VzKSkpKSkpKQ0KKyAgICAgICAoInNjaXB5LXNwaGlueC10aGVtZSINCisg ICAgICAgICwob3JpZ2luIDsgVGhlIGJ1aWxkIHNjcmlwdCBleHBlY3RzIHNjaXB5LXNwaGlueC10 aGVtZSBhcyBhIGdpdCBzdWJtb2R1bGUNCisgICAgICAgICAgIChtZXRob2QgZ2l0LWZldGNoKQ0K KyAgICAgICAgICAgKHVyaSAoZ2l0LXJlZmVyZW5jZQ0KKyAgICAgICAgICAgICAgICAgKHVybCAi aHR0cHM6Ly9naXRodWIuY29tL3NjaXB5L3NjaXB5LXNwaGlueC10aGVtZS5naXQiKQ0KKyAgICAg ICAgICAgICAgICAgKGNvbW1pdCAiYzQ2Njc2NGUyMiIpKSkNCisgICAgICAgICAgIChzaGEyNTYN CisgICAgICAgICAgICAoYmFzZTMyDQorICAgICAgICAgICAgICAgICIwcTJ5ODdjbHdsc2djN3d2 bHNuOXB6eXNzeWJjcTEwcGx3aHEydzF5ZHlrZnN5eXFibWtsIikpKSkNCisgICAgICAgLEAocGFj a2FnZS1uYXRpdmUtaW5wdXRzIHB5dGhvbi1udW1weSkpKQ0KKyAgICAoYXJndW1lbnRzDQorICAg ICBgKCM6dGVzdHM/ICNmIDsgd2UncmUgb25seSBnZW5lcmF0aW5nIHRoZSBkb2N1bWVudGF0aW9u DQorICAgICAgICM6cGhhc2VzDQorICAgICAgIChtb2RpZnktcGhhc2VzICVzdGFuZGFyZC1waGFz ZXMNCisgICAgICAgICAoZGVsZXRlICdidWlsZCkNCisgICAgICAgICAocmVwbGFjZSAnaW5zdGFs bA0KKyAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyBvdXRwdXRzICM6YWxsb3ctb3Ro ZXIta2V5cykNCisgICAgICAgICAgICAgKGxldCogKChkYXRhIChzdHJpbmctYXBwZW5kIChhc3Nv Yy1yZWYgb3V0cHV0cyAib3V0IikgIi9zaGFyZSIpKQ0KKyAgICAgICAgICAgICAgICAgICAgKGRv YyAoc3RyaW5nLWFwcGVuZA0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgZGF0YSAiL2RvYy8i ICxuYW1lICItIg0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgLChwYWNrYWdlLXZlcnNpb24g cHl0aG9uLW51bXB5KSkpDQorICAgICAgICAgICAgICAgICAgICAoaW5mby1yZWFkZXIgKHN0cmlu Zy1hcHBlbmQgZGF0YSAiL2luZm8iKSkNCisgICAgICAgICAgICAgICAgICAgIChodG1sIChzdHJp bmctYXBwZW5kIGRvYyAiL2h0bWwiKSkNCisgICAgICAgICAgICAgICAgICAgIChzY2lweS1zcGhp bngtdGhlbWUgInNjaXB5LXNwaGlueC10aGVtZSIpDQorICAgICAgICAgICAgICAgICAgICAoc3Bo aW54LXRoZW1lLWNoZWNrb3V0IChhc3NvYy1yZWYgaW5wdXRzIHNjaXB5LXNwaGlueC10aGVtZSkp DQorICAgICAgICAgICAgICAgICAgICAocHl2ZXIgLChzdHJpbmctYXBwZW5kICJQWVZFUj0iKSkp DQorICAgICAgICAgICAgICAgKHdpdGgtZGlyZWN0b3J5LWV4Y3Vyc2lvbiAiZG9jIg0KKyAgICAg ICAgICAgICAgICAgKGNvcHktcmVjdXJzaXZlbHkgc3BoaW54LXRoZW1lLWNoZWNrb3V0IHNjaXB5 LXNwaGlueC10aGVtZSkNCisgICAgICAgICAgICAgICAgIChta2Rpci1wIGh0bWwpDQorICAgICAg ICAgICAgICAgICAoc3lzdGVtKiAibWFrZSIgImh0bWwiIHB5dmVyKQ0KKyAgICAgICAgICAgICAg ICAgKHN5c3RlbSogIm1ha2UiICJsYXRleCIgIlBBUEVSPWE0IiBweXZlcikNCisgICAgICAgICAg ICAgICAgIChzeXN0ZW0qICJtYWtlIiAiLUMiICJidWlsZC9sYXRleCINCisgICAgICAgICAgICAg ICAgICAgICAgICAgICJhbGwtcGRmIiAiUEFQRVI9YTQiIHB5dmVyKQ0KKyAgICAgICAgICAgICAg ICAgOzsgRklYTUU6IEdlbmVyYXRpb24gb2YgdGhlIGluZm8gZmlsZSBmYWlscy4NCisgICAgICAg ICAgICAgICAgIDs7IChzeXN0ZW0qICJtYWtlIiAiaW5mbyIgcHl2ZXIpDQorICAgICAgICAgICAg ICAgICA7OyAobWtkaXItcCBpbmZvKQ0KKyAgICAgICAgICAgICAgICAgOzsgKGNvcHktZmlsZSAi YnVpbGQvdGV4aW5mby9udW1weS5pbmZvIg0KKyAgICAgICAgICAgICAgICAgOzsgICAgICAgICAg ICAoc3RyaW5nLWFwcGVuZCBpbmZvICIvbnVtcHkuaW5mbyIpKQ0KKyAgICAgICAgICAgICAgICAg KGZvci1lYWNoIChsYW1iZGEgKGZpbGUpDQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAo Y29weS1maWxlIChzdHJpbmctYXBwZW5kICJidWlsZC9sYXRleCIgZmlsZSkNCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgZG9jIGZpbGUpKSkN CisgICAgICAgICAgICAgICAgICAgICAgICAgICAnKCIvbnVtcHktcmVmLnBkZiIgIi9udW1weS11 c2VyLnBkZiIpKQ0KKyAgICAgICAgICAgICAgICAgKHdpdGgtZGlyZWN0b3J5LWV4Y3Vyc2lvbiAi YnVpbGQvaHRtbCINCisgICAgICAgICAgICAgICAgICAgKGZvci1lYWNoIChsYW1iZGEgKGZpbGUp DQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChsZXQqICgoZGlyIChkaXJuYW1lIGZp bGUpKQ0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHRndC1kaXIgKHN0 cmluZy1hcHBlbmQgaHRtbCAiLyIgZGlyKSkpDQorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgKHVubGVzcyAoZXF1YWw/ICIuIiBkaXIpDQorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAobWtkaXItcCB0Z3QtZGlyKSkNCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAoaW5zdGFsbC1maWxlIGZpbGUgaHRtbCkpKQ0KKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgKGZpbmQtZmlsZXMgIi4iICIuKiIpKSkpKQ0KKyAgICAgICAgICAgICAjdCkpKSkp DQorICAgIChob21lLXBhZ2UgKHBhY2thZ2UtaG9tZS1wYWdlIHB5dGhvbi1udW1weSkpDQorICAg IChzeW5vcHNpcyAiRG9jdW1lbnRhdGlvbiBmb3IgdGhlIHB5dGhvbi1udW1weSBwYWNrYWdlIikN CisgICAgKGRlc2NyaXB0aW9uIChwYWNrYWdlLWRlc2NyaXB0aW9uIHB5dGhvbi1udW1weSkpDQor ICAgIChsaWNlbnNlIChwYWNrYWdlLWxpY2Vuc2UgcHl0aG9uLW51bXB5KSkpKQ0KIA0KLShkZWZp bmUtcHVibGljIHB5dGhvbjItbnVtcHkNCi0gIChwYWNrYWdlLXdpdGgtcHl0aG9uMiBweXRob24t bnVtcHkpKQ0KKyhkZWZpbmUtcHVibGljIHB5dGhvbjItbnVtcHktZG9jdW1lbnRhdGlvbg0KKyAg KGxldCAoKG51bXB5LWRvY3VtZW50YXRpb24gKHBhY2thZ2Utd2l0aC1weXRob24yIHB5dGhvbi1u dW1weS1kb2N1bWVudGF0aW9uKSkpDQorICAgIChwYWNrYWdlDQorICAgICAgKGluaGVyaXQgbnVt cHktZG9jdW1lbnRhdGlvbikNCisgICAgICAobmF0aXZlLWlucHV0cyBgKCgicHl0aG9uMi1mdW5j dG9vbHMzMiIgLHB5dGhvbjItZnVuY3Rvb2xzMzIpDQorICAgICAgICAgICAgICAgICAgICAgICAs QChwYWNrYWdlLW5hdGl2ZS1pbnB1dHMgbnVtcHktZG9jdW1lbnRhdGlvbikpKSkpKQ0KIA0KIChk ZWZpbmUtcHVibGljIHB5dGhvbi1weWdpdDINCiAgIChwYWNrYWdlDQpAQCAtMzgxMCw3ICszODI2 LDcgQEAgYmV0d2VlbiBjb2xvcnNwYWNlcyBsaWtlIHNSR0IsIFhZWiwgQ0lFTCphKmIqLCBDSUVD QU0wMiwgQ0FNMDItVUNTLCBldGMuIikNCiAgICAgICAgKCJnb2JqZWN0LWludHJvc3BlY3Rpb24i ICxnb2JqZWN0LWludHJvc3BlY3Rpb24pDQogICAgICAgICgicHl0aG9uLXRraW50ZXIiICxweXRo b24gInRrIikNCiAgICAgICAgKCJweXRob24tZGF0ZXV0aWwiICxweXRob24tZGF0ZXV0aWwpDQot ICAgICAgICgicHl0aG9uLW51bXB5IiAscHl0aG9uLW51bXB5LWJvb3RzdHJhcCkNCisgICAgICAg KCJweXRob24tbnVtcHkiICxweXRob24tbnVtcHkpDQogICAgICAgICgicHl0aG9uLXBpbGxvdyIg LHB5dGhvbi1waWxsb3cpDQogICAgICAgICgicHl0aG9uLXB5dHoiICxweXRob24tcHl0eikNCiAg ICAgICAgKCJweXRob24tc2l4IiAscHl0aG9uLXNpeCkNCi0tIA0KMi4xMS4xDQoNCg0KRnJvbSA5 OWJkMWE5YWU0YzdmZDRhZDUyNDM3YzI1YWU0MDcyNjIzNWViNmIwIE1vbiBTZXAgMTcgMDA6MDA6 MDAgMjAwMQ0KRnJvbTogVGhvbWFzIERhbmNrYWVydCA8cG9zdEB0aG9tYXNkYW5ja2FlcnQuYmU+ DQpEYXRlOiBUdWUsIDIxIEZlYiAyMDE3IDIyOjE4OjQ1ICswMTAwDQpTdWJqZWN0OiBbUEFUQ0gg NC84XSBnbnU6IHB5dGhvbi1tYXRwbG90bGliOiBVcGRhdGUgdG8gMi4wLjAuDQoNCiogZ251L3Bh Y2thZ2VzL3B5dGhvbi5zY20gKHB5dGhvbi1tYXRwbG90bGliKTogVXBkYXRlIHRvIDIuMC4wLg0K W3NvdXJjZV06IFJlbW92ZSBUayBiYWNrZW5kIHBhdGNoLCB1c2UgR2l0aHViIGluc3RlYWQgb2Yg U291cmNlZm9yZ2UuDQpbb3V0cHV0c106IFJlbW92ZSAiZG9jIiBvdXRwdXQuDQpbaW5wdXRzXTog QWRkIHB5dGhvbi1weXF0Lg0KW3Byb3BhZ2F0ZWQtaW5wdXRzXTogQWRkIHB5dGhvbi1jeWNsZXIu DQpbbmF0aXZlLWlucHV0c106IFJlbW92ZSBweXRob24tc3BoaW54LCBweXRob24tbnVtcHlkb2Ms IHRleGxpdmUgYW5kIHRleGluZm8uDQoocHl0aG9uLW1hdHBsb3RsaWItZG9jdW1lbnRhdGlvbiwg cHl0aG9uMi1tYXRwbG90bGliLWRvY3VtZW50YXRpb24pOiBOZXcNCnZhcmlhYmxlcy4NCiogZ251 L3BhY2thZ2VzL3BhdGNoZXMvbWF0cGxvdGxpYi1zZXR1cGV4dC10ay5wYXRjaDogRGVsZXRlIGZp bGUuDQoqIGdudS9sb2NhbC5tayAoZGlzdF9wYXRjaF9EQVRBKTogUmVtb3ZlIHBhdGNoLg0KLS0t DQogZ251L2xvY2FsLm1rICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAg MSAtDQogZ251L3BhY2thZ2VzL3BhdGNoZXMvbWF0cGxvdGxpYi1zZXR1cGV4dC10ay5wYXRjaCB8 ICAzNCAtLS0tLS0tDQogZ251L3BhY2thZ2VzL3B5dGhvbi5zY20gICAgICAgICAgICAgICAgICAg ICAgICAgICB8IDExOCArKysrKysrKysrKystLS0tLS0tLS0tDQogMyBmaWxlcyBjaGFuZ2VkLCA2 NyBpbnNlcnRpb25zKCspLCA4NiBkZWxldGlvbnMoLSkNCiBkZWxldGUgbW9kZSAxMDA2NDQgZ251 L3BhY2thZ2VzL3BhdGNoZXMvbWF0cGxvdGxpYi1zZXR1cGV4dC10ay5wYXRjaA0KDQpkaWZmIC0t Z2l0IGEvZ251L2xvY2FsLm1rIGIvZ251L2xvY2FsLm1rDQppbmRleCA5ZDJjZDBhZDIuLjI5Yjk4 MDgyOSAxMDA2NDQNCi0tLSBhL2dudS9sb2NhbC5taw0KKysrIGIvZ251L2xvY2FsLm1rDQpAQCAt NzQ2LDcgKzc0Niw2IEBAIGRpc3RfcGF0Y2hfREFUQSA9CQkJCQkJXA0KICAgJUQlL3BhY2thZ2Vz L3BhdGNoZXMvbWFrZS1pbXB1cmUtZGlycy5wYXRjaAkJCVwNCiAgICVEJS9wYWNrYWdlcy9wYXRj aGVzL21hcnMtaW5zdGFsbC5wYXRjaAkJCVwNCiAgICVEJS9wYWNrYWdlcy9wYXRjaGVzL21hcnMt c2ZtbC0yLjMucGF0Y2gJCQlcDQotICAlRCUvcGFja2FnZXMvcGF0Y2hlcy9tYXRwbG90bGliLXNl dHVwZXh0LXRrLnBhdGNoCQlcDQogICAlRCUvcGFja2FnZXMvcGF0Y2hlcy9tYXhpbWEtZGVmc3lz dGVtLW1rZGlyLnBhdGNoCQlcDQogICAlRCUvcGFja2FnZXMvcGF0Y2hlcy9tY3Jvbi1pbnN0YWxs LnBhdGNoCQkJXA0KICAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvbWNyeXB0LUNWRS0yMDEyLTQ0MDku cGF0Y2gJCQlcDQpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3BhdGNoZXMvbWF0cGxvdGxpYi1z ZXR1cGV4dC10ay5wYXRjaCBiL2dudS9wYWNrYWdlcy9wYXRjaGVzL21hdHBsb3RsaWItc2V0dXBl eHQtdGsucGF0Y2gNCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NA0KaW5kZXggMzdjM2Q2ODZlLi4w MDAwMDAwMDANCi0tLSBhL2dudS9wYWNrYWdlcy9wYXRjaGVzL21hdHBsb3RsaWItc2V0dXBleHQt dGsucGF0Y2gNCisrKyAvZGV2L251bGwNCkBAIC0xLDM0ICswLDAgQEANCi1Vc2UgJ3BrZy1jb25m aWcnIGluc3RlYWQgb2YgaGV1cmlzdGljcyB0byBmaW5kICd0aycgZmxhZ3MuDQotDQotLS0tIG1h dHBsb3RsaWItMS40LjMvc2V0dXBleHQucHkub3JpZwkyMDE1LTEyLTAxIDE0OjIxOjE5LjU1NDQx NzQ1MyArMDEwMA0KLSsrKyBtYXRwbG90bGliLTEuNC4zL3NldHVwZXh0LnB5CTIwMTUtMTItMDIg MTA6Mzk6NDcuMjgyMzYzNTMwICswMTAwDQotQEAgLTE0NTcsNyArMTQ1Nyw3IEBADQotICAgICAg ICAgICAgIHAgPSBzdWJwcm9jZXNzLlBvcGVuKA0KLSAgICAgICAgICAgICAgICAgJy4gJXMgOyBl dmFsIGVjaG8gJHslc30nICUgKGZpbGUsIHZhcm5hbWUpLA0KLSAgICAgICAgICAgICAgICAgc2hl bGw9VHJ1ZSwNCi0tICAgICAgICAgICAgICAgIGV4ZWN1dGFibGU9Ii9iaW4vc2giLA0KLSsgICAg ICAgICAgICAgICAgZXhlY3V0YWJsZT0ic2giLA0KLSAgICAgICAgICAgICAgICAgc3Rkb3V0PXN1 YnByb2Nlc3MuUElQRSkNCi0gICAgICAgICAgICAgcmVzdWx0ID0gcC5jb21tdW5pY2F0ZSgpWzBd DQotICAgICAgICAgICAgIHJldHVybiByZXN1bHQuZGVjb2RlKCdhc2NpaScpDQotQEAgLTE2MDEs OCArMTYwMSwxOSBAQA0KLSAgICAgICAgICAgICAjICAgICAgb2YgZGlzdHJvcy4NCi0gDQotICAg ICAgICAgICAgICMgUXVlcnkgVGNsL1RrIHN5c3RlbSBmb3IgbGlicmFyeSBwYXRocyBhbmQgdmVy c2lvbiBzdHJpbmcNCi0rICAgICAgICAgICAgZGVmIGdldG91dHB1dChzKToNCi0rICAgICAgICAg ICAgICAgIHJldCA9IG9zLnBvcGVuKHMpLnJlYWQoKS5zdHJpcCgpDQotKyAgICAgICAgICAgICAg ICByZXR1cm4gcmV0DQotICAgICAgICAgICAgIHRyeToNCi0tICAgICAgICAgICAgICAgIHRjbF9s aWJfZGlyLCB0a19saWJfZGlyLCB0a192ZXIgPSBzZWxmLnF1ZXJ5X3RjbHRrKCkNCi0rICAgICAg ICAgICAgICAgIHBrZ19jb25maWdfbGlicyA9IGdldG91dHB1dCgncGtnLWNvbmZpZyAtLWxpYnMt b25seS1MIHRrJykuc3BsaXQoKQ0KLSsgICAgICAgICAgICAgICAgIyBkcm9wICctTCcgcGFydCBv ZiBzdHJpbmdzDQotKyAgICAgICAgICAgICAgICBwa2dfY29uZmlnX2xpYnMgPSBbc1syOl0gZm9y IHMgaW4gcGtnX2NvbmZpZ19saWJzXQ0KLSsgICAgICAgICAgICAgICAgcGtnX2NvbmZpZ192ZXIg PSBnZXRvdXRwdXQoJ3BrZy1jb25maWcgLS1tb2R2ZXJzaW9uIHRrJykNCi0rICAgICAgICAgICAg ICAgIHRrX3ZlciA9IHJlLm1hdGNoKHIiKFxkKy5cZCspW1xkLl0qIiwgcGtnX2NvbmZpZ192ZXIp Lmdyb3VwKDEpDQotKyAgICAgICAgICAgICAgICB0Y2xfbGliX2RpciA9IG5leHQocyBmb3IgcyBp biBwa2dfY29uZmlnX2xpYnMNCi0rICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBp ZiByZS5tYXRjaChyIi4qLXRjbC0uKiIsIHMpKSArICcvdGNsJyArIHRrX3Zlcg0KLSsgICAgICAg ICAgICAgICAgdGtfbGliX2RpciA9IG5leHQocyBmb3IgcyBpbiBwa2dfY29uZmlnX2xpYnMNCi0r ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIHJlLm1hdGNoKHIiLiotdGstLioi LCBzKSkgKyAnL3RrJyArIHRrX3Zlcg0KLSAgICAgICAgICAgICBleGNlcHQ6DQotICAgICAgICAg ICAgICAgICB0a192ZXIgPSAnJw0KLSAgICAgICAgICAgICAgICAgcmVzdWx0ID0gc2VsZi5oYXJk Y29kZWRfdGNsX2NvbmZpZygpDQpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3B5dGhvbi5zY20g Yi9nbnUvcGFja2FnZXMvcHl0aG9uLnNjbQ0KaW5kZXggZDI5NmVlMWQ5Li4wYjIyM2YxZmMgMTAw NjQ0DQotLS0gYS9nbnUvcGFja2FnZXMvcHl0aG9uLnNjbQ0KKysrIGIvZ251L3BhY2thZ2VzL3B5 dGhvbi5zY20NCkBAIC04OSw2ICs4OSw3IEBADQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdl cyBwZXJsKQ0KICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgcGtnLWNvbmZpZykNCiAgICM6 dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHByb3RvYnVmKQ0KKyAgIzp1c2UtbW9kdWxlIChnbnUg cGFja2FnZXMgcXQpDQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyByZWFkbGluZSkNCiAg ICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHNkbCkNCiAgICM6dXNlLW1vZHVsZSAoZ251IHBh Y2thZ2VzIHNoZWxscykNCkBAIC0zODA3LDIxICszODA4LDIwIEBAIGJldHdlZW4gY29sb3JzcGFj ZXMgbGlrZSBzUkdCLCBYWVosIENJRUwqYSpiKiwgQ0lFQ0FNMDIsIENBTTAyLVVDUywgZXRjLiIp DQogKGRlZmluZS1wdWJsaWMgcHl0aG9uLW1hdHBsb3RsaWINCiAgIChwYWNrYWdlDQogICAgIChu YW1lICJweXRob24tbWF0cGxvdGxpYiIpDQotICAgICh2ZXJzaW9uICIxLjQuMyIpDQorICAgICh2 ZXJzaW9uICIyLjAuMCIpDQogICAgIChzb3VyY2UNCiAgICAgIChvcmlnaW4NCiAgICAgICAgKG1l dGhvZCB1cmwtZmV0Y2gpDQotICAgICAgICh1cmkgKHN0cmluZy1hcHBlbmQgIm1pcnJvcjovL3Nv dXJjZWZvcmdlL21hdHBsb3RsaWIvbWF0cGxvdGxpYiINCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAiL21hdHBsb3RsaWItIiB2ZXJzaW9uDQotICAgICAgICAgICAgICAgICAgICAgICAgICAg Ii9tYXRwbG90bGliLSIgdmVyc2lvbiAiLnRhci5neiIpKQ0KKyAgICAgICAodXJpIChzdHJpbmct YXBwZW5kDQorICAgICAgICAgICAgICJodHRwczovL2dpdGh1Yi5jb20vbWF0cGxvdGxpYi9tYXRw bG90bGliL2FyY2hpdmUvdiIgdmVyc2lvbiAiLnRhci5neiIpKQ0KKyAgICAgICAoZmlsZS1uYW1l IChzdHJpbmctYXBwZW5kIG5hbWUgIi0iIHZlcnNpb24gIi50YXIuZ3oiKSkNCiAgICAgICAgKHNo YTI1Ng0KICAgICAgICAgKGJhc2UzMg0KLSAgICAgICAgICIxZG4wNWN2ZDBnOTg0bHpoaDcyd2Ew ejkzcHNnd3NoYmJnOTNma2FiNnNseDVtM2w5NWF2IikpDQotICAgICAgIChwYXRjaGVzIChzZWFy Y2gtcGF0Y2hlcyAibWF0cGxvdGxpYi1zZXR1cGV4dC10ay5wYXRjaCIpKSkpDQorICAgICAgICAg IjB3M2s1bTVxYjN3c2Q3eWh2bWcwNDJ4ZGR2bGlna2x2Y3EydmlzazJjNXducGgzaGhzbG4iKSkp KQ0KICAgICAoYnVpbGQtc3lzdGVtIHB5dGhvbi1idWlsZC1zeXN0ZW0pDQotICAgIChvdXRwdXRz ICcoIm91dCIgImRvYyIpKQ0KICAgICAocHJvcGFnYXRlZC1pbnB1dHMgOyB0aGUgZm9sbG93aW5n IHBhY2thZ2VzIGFyZSBhbGwgbmVlZGVkIGF0IHJ1biB0aW1lDQotICAgICBgKCgicHl0aG9uLXB5 cGFyc2luZyIgLHB5dGhvbi1weXBhcnNpbmcpDQorICAgICBgKCgicHl0aG9uLWN5Y2xlciIgLHB5 dGhvbi1jeWNsZXIpDQorICAgICAgICgicHl0aG9uLXB5cGFyc2luZyIgLHB5dGhvbi1weXBhcnNp bmcpDQogICAgICAgICgicHl0aG9uLXB5Z29iamVjdCIgLHB5dGhvbi1weWdvYmplY3QpDQogICAg ICAgICgiZ29iamVjdC1pbnRyb3NwZWN0aW9uIiAsZ29iamVjdC1pbnRyb3NwZWN0aW9uKQ0KICAg ICAgICAoInB5dGhvbi10a2ludGVyIiAscHl0aG9uICJ0ayIpDQpAQCAtMzg1MywxNyArMzg1Mywx MyBAQCBiZXR3ZWVuIGNvbG9yc3BhY2VzIGxpa2Ugc1JHQiwgWFlaLCBDSUVMKmEqYiosIENJRUNB TTAyLCBDQU0wMi1VQ1MsIGV0Yy4iKQ0KICAgICAgICAoImdsaWIiICxnbGliKQ0KICAgICAgICA7 OyBGSVhNRTogQWRkIGJhY2tlbmRzIHdoZW4gYXZhaWxhYmxlLg0KICAgICAgICA7KCJweXRob24t d3hweXRob24iICxweXRob24td3hweXRob24pDQotICAgICAgIDsoInB5dGhvbi1weXF0IiAscHl0 aG9uLXB5cXQpDQorICAgICAgICgicHl0aG9uLXB5cXQiICxweXRob24tcHlxdCkNCiAgICAgICAg KCJ0Y2wiICx0Y2wpDQogICAgICAgICgidGsiICx0aykpKQ0KICAgICAobmF0aXZlLWlucHV0cw0K ICAgICAgYCgoInBrZy1jb25maWciICxwa2ctY29uZmlnKQ0KLSAgICAgICAoInB5dGhvbi1zcGhp bngiICxweXRob24tc3BoaW54LTEuMi4zKQ0KLSAgICAgICAoInB5dGhvbi1udW1weWRvYyIgLHB5 dGhvbi1udW1weWRvYykNCiAgICAgICAgKCJweXRob24tbm9zZSIgLHB5dGhvbi1ub3NlKQ0KLSAg ICAgICAoInB5dGhvbi1tb2NrIiAscHl0aG9uLW1vY2spDQotICAgICAgICgidGV4bGl2ZSIgLHRl eGxpdmUpDQotICAgICAgICgidGV4aW5mbyIgLHRleGluZm8pKSkNCisgICAgICAgKCJweXRob24t bW9jayIgLHB5dGhvbi1tb2NrKSkpDQogICAgIChhcmd1bWVudHMNCiAgICAgIGAoIzpwaGFzZXMN CiAgICAgICAgKG1vZGlmeS1waGFzZXMgJXN0YW5kYXJkLXBoYXNlcw0KQEAgLTM4ODIsMjYgKzM4 NzgsNjYgQEAgYmV0d2VlbiBjb2xvcnNwYWNlcyBsaWtlIHNSR0IsIFhZWiwgQ0lFTCphKmIqLCBD SUVDQU0wMiwgQ0FNMDItVUNTLCBldGMuIikNCiBiYXNlZGlybGlzdCA9IH5hLH5hfiUNCiAgW3Jj X29wdGlvbnNdfiUNCiBiYWNrZW5kID0gVGtBZ2d+JSINCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAoYXNzb2MtcmVmIGlucHV0cyAidGNsIikNCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAoYXNzb2MtcmVmIGlucHV0cyAidGsiKSkpKQ0KLSAgICAgICAgICAgICAgICN0KSkpDQotICAg ICAgICAgKGFkZC1hZnRlciAnaW5zdGFsbCAnaW5zdGFsbC1kb2MNCisgICAgICAgICAgICAgICAg ICAgICAgICAoYXNzb2MtcmVmIGlucHV0cyAidGNsIikNCisgICAgICAgICAgICAgICAgICAgICAg ICAoYXNzb2MtcmVmIGlucHV0cyAidGsiKSkpKSkNCisgICAgICAgICAgICAgI3QpKSkpKQ0KKyAg ICAoaG9tZS1wYWdlICJodHRwOi8vbWF0cGxvdGxpYi5vcmciKQ0KKyAgICAoc3lub3BzaXMgIjJE IHBsb3R0aW5nIGxpYnJhcnkgZm9yIFB5dGhvbiIpDQorICAgIChkZXNjcmlwdGlvbg0KKyAgICAg Ik1hdHBsb3RsaWIgaXMgYSBQeXRob24gMkQgcGxvdHRpbmcgbGlicmFyeSB3aGljaCBwcm9kdWNl cyBwdWJsaWNhdGlvbg0KK3F1YWxpdHkgZmlndXJlcyBpbiBhIHZhcmlldHkgb2YgaGFyZGNvcHkg Zm9ybWF0cyBhbmQgaW50ZXJhY3RpdmUgZW52aXJvbm1lbnRzDQorYWNyb3NzIHBsYXRmb3Jtcy4g IE1hdHBsb3RsaWIgY2FuIGJlIHVzZWQgaW4gUHl0aG9uIHNjcmlwdHMsIHRoZSBweXRob24gYW5k DQoraXB5dGhvbiBzaGVsbCwgd2ViIGFwcGxpY2F0aW9uIHNlcnZlcnMsIGFuZCBzaXggZ3JhcGhp Y2FsIHVzZXIgaW50ZXJmYWNlDQordG9vbGtpdHMuIikNCisgICAgKGxpY2Vuc2UgbGljZW5zZTpw c2ZsKQ0KKyAgICAocHJvcGVydGllcyBgKChweXRob24yLXZhcmlhbnQgLiAsKGRlbGF5IHB5dGhv bjItbWF0cGxvdGxpYikpKSkpKQ0KKw0KKyhkZWZpbmUtcHVibGljIHB5dGhvbjItbWF0cGxvdGxp Yg0KKyAgKGxldCAoKG1hdHBsb3RsaWIgKHBhY2thZ2Utd2l0aC1weXRob24yDQorICAgICAgICAg ICAgICAgICAgICAgKHN0cmlwLXB5dGhvbjItdmFyaWFudCBweXRob24tbWF0cGxvdGxpYikpKSkN CisgICAgKHBhY2thZ2UgKGluaGVyaXQgbWF0cGxvdGxpYikNCisgICAgICA7OyBNYWtlIHN1cmUg dG8gdXNlIHNwZWNpYWwgcGFja2FnZXMgZm9yIFB5dGhvbiAyIGluc3RlYWQNCisgICAgICA7OyBv ZiB0aG9zZSBhdXRvbWF0aWNhbGx5IHJld3JpdHRlbiBieSBwYWNrYWdlLXdpdGgtcHl0aG9uMi4N CisgICAgICAocHJvcGFnYXRlZC1pbnB1dHMNCisgICAgICAgYCgoInB5dGhvbjItcHljYWlybyIg LHB5dGhvbjItcHljYWlybykNCisgICAgICAgICAoInB5dGhvbjItcHlnb2JqZWN0LTIiICxweXRo b24yLXB5Z29iamVjdC0yKQ0KKyAgICAgICAgICgicHl0aG9uMi10a2ludGVyIiAscHl0aG9uLTIg InRrIikNCisgICAgICAgICAsQChmb2xkIGFsaXN0LWRlbGV0ZSAocGFja2FnZS1wcm9wYWdhdGVk LWlucHV0cyBtYXRwbG90bGliKQ0KKyAgICAgICAgICAgICAgICAgJygicHl0aG9uLXB5Y2Fpcm8i ICJweXRob24tcHlnb2JqZWN0IiAicHl0aG9uLXRraW50ZXIiKSkpKSkpKQ0KKw0KKyhkZWZpbmUt cHVibGljIHB5dGhvbi1tYXRwbG90bGliLWRvY3VtZW50YXRpb24NCisgIChwYWNrYWdlDQorICAg IChuYW1lICJweXRob24tbWF0cGxvdGxpYi1kb2N1bWVudGF0aW9uIikNCisgICAgKHZlcnNpb24g KHBhY2thZ2UtdmVyc2lvbiBweXRob24tbWF0cGxvdGxpYikpDQorICAgIChzb3VyY2UgKHBhY2th Z2Utc291cmNlIHB5dGhvbi1tYXRwbG90bGliKSkNCisgICAgKGJ1aWxkLXN5c3RlbSBweXRob24t YnVpbGQtc3lzdGVtKQ0KKyAgICAobmF0aXZlLWlucHV0cw0KKyAgICAgYCgoInB5dGhvbi1tYXRw bG90bGliIiAscHl0aG9uLW1hdHBsb3RsaWIpDQorICAgICAgICgicHl0aG9uLWNvbG9yc3BhY2lv dXMiICxweXRob24tY29sb3JzcGFjaW91cykNCisgICAgICAgKCJweXRob24tc3BoaW54IiAscHl0 aG9uLXNwaGlueCkNCisgICAgICAgKCJweXRob24tbnVtcHlkb2MiICxweXRob24tbnVtcHlkb2Mp DQorICAgICAgICgicHl0aG9uLWlweXRob24iICxweXRob24taXB5dGhvbikNCisgICAgICAgKCJ0 ZXhsaXZlIiAsdGV4bGl2ZSkNCisgICAgICAgKCJ0ZXhpbmZvIiAsdGV4aW5mbykNCisgICAgICAg LEAocGFja2FnZS1uYXRpdmUtaW5wdXRzIHB5dGhvbi1tYXRwbG90bGliKSkpDQorICAgIChhcmd1 bWVudHMNCisgICAgIGAoIzp0ZXN0cz8gI2YgOyB3ZSdyZSBvbmx5IGdlbmVyYXRpbmcgZG9jdW1l bnRhdGlvbg0KKyAgICAgICAjOnBoYXNlcw0KKyAgICAgICAobW9kaWZ5LXBoYXNlcyAlc3RhbmRh cmQtcGhhc2VzDQorICAgICAgICAgKGRlbGV0ZSAnYnVpbGQpDQorICAgICAgICAgKHJlcGxhY2Ug J2luc3RhbGwNCiAgICAgICAgICAgIChsYW1iZGEqICgjOmtleSBpbnB1dHMgb3V0cHV0cyAjOmFs bG93LW90aGVyLWtleXMpDQotICAgICAgICAgICAgIChsZXQqICgoZGF0YSAoc3RyaW5nLWFwcGVu ZCAoYXNzb2MtcmVmIG91dHB1dHMgImRvYyIpICIvc2hhcmUiKSkNCisgICAgICAgICAgICAgKGxl dCogKChkYXRhIChzdHJpbmctYXBwZW5kIChhc3NvYy1yZWYgb3V0cHV0cyAib3V0IikgIi9zaGFy ZSIpKQ0KICAgICAgICAgICAgICAgICAgICAgKGRvYyAoc3RyaW5nLWFwcGVuZCBkYXRhICIvZG9j LyIgLG5hbWUgIi0iICx2ZXJzaW9uKSkNCiAgICAgICAgICAgICAgICAgICAgIChpbmZvIChzdHJp bmctYXBwZW5kIGRhdGEgIi9pbmZvIikpDQogICAgICAgICAgICAgICAgICAgICAoaHRtbCAoc3Ry aW5nLWFwcGVuZCBkb2MgIi9odG1sIikpKQ0KICAgICAgICAgICAgICAgIDs7IE1ha2UgaW5zdGFs bGVkIHBhY2thZ2UgYXZhaWxhYmxlIGZvciBidWlsZGluZyB0aGUNCiAgICAgICAgICAgICAgICA7 OyBkb2N1bWVudGF0aW9uDQotICAgICAgICAgICAgICAgKGFkZC1pbnN0YWxsZWQtcHl0aG9ucGF0 aCBpbnB1dHMgb3V0cHV0cykNCiAgICAgICAgICAgICAgICAod2l0aC1kaXJlY3RvcnktZXhjdXJz aW9uICJkb2MiDQogICAgICAgICAgICAgICAgICA7OyBQcm9kdWNlIHBkZiBpbiAnQTQnIGZvcm1h dC4NCiAgICAgICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAoZmluZC1maWxlcyAiLiIgImNvbmZc XC5weSIpDQogICAgICAgICAgICAgICAgICAgICgoImxhdGV4X3BhcGVyX3NpemUgPSAnbGV0dGVy JyIpDQogICAgICAgICAgICAgICAgICAgICAibGF0ZXhfcGFwZXJfc2l6ZSA9ICdhNCciKSkNCi0g ICAgICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAidXNlcnMvaW50cm8ucnN0Ig0KLSAgICAgICAg ICAgICAgICAgICA7OyBGaXggcmVTVCBtYXJrdXAgZXJyb3IgKHNlZSA8aHR0cHM6Ly9naXRodWIu Y29tL3NwaGlueC1kb2Mvc3BoaW54L2lzc3Vlcy8zMDQ0PikNCi0gICAgICAgICAgICAgICAgICAg KCgiW1tdWypdW11dIikgIlsjXSIpKQ0KICAgICAgICAgICAgICAgICAgKG1rZGlyLXAgaHRtbCkN CiAgICAgICAgICAgICAgICAgIChta2Rpci1wIGluZm8pDQogICAgICAgICAgICAgICAgICA7OyBU aGUgZG9jIHJlY29tbWVuZHMgdG8gcnVuIHRoZSAnaHRtbCcgdGFyZ2V0IHR3aWNlLg0KQEAgLTM5 MjMsMzUgKzM5NTksMTUgQEAgYmFja2VuZCA9IFRrQWdnfiUiDQogICAgICAgICAgICAgICAgICAo Y29weS1maWxlICJidWlsZC90ZXhpbmZvL21hdHBsb3RsaWIuaW5mbyINCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgaW5mbyAiL21hdHBsb3RsaWIuaW5mbyIpKQ0K ICAgICAgICAgICAgICAgICAgKGNvcHktZmlsZSAiYnVpbGQvbGF0ZXgvTWF0cGxvdGxpYi5wZGYi DQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kIGRvYyAiL01hdHBs b3RsaWIucGRmIikpKQ0KLSAgICAgICAgICAgICAgICAgI3QpKSkpKSkNCi0gICAgKGhvbWUtcGFn ZSAiaHR0cDovL21hdHBsb3RsaWIub3JnIikNCi0gICAgKHN5bm9wc2lzICIyRCBwbG90dGluZyBs aWJyYXJ5IGZvciBQeXRob24iKQ0KLSAgICAoZGVzY3JpcHRpb24NCi0gICAgICJNYXRwbG90bGli IGlzIGEgUHl0aG9uIDJEIHBsb3R0aW5nIGxpYnJhcnkgd2hpY2ggcHJvZHVjZXMgcHVibGljYXRp b24NCi1xdWFsaXR5IGZpZ3VyZXMgaW4gYSB2YXJpZXR5IG9mIGhhcmRjb3B5IGZvcm1hdHMgYW5k IGludGVyYWN0aXZlIGVudmlyb25tZW50cw0KLWFjcm9zcyBwbGF0Zm9ybXMuICBNYXRwbG90bGli IGNhbiBiZSB1c2VkIGluIFB5dGhvbiBzY3JpcHRzLCB0aGUgcHl0aG9uIGFuZA0KLWlweXRob24g c2hlbGwsIHdlYiBhcHBsaWNhdGlvbiBzZXJ2ZXJzLCBhbmQgc2l4IGdyYXBoaWNhbCB1c2VyIGlu dGVyZmFjZQ0KLXRvb2xraXRzLiIpDQotICAgIChsaWNlbnNlIGxpY2Vuc2U6cHNmbCkNCi0gICAg KHByb3BlcnRpZXMgYCgocHl0aG9uMi12YXJpYW50IC4gLChkZWxheSBweXRob24yLW1hdHBsb3Rs aWIpKSkpKSkNCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgZG9j ICIvTWF0cGxvdGxpYi5wZGYiKSkpKQ0KKyAgICAgICAgICAgICAjdCkpKSkpDQorICAgIChob21l LXBhZ2UgKHBhY2thZ2UtaG9tZS1wYWdlIHB5dGhvbi1tYXRwbG90bGliKSkNCisgICAgKHN5bm9w c2lzICJEb2N1bWVudGF0aW9uIGZvciB0aGUgcHl0aG9uLW1hdHBsb3RsaWIgcGFja2FnZSIpDQor ICAgIChkZXNjcmlwdGlvbiAocGFja2FnZS1kZXNjcmlwdGlvbiBweXRob24tbWF0cGxvdGxpYikp DQorICAgIChsaWNlbnNlIChwYWNrYWdlLWxpY2Vuc2UgcHl0aG9uLW1hdHBsb3RsaWIpKSkpDQog DQotKGRlZmluZS1wdWJsaWMgcHl0aG9uMi1tYXRwbG90bGliDQotICAobGV0ICgobWF0cGxvdGxp YiAocGFja2FnZS13aXRoLXB5dGhvbjINCi0gICAgICAgICAgICAgICAgICAgICAoc3RyaXAtcHl0 aG9uMi12YXJpYW50IHB5dGhvbi1tYXRwbG90bGliKSkpKQ0KLSAgICAocGFja2FnZSAoaW5oZXJp dCBtYXRwbG90bGliKQ0KLSAgICAgIDs7IE1ha2Ugc3VyZSB0byB1c2Ugc3BlY2lhbCBwYWNrYWdl cyBmb3IgUHl0aG9uIDIgaW5zdGVhZA0KLSAgICAgIDs7IG9mIHRob3NlIGF1dG9tYXRpY2FsbHkg cmV3cml0dGVuIGJ5IHBhY2thZ2Utd2l0aC1weXRob24yLg0KLSAgICAgIChuYXRpdmUtaW5wdXRz DQotICAgICAgIGAoKCJweXRob24yLXNwaGlueCIgLHB5dGhvbjItc3BoaW54LTEuMi4zKQ0KLSAg ICAgICAgICxAKGZvbGQgYWxpc3QtZGVsZXRlIChwYWNrYWdlLW5hdGl2ZS1pbnB1dHMgbWF0cGxv dGxpYikNCi0gICAgICAgICAgICAgICAgICcoInB5dGhvbi1zcGhpbngiKSkpKQ0KLSAgICAgIChw cm9wYWdhdGVkLWlucHV0cw0KLSAgICAgICBgKCgicHl0aG9uMi1weWNhaXJvIiAscHl0aG9uMi1w eWNhaXJvKQ0KLSAgICAgICAgICgicHl0aG9uMi1weWdvYmplY3QtMiIgLHB5dGhvbjItcHlnb2Jq ZWN0LTIpDQotICAgICAgICAgKCJweXRob24yLXRraW50ZXIiICxweXRob24tMiAidGsiKQ0KLSAg ICAgICAgICxAKGZvbGQgYWxpc3QtZGVsZXRlIChwYWNrYWdlLXByb3BhZ2F0ZWQtaW5wdXRzIG1h dHBsb3RsaWIpDQotICAgICAgICAgICAgICAgICAnKCJweXRob24tcHljYWlybyIgInB5dGhvbi1w eWdvYmplY3QiICJweXRob24tdGtpbnRlciIpKSkpKSkpDQorKGRlZmluZS1wdWJsaWMgcHl0aG9u Mi1tYXRwbG90bGliLWRvY3VtZW50YXRpb24NCisgIChwYWNrYWdlLXdpdGgtcHl0aG9uMiBweXRo b24tbWF0cGxvdGxpYi1kb2N1bWVudGF0aW9uKSkNCiANCiAoZGVmaW5lLXB1YmxpYyBweXRob24y LXB5c25wdG9vbHMNCiAgIChwYWNrYWdlDQotLSANCjIuMTEuMQ0KDQoNCkZyb20gNjZjNjFiNDY4 M2Y4YmIyZWYxNWYzYjY1OWFmM2RkZDFhYzhjNzkyNyBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEN CkZyb206IFRob21hcyBEYW5ja2FlcnQgPHBvc3RAdGhvbWFzZGFuY2thZXJ0LmJlPg0KRGF0ZTog RnJpLCAyNCBGZWIgMjAxNyAxNzowNzoyNyArMDEwMA0KU3ViamVjdDogW1BBVENIIDUvOF0gZ251 OiBweXRob24tdGVzdHBhdGg6IEZpeCBsaWJyYXJ5IGxvY2F0aW9uIGZvciBweXRob24yDQogdmVy c2lvbi4NCg0KKiBnbnUvcGFja2FnZXMvcHl0aG9uLnNjbSAocHl0aG9uLXRlc3RwYXRoKVthcmd1 bWVudHNdOiBJbnN0YWxsIG1vZHVsZSBpbiB0aGUgcHJvcGVyDQoibGliL3B5dGhvbngueSIgbG9j YXRpb24gZm9yIGFsbCBQeXRob24gdmVyc2lvbnMuDQotLS0NCiBnbnUvcGFja2FnZXMvcHl0aG9u LnNjbSB8IDI2ICsrKysrKysrKysrKysrKystLS0tLS0tLS0tDQogMSBmaWxlIGNoYW5nZWQsIDE2 IGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQ0KDQpkaWZmIC0tZ2l0IGEvZ251L3BhY2th Z2VzL3B5dGhvbi5zY20gYi9nbnUvcGFja2FnZXMvcHl0aG9uLnNjbQ0KaW5kZXggMGIyMjNmMWZj Li5kYWEwMDFmZTAgMTAwNjQ0DQotLS0gYS9nbnUvcGFja2FnZXMvcHl0aG9uLnNjbQ0KKysrIGIv Z251L3BhY2thZ2VzL3B5dGhvbi5zY20NCkBAIC01MTUzLDIwICs1MTUzLDI2IEBAIGluc3RhbGxp bmcgQGNvZGV7a2VybmVsc3BlY31zIGZvciB1c2Ugd2l0aCBKdXB5dGVyIGZyb250ZW5kcy4iKQ0K ICAgICAoYnVpbGQtc3lzdGVtIHB5dGhvbi1idWlsZC1zeXN0ZW0pDQogICAgIChhcmd1bWVudHMN CiAgICAgIGAoIzp0ZXN0cz8gI2YgOyB0aGlzIHBhY2thZ2UgZG9lcyBub3QgZXZlbiBoYXZlIGEg c2V0dXAucHkNCisgICAgICAgIzptb2R1bGVzICgoZ3VpeCBidWlsZCBweXRob24tYnVpbGQtc3lz dGVtKQ0KKyAgICAgICAgICAgICAgICAgIChndWl4IGJ1aWxkIHV0aWxzKQ0KKyAgICAgICAgICAg ICAgICAgIChzcmZpIHNyZmktMSkpDQorICAgICAgICM6aW1wb3J0ZWQtbW9kdWxlcyAoLEAlcHl0 aG9uLWJ1aWxkLXN5c3RlbS1tb2R1bGVzDQorICAgICAgICAgICAgICAgICAgICAgICAgICAgKHNy Zmkgc3JmaS0xKSkNCiAgICAgICAgIzpwaGFzZXMNCiAgICAgICAgKG1vZGlmeS1waGFzZXMgJXN0 YW5kYXJkLXBoYXNlcw0KICAgICAgICAgIChkZWxldGUgJ2luc3RhbGwpDQogICAgICAgICAgKHJl cGxhY2UgJ2J1aWxkDQotICAgICAgICAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyBv dXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykNCi0gICAgICAgICAgICAgICAgICAgIChsZXQgKChk aXIgKHN0cmluZy1hcHBlbmQNCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChhc3Nv Yy1yZWYgb3V0cHV0cyAib3V0IikNCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIv bGliL3B5dGhvbiINCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChzdHJpbmctdGFr ZSAoc3RyaW5nLXRha2UtcmlnaHQNCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgKGFzc29jLXJlZiBpbnB1dHMgInB5dGhvbiIpIDUpIDMpDQotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAiL3NpdGUtcGFja2FnZXMvdGVzdHBhdGgiKSkpDQotICAg ICAgICAgICAgICAgICAgICAgIChta2Rpci1wIGRpcikNCi0gICAgICAgICAgICAgICAgICAgICAg KGNvcHktcmVjdXJzaXZlbHkgInRlc3RwYXRoIiBkaXIpKQ0KLSAgICAgICAgICAgICAgICAgICAg I3QpKSkpKQ0KKyAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyBvdXRwdXRzICM6YWxs b3ctb3RoZXIta2V5cykNCisgICAgICAgICAgICAgKGxldCogKCh2ZXJzaW9uIChsYXN0DQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0cmluZy1zcGxpdCAoYXNzb2MtcmVmIGlucHV0 cyAicHl0aG9uIikgI1wtKSkpDQorICAgICAgICAgICAgICAgICAgICAoeC55IChzdHJpbmctam9p biAodGFrZSAoc3RyaW5nLXNwbGl0IHZlcnNpb24gI1wuKSAyKQ0KKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAiLiIpKQ0KKyAgICAgICAgICAgICAgICAgICAgKGRpciAo c3RyaW5nLWFwcGVuZA0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgKGFzc29jLXJlZiBvdXRw dXRzICJvdXQiKQ0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgIi9saWIvcHl0aG9uIiB4Lnkg Ii9zaXRlLXBhY2thZ2VzL3Rlc3RwYXRoIikpKQ0KKyAgICAgICAgICAgICAgIChta2Rpci1wIGRp cikNCisgICAgICAgICAgICAgICAoY29weS1yZWN1cnNpdmVseSAidGVzdHBhdGgiIGRpcikpDQor ICAgICAgICAgICAgICN0KSkpKSkNCiAgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9naXRodWIuY29t L3Rha2x1eXZlci90ZXN0cGF0aCIpDQogICAgIChzeW5vcHNpcyAiVGVzdCB1dGlsaXRpZXMgZm9y IGNvZGUgd29ya2luZyB3aXRoIGZpbGVzIGFuZCBjb21tYW5kcyIpDQogICAgIChkZXNjcmlwdGlv bg0KLS0gDQoyLjExLjENCg0KDQpGcm9tIGM3ZmY3NGRlZGM4M2I0NjE0YWI1YWFlZGRjMTllN2Fj ZDYzMDU2OTMgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxDQpGcm9tOiBUaG9tYXMgRGFuY2thZXJ0 IDxwb3N0QHRob21hc2RhbmNrYWVydC5iZT4NCkRhdGU6IFR1ZSwgMjEgRmViIDIwMTcgMTI6NDE6 MDkgKzAxMDANClN1YmplY3Q6IFtQQVRDSCA2LzhdIGdudTogcHl0aG9uLWlweXRob246IFVwZGF0 ZSB0byA1LjIuMi4NCg0KKiBnbnUvcGFja2FnZXMvcHl0aG9uLnNjbSAocHl0aG9uLWlweXRob24p OiBVcGRhdGUgdG8gNS4yLjIuDQpbcHJvcGFnYXRlZC1pbnB1dHNdOiBBZGQgcHlob24tcHJvbXB0 LXRvb2xraXQgYW5kIHB5dGhvbi1uYmZvcm1hdC4NCihweXRob24yLWlweXRob24pIFthcmd1bWVu dHNdOiBFbmFibGUgdGVzdHMuDQpbcHJvcGFnYXRlZC1pbnB1dHNdOiBBZGQgcHl0aG9uMi1iYWNr cG9ydHMtc2h1dGlsLWdldC10ZXJtaW5hbC1zaXplLg0KLS0tDQogZ251L3BhY2thZ2VzL3B5dGhv bi5zY20gfCAyMiArKysrKysrKysrKysrKy0tLS0tLS0tDQogMSBmaWxlIGNoYW5nZWQsIDE0IGlu c2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pDQoNCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMv cHl0aG9uLnNjbSBiL2dudS9wYWNrYWdlcy9weXRob24uc2NtDQppbmRleCBkYWEwMDFmZTAuLjU4 M2M1MzE0OSAxMDA2NDQNCi0tLSBhL2dudS9wYWNrYWdlcy9weXRob24uc2NtDQorKysgYi9nbnUv cGFja2FnZXMvcHl0aG9uLnNjbQ0KQEAgLTUxODcsMTcgKzUxODcsMTggQEAgdG9vbHMgZm9yIG1v Y2tpbmcgc3lzdGVtIGNvbW1hbmRzIGFuZCByZWNvcmRpbmcgY2FsbHMgdG8gdGhvc2UuIikNCiAo ZGVmaW5lLXB1YmxpYyBweXRob24taXB5dGhvbg0KICAgKHBhY2thZ2UNCiAgICAgKG5hbWUgInB5 dGhvbi1pcHl0aG9uIikNCi0gICAgKHZlcnNpb24gIjQuMC4zIikNCisgICAgKHZlcnNpb24gIjUu Mi4yIikNCiAgICAgKHNvdXJjZQ0KICAgICAgKG9yaWdpbg0KICAgICAgICAobWV0aG9kIHVybC1m ZXRjaCkNCiAgICAgICAgKHVyaSAocHlwaS11cmkgImlweXRob24iIHZlcnNpb24gIi50YXIuZ3oi KSkNCiAgICAgICAgKHNoYTI1Ng0KLSAgICAgICAgKGJhc2UzMiAiMWgyZ3AxcDA2c3d3OXJ6Zmtm enF5NDg5Ymg0N2dqMzkxMHkyYjF3ZGszZGN4MWNxejRpcyIpKSkpDQorICAgICAgICAoYmFzZTMy ICIxcWhqd2E5Y3l6MW5wN3JodjNwNGlwMTNsa2dicXNhZDYybDI0eGt3aXExaWMyZ3dpcWJmIikp KSkNCiAgICAgKGJ1aWxkLXN5c3RlbSBweXRob24tYnVpbGQtc3lzdGVtKQ0KICAgICAob3V0cHV0 cyAnKCJvdXQiICJkb2MiKSkNCiAgICAgKHByb3BhZ2F0ZWQtaW5wdXRzDQogICAgICBgKCgicHl0 aG9uLXB5em1xIiAscHl0aG9uLXB5em1xKQ0KKyAgICAgICAoInB5dGhvbi1wcm9tcHQtdG9vbGtp dCIgLHB5dGhvbi1wcm9tcHQtdG9vbGtpdCkNCiAgICAgICAgKCJweXRob24tdGVybWluYWRvIiAs cHl0aG9uLXRlcm1pbmFkbykNCiAgICAgICAgKCJweXRob24tbWF0cGxvdGxpYiIgLHB5dGhvbi1t YXRwbG90bGliKQ0KICAgICAgICAoInB5dGhvbi1udW1weSIgLHB5dGhvbi1udW1weSkNCkBAIC01 MjEwLDYgKzUyMTEsNyBAQCB0b29scyBmb3IgbW9ja2luZyBzeXN0ZW0gY29tbWFuZHMgYW5kIHJl Y29yZGluZyBjYWxscyB0byB0aG9zZS4iKQ0KICAgICAgICAoInB5dGhvbi1qc29uc2NoZW1hIiAs cHl0aG9uLWpzb25zY2hlbWEpDQogICAgICAgICgicHl0aG9uLXRyYWl0bGV0cyIgLHB5dGhvbi10 cmFpdGxldHMpDQogICAgICAgICgicHl0aG9uLWlweWtlcm5lbCIgLHB5dGhvbi1pcHlrZXJuZWwp DQorICAgICAgICgicHl0aG9uLW5iZm9ybWF0IiAscHl0aG9uLW5iZm9ybWF0KQ0KICAgICAgICAo InB5dGhvbi1weWdtZW50cyIgLHB5dGhvbi1weWdtZW50cykpKQ0KICAgICAoaW5wdXRzDQogICAg ICBgKCgicmVhZGxpbmUiICxyZWFkbGluZSkNCkBAIC01MjIwLDYgKzUyMjIsNyBAQCB0b29scyBm b3IgbW9ja2luZyBzeXN0ZW0gY29tbWFuZHMgYW5kIHJlY29yZGluZyBjYWxscyB0byB0aG9zZS4i KQ0KICAgICAgICAoInB5dGhvbi10ZXN0cGF0aCIgLHB5dGhvbi10ZXN0cGF0aCkNCiAgICAgICAg KCJweXRob24tbm9zZSIgLHB5dGhvbi1ub3NlKQ0KICAgICAgICAoInB5dGhvbi1zcGhpbngiICxw eXRob24tc3BoaW54KQ0KKyAgICAgICAoInB5dGhvbi1zaHBpbngtcnRkLXRoZW1lIiAscHl0aG9u LXNwaGlueC1ydGQtdGhlbWUpDQogICAgICAgICgidGV4bGl2ZSIgLHRleGxpdmUpDQogICAgICAg ICgidGV4aW5mbyIgLHRleGluZm8pKSkNCiAgICAgKGFyZ3VtZW50cw0KQEAgLTUyMzMsMTUgKzUy MzYsMTYgQEAgdG9vbHMgZm9yIG1vY2tpbmcgc3lzdGVtIGNvbW1hbmRzIGFuZCByZWNvcmRpbmcg Y2FsbHMgdG8gdGhvc2UuIikNCiAgICAgICAgICAgICAgICAgICAgKGh0bWwgKHN0cmluZy1hcHBl bmQgZG9jICIvaHRtbCIpKQ0KICAgICAgICAgICAgICAgICAgICAobWFuMSAoc3RyaW5nLWFwcGVu ZCBkYXRhICIvbWFuL21hbjEiKSkNCiAgICAgICAgICAgICAgICAgICAgKGluZm8gKHN0cmluZy1h cHBlbmQgZGF0YSAiL2luZm8iKSkNCi0gICAgICAgICAgICAgICAgICAgKGV4YW1wbGVzIChzdHJp bmctYXBwZW5kIGRvYyAiL2V4YW1wbGVzIikpKQ0KKyAgICAgICAgICAgICAgICAgICAoZXhhbXBs ZXMgKHN0cmluZy1hcHBlbmQgZG9jICIvZXhhbXBsZXMiKSkNCisgICAgICAgICAgICAgICAgICAg KHB5dGhvbi1hcmcgKHN0cmluZy1hcHBlbmQgIlBZVEhPTj0iICh3aGljaCAicHl0aG9uIikpKSkN CiAgICAgICAgICAgICAgIChzZXRlbnYgIkxBTkciICJlbl9VUy51dGY4IikNCiAgICAgICAgICAg ICAgIDs7IE1ha2UgaW5zdGFsbGVkIHBhY2thZ2UgYXZhaWxhYmxlIGZvciBydW5uaW5nIHRoZSB0 ZXN0cw0KICAgICAgICAgICAgICAgKGFkZC1pbnN0YWxsZWQtcHl0aG9ucGF0aCBpbnB1dHMgb3V0 cHV0cykNCiAgICAgICAgICAgICAgICh3aXRoLWRpcmVjdG9yeS1leGN1cnNpb24gImRvY3MiDQog ICAgICAgICAgICAgICAgIDs7IEZJWE1FOiBwZGYgZmFpbHMgdG8gYnVpbGQNCiAgICAgICAgICAg ICAgICAgOzsoc3lzdGVtKiAibWFrZSIgInBkZiIgIlBBUEVSPWE0IikNCi0gICAgICAgICAgICAg ICAgKHN5c3RlbSogIm1ha2UiICJodG1sIikNCi0gICAgICAgICAgICAgICAgKHN5c3RlbSogIm1h a2UiICJpbmZvIikpDQorICAgICAgICAgICAgICAgIChzeXN0ZW0qICJtYWtlIiBweXRob24tYXJn ICJodG1sIikNCisgICAgICAgICAgICAgICAgKHN5c3RlbSogIm1ha2UiIHB5dGhvbi1hcmcgImlu Zm8iKSkNCiAgICAgICAgICAgICAgIChjb3B5LXJlY3Vyc2l2ZWx5ICJkb2NzL21hbiIgbWFuMSkN CiAgICAgICAgICAgICAgIChjb3B5LXJlY3Vyc2l2ZWx5ICJleGFtcGxlcyIgZXhhbXBsZXMpDQog ICAgICAgICAgICAgICAoY29weS1yZWN1cnNpdmVseSAiZG9jcy9idWlsZC9odG1sIiBodG1sKQ0K QEAgLTUyOTEsMTAgKzUyOTUsMTIgQEAgY29tcHV0aW5nLiIpDQogICAobGV0ICgoaXB5dGhvbiAo cGFja2FnZS13aXRoLXB5dGhvbjIgKHN0cmlwLXB5dGhvbjItdmFyaWFudCBweXRob24taXB5dGhv bikpKSkNCiAgICAgKHBhY2thZ2UNCiAgICAgICAoaW5oZXJpdCBpcHl0aG9uKQ0KLSAgICAgIDs7 IEZJWE1FOiBzb21lIHRlc3RzIGFyZSBmYWlsaW5nDQotICAgICAgKGFyZ3VtZW50cw0KLSAgICAg ICBgKCM6dGVzdHM/ICNmICxAKHBhY2thZ2UtYXJndW1lbnRzIGlweXRob24pKSkNCiAgICAgICA7 OyBGSVhNRTogYWRkIHB5cmVhZGxpbmUgb25jZSBhdmFpbGFibGUuDQorICAgICAgKHByb3BhZ2F0 ZWQtaW5wdXRzDQorICAgICAgIGAoKCJweXRob24yLWJhY2twb3J0cy1zaHV0aWwtZ2V0LXRlcm1p bmFsLXNpemUiDQorICAgICAgICAgICxweXRob24yLWJhY2twb3J0cy1zaHV0aWwtZ2V0LXRlcm1p bmFsLXNpemUpDQorICAgICAgICAgKCJweXRob24yLXBhdGhsaWIyIiAscHl0aG9uMi1wYXRobGli MikNCisgICAgICAgICAsQChwYWNrYWdlLXByb3BhZ2F0ZWQtaW5wdXRzIGlweXRob24pKSkNCiAg ICAgICAobmF0aXZlLWlucHV0cw0KICAgICAgICBgKCgicHl0aG9uMi1tb2NrIiAscHl0aG9uMi1t b2NrKQ0KICAgICAgICAgICxAKHBhY2thZ2UtbmF0aXZlLWlucHV0cyBpcHl0aG9uKSkpKSkpDQot LSANCjIuMTEuMQ0KDQoNCkZyb20gMmZiZTU5OTNlOTY5NTY2ZjA3MTkxYmUzNTc4YjM1MTk5NDgz OWU5MyBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDENCkZyb206IFRob21hcyBEYW5ja2FlcnQgPHBv c3RAdGhvbWFzZGFuY2thZXJ0LmJlPg0KRGF0ZTogVHVlLCAyMSBGZWIgMjAxNyAxMTo0NTowNiAr MDEwMA0KU3ViamVjdDogW1BBVENIIDcvOF0gZ251OiBweXRob24tc2NpcHk6IFVwZGF0ZSB0byAw LjE4LjEuDQoNCiogZ251L3BhY2thZ2VzL3B5dGhvbi5zY20gKHB5dGhvbi1zY2lweSk6IFVwZGF0 ZSB0byAwLjE4LjEuDQpbc291cmNlXTogVXNlIGdpdGh1YiBpbnN0ZWFkIG9mIHNvdXJjZWZvcmdl Lg0KW25hdGl2ZS1pbnB1dHNdOiBBZGQgcHl0aG9uLWN5dGhvbi4NCi0tLQ0KIGdudS9wYWNrYWdl cy9weXRob24uc2NtIHwgMTA0ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQ0KIDEgZmlsZSBjaGFuZ2VkLCA0OCBpbnNlcnRpb25zKCspLCA1NiBkZWxldGlv bnMoLSkNCg0KZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9weXRob24uc2NtIGIvZ251L3BhY2th Z2VzL3B5dGhvbi5zY20NCmluZGV4IDU4M2M1MzE0OS4uNDA0YWMzOGUzIDEwMDY0NA0KLS0tIGEv Z251L3BhY2thZ2VzL3B5dGhvbi5zY20NCisrKyBiL2dudS9wYWNrYWdlcy9weXRob24uc2NtDQpA QCAtNDA0OSwxNiArNDA0OSwxNiBAQCBmdW5jdGlvbnMuIikNCiAoZGVmaW5lLXB1YmxpYyBweXRo b24tc2NpcHkNCiAgIChwYWNrYWdlDQogICAgIChuYW1lICJweXRob24tc2NpcHkiKQ0KLSAgICAo dmVyc2lvbiAiMC4xNi4wIikNCisgICAgKHZlcnNpb24gIjAuMTguMSIpDQogICAgIChzb3VyY2UN CiAgICAgIChvcmlnaW4NCiAgICAgICAgKG1ldGhvZCB1cmwtZmV0Y2gpDQotOyBodHRwOi8vZG93 bmxvYWRzLnNvdXJjZWZvcmdlLm5ldC9wcm9qZWN0L3NjaXB5L3NjaXB5LzAuMTYuMS9zY2lweS0w LjE2LjEudGFyLmd6DQotICAgICAgICh1cmkgKHN0cmluZy1hcHBlbmQgIm1pcnJvcjovL3NvdXJj ZWZvcmdlL3NjaXB5L3NjaXB5LyIgdmVyc2lvbg0KLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICIvc2NpcHktIiB2ZXJzaW9uICIudGFyLnh6IikpDQorICAgICAgICh1cmkgKHN0cmluZy1hcHBl bmQgImh0dHBzOi8vZ2l0aHViLmNvbS9zY2lweS9zY2lweS9hcmNoaXZlL3YiDQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgdmVyc2lvbiAiLnRhci5neiIpKQ0KKyAgICAgICAoZmlsZS1uYW1l IChzdHJpbmctYXBwZW5kIG5hbWUgIi0iIHZlcnNpb24gIi50YXIuZ3oiKSkNCiAgICAgICAgKHNo YTI1Ng0KICAgICAgICAgKGJhc2UzMg0KLSAgICAgICAgICIwd2EwYTRza3BkYTNneDdsYjEyeW4x OW5oYmFpcmx5eHJ2ZGEybHoyYmNhd2szeDVxenoyIikpKSkNCisgICAgICAgICAiMTdzbHNyZmF3 anA3aWY2cXJseDAzemhncDA1MzUwZ2lueHg4ZGRwdzl6cXg0M3g5MDVzbiIpKSkpDQogICAgIChi dWlsZC1zeXN0ZW0gcHl0aG9uLWJ1aWxkLXN5c3RlbSkNCiAgICAgKHByb3BhZ2F0ZWQtaW5wdXRz DQogICAgICBgKCgicHl0aG9uLW51bXB5IiAscHl0aG9uLW51bXB5KQ0KQEAgLTQwNjgsMjEgKzQw NjgsMTYgQEAgZnVuY3Rpb25zLiIpDQogICAgICBgKCgibGFwYWNrIiAsbGFwYWNrKQ0KICAgICAg ICAoIm9wZW5ibGFzIiAsb3BlbmJsYXMpKSkNCiAgICAgKG5hdGl2ZS1pbnB1dHMNCi0gICAgIGAo KCJweXRob24tbm9zZSIgLHB5dGhvbi1ub3NlKQ0KLSAgICAgICAoInB5dGhvbi1zcGhpbngiICxw eXRob24tc3BoaW54LTEuMi4zKQ0KKyAgICAgYCgoInB5dGhvbi1jeXRob24iICxweXRob24tY3l0 aG9uKQ0KKyAgICAgICAoInB5dGhvbi1ub3NlIiAscHl0aG9uLW5vc2UpDQorICAgICAgICgicHl0 aG9uLXNwaGlueCIgLHB5dGhvbi1zcGhpbngpDQogICAgICAgICgicHl0aG9uLW51bXB5ZG9jIiAs cHl0aG9uLW51bXB5ZG9jKQ0KICAgICAgICAoImdmb3J0cmFuIiAsZ2ZvcnRyYW4pDQotICAgICAg ICgidGV4bGl2ZSIgLHRleGxpdmUpDQogICAgICAgICgicGVybCIgLHBlcmwpKSkNCiAgICAgKG91 dHB1dHMgJygib3V0IiAiZG9jIikpDQogICAgIChhcmd1bWVudHMNCiAgICAgIGAoIzpwaGFzZXMN CiAgICAgICAgKG1vZGlmeS1waGFzZXMgJXN0YW5kYXJkLXBoYXNlcw0KLSAgICAgICAgIChhZGQt YWZ0ZXIgJ3VucGFjayAnZml4LXRlc3RzDQotICAgICAgICAgICAobGFtYmRhIF8NCi0gICAgICAg ICAgICAgKHN1YnN0aXR1dGUqICJzY2lweS9pbnRlZ3JhdGUvdGVzdHMvdGVzdF9xdWFkcGFjay5w eSINCi0gICAgICAgICAgICAgICAoKCJsaWJtLnNvIikgImxpYm0uc28uNiIpKQ0KLSAgICAgICAg ICAgICAjdCkpDQogICAgICAgICAgKGFkZC1iZWZvcmUgJ2J1aWxkICdjb25maWd1cmUtb3BlbmJs YXMNCiAgICAgICAgICAgIChsYW1iZGEqICgjOmtleSBpbnB1dHMgIzphbGxvdy1vdGhlci1rZXlz KQ0KICAgICAgICAgICAgICAoY2FsbC13aXRoLW91dHB1dC1maWxlICJzaXRlLmNmZyINCkBAIC00 MTAyLDQwICs0MDk3LDQ0IEBAIGF0bGFzX2xpYnMgPSBvcGVuYmxhcw0KICAgICAgICAgICAgICAg ICAgICAgICAgICAoYXNzb2MtcmVmIGlucHV0cyAib3BlbmJsYXMiKQ0KICAgICAgICAgICAgICAg ICAgICAgICAgICAoYXNzb2MtcmVmIGlucHV0cyAib3BlbmJsYXMiKSkpKQ0KICAgICAgICAgICAg ICAjdCkpDQotICAgICAgICAgICAoZGVsZXRlICdjaGVjaykNCi0gICAgICAgICAgIChhZGQtYWZ0 ZXIgJ2luc3RhbGwgJ2luc3RhbGwtZG9jDQotICAgICAgICAgICAgIChsYW1iZGEqICgjOmtleSBp bnB1dHMgb3V0cHV0cyAjOmFsbG93LW90aGVyLWtleXMpDQotICAgICAgICAgICAgICAgKGxldCog KChkYXRhIChzdHJpbmctYXBwZW5kIChhc3NvYy1yZWYgb3V0cHV0cyAiZG9jIikgIi9zaGFyZSIp KQ0KLSAgICAgICAgICAgICAgICAgICAgICAoZG9jIChzdHJpbmctYXBwZW5kIGRhdGEgIi9kb2Mv IiAsbmFtZSAiLSIgLHZlcnNpb24pKQ0KLSAgICAgICAgICAgICAgICAgICAgICAoaHRtbCAoc3Ry aW5nLWFwcGVuZCBkb2MgIi9odG1sIikpDQotICAgICAgICAgICAgICAgICAgICAgIChweXZlciAs KHN0cmluZy1hcHBlbmQgIlBZVkVSPSIpKSkNCi0gICAgICAgICAgICAgICAgIDs7IE1ha2UgaW5z dGFsbGVkIHBhY2thZ2UgYXZhaWxhYmxlIGZvciBidWlsZGluZyB0aGUNCi0gICAgICAgICAgICAg ICAgIDs7IGRvY3VtZW50YXRpb24NCi0gICAgICAgICAgICAgICAgIChhZGQtaW5zdGFsbGVkLXB5 dGhvbnBhdGggaW5wdXRzIG91dHB1dHMpDQotICAgICAgICAgICAgICAgICAod2l0aC1kaXJlY3Rv cnktZXhjdXJzaW9uICJkb2MiDQotICAgICAgICAgICAgICAgICAgIDs7IEZpeCBnZW5lcmF0aW9u IG9mIGltYWdlcyBmb3IgbWF0aGVtYXRpY2FsIGV4cHJlc3Npb25zLg0KLSAgICAgICAgICAgICAg ICAgICAoc3Vic3RpdHV0ZSogKGZpbmQtZmlsZXMgInNvdXJjZSIgImNvbmZcXC5weSIpDQotICAg ICAgICAgICAgICAgICAgICAgKCgicG5nbWF0aF91c2VfcHJldmlldyA9IFRydWUiKQ0KLSAgICAg ICAgICAgICAgICAgICAgICAicG5nbWF0aF91c2VfcHJldmlldyA9IEZhbHNlIikpDQotICAgICAg ICAgICAgICAgICAgIChta2Rpci1wIGh0bWwpDQotICAgICAgICAgICAgICAgICAgIChzeXN0ZW0q ICJtYWtlIiAiaHRtbCIgcHl2ZXIpDQotICAgICAgICAgICAgICAgICAgIChzeXN0ZW0qICJtYWtl IiAibGF0ZXgiICJQQVBFUj1hNCIgcHl2ZXIpDQotICAgICAgICAgICAgICAgICAgIChzeXN0ZW0q ICJtYWtlIiAiLUMiICJidWlsZC9sYXRleCIgImFsbC1wZGYiICJQQVBFUj1hNCIgcHl2ZXIpDQot ICAgICAgICAgICAgICAgICAgIChjb3B5LWZpbGUgImJ1aWxkL2xhdGV4L3NjaXB5LXJlZi5wZGYi DQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgZG9jICIvc2Np cHktcmVmLnBkZiIpKQ0KLSAgICAgICAgICAgICAgICAgICAod2l0aC1kaXJlY3RvcnktZXhjdXJz aW9uICJidWlsZC9odG1sIg0KLSAgICAgICAgICAgICAgICAgICAgIChmb3ItZWFjaCAobGFtYmRh IChmaWxlKQ0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChsZXQqICgoZGlyIChk aXJuYW1lIGZpbGUpKQ0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAo dGd0LWRpciAoc3RyaW5nLWFwcGVuZCBodG1sICIvIiBkaXIpKSkNCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIChpbnN0YWxsLWZpbGUgZmlsZSBodG1sKSkpDQotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIChmaW5kLWZpbGVzICIuIiAiLioiKSkpKQ0KLSAgICAgICAg ICAgICAgICAgI3QpKSkNCi0gICAgICAgICAgIChhZGQtYWZ0ZXIgJ2luc3RhbGwtZG9jICdjaGVj aw0KLSAgICAgICAgICAgICAobGFtYmRhIF8NCi0gICAgICAgICAgICAgICA7OyBUZXN0cyBjYW4g b25seSBiZSBydW4gYWZ0ZXIgdGhlIGxpYnJhcnkgaGFzIGJlZW4gaW5zdGFsbGVkIGFuZCBub3QN Ci0gICAgICAgICAgICAgICA7OyB3aXRoaW4gdGhlIHNvdXJjZSBkaXJlY3RvcnkuDQotICAgICAg ICAgICAgICAgKHdpdGgtZGlyZWN0b3J5LWV4Y3Vyc2lvbiAiL3RtcCINCi0gICAgICAgICAgICAg ICAgICh6ZXJvPyAoc3lzdGVtKiAicHl0aG9uIiAiLWMiICJpbXBvcnQgc2NpcHk7IHNjaXB5LnRl c3QoKSIpKSkpKSkpKQ0KKyAgICAgICAgIChhZGQtYWZ0ZXIgJ2luc3RhbGwgJ2luc3RhbGwtZG9j DQorICAgICAgICAgICAobGFtYmRhKiAoIzprZXkgaW5wdXRzIG91dHB1dHMgIzphbGxvdy1vdGhl ci1rZXlzKQ0KKyAgICAgICAgICAgICAobGV0KiAoKGRhdGEgKHN0cmluZy1hcHBlbmQgKGFzc29j LXJlZiBvdXRwdXRzICJkb2MiKSAiL3NoYXJlIikpDQorICAgICAgICAgICAgICAgICAgICAoZG9j IChzdHJpbmctYXBwZW5kIGRhdGEgIi9kb2MvIiAsbmFtZSAiLSIgLHZlcnNpb24pKQ0KKyAgICAg ICAgICAgICAgICAgICAgKGh0bWwgKHN0cmluZy1hcHBlbmQgZG9jICIvaHRtbCIpKQ0KKyAgICAg ICAgICAgICAgICAgICAgKHB5dmVyICwoc3RyaW5nLWFwcGVuZCAiUFlWRVI9IikpKQ0KKyAgICAg ICAgICAgICAgIDs7IE1ha2UgaW5zdGFsbGVkIHBhY2thZ2UgYXZhaWxhYmxlIGZvciBidWlsZGlu ZyB0aGUNCisgICAgICAgICAgICAgICA7OyBkb2N1bWVudGF0aW9uDQorICAgICAgICAgICAgICAg KGFkZC1pbnN0YWxsZWQtcHl0aG9ucGF0aCBpbnB1dHMgb3V0cHV0cykNCisgICAgICAgICAgICAg ICAod2l0aC1kaXJlY3RvcnktZXhjdXJzaW9uICJkb2MiDQorICAgICAgICAgICAgICAgICA7OyBG aXggZ2VuZXJhdGlvbiBvZiBpbWFnZXMgZm9yIG1hdGhlbWF0aWNhbCBleHByZXNzaW9ucy4NCisg ICAgICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAoZmluZC1maWxlcyAic291cmNlIiAiY29uZlxc LnB5IikNCisgICAgICAgICAgICAgICAgICAgKCgicG5nbWF0aF91c2VfcHJldmlldyA9IFRydWUi KQ0KKyAgICAgICAgICAgICAgICAgICAgInBuZ21hdGhfdXNlX3ByZXZpZXcgPSBGYWxzZSIpKQ0K KyAgICAgICAgICAgICAgICAgKG1rZGlyLXAgaHRtbCkNCisgICAgICAgICAgICAgICAgIChzeXN0 ZW0qICJtYWtlIiAiaHRtbCIgcHl2ZXIpDQorICAgICAgICAgICAgICAgICAod2l0aC1kaXJlY3Rv cnktZXhjdXJzaW9uICJidWlsZC9odG1sIg0KKyAgICAgICAgICAgICAgICAgICAoZm9yLWVhY2gg KGxhbWJkYSAoZmlsZSkNCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGxldCogKChk aXIgKGRpcm5hbWUgZmlsZSkpDQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAodGd0LWRpciAoc3RyaW5nLWFwcGVuZCBodG1sICIvIiBkaXIpKSkNCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAoaW5zdGFsbC1maWxlIGZpbGUgaHRtbCkpKQ0KKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKGZpbmQtZmlsZXMgIi4iICIuKiIpKSkpKQ0KKyAgICAgICAg ICAgICAjdCkpDQorICAgICAgICAgKGFkZC1hZnRlciAndW5wYWNrICdmaXgtdGVzdHMNCisgICAg ICAgICAgIChsYW1iZGEgXw0KKyAgICAgICAgICAgICAoc3Vic3RpdHV0ZSogInNjaXB5L2ludGVn cmF0ZS90ZXN0cy90ZXN0X3F1YWRwYWNrLnB5Ig0KKyAgICAgICAgICAgICAgICgoImxpYm0uc28i KSAibGlibS5zby42IikpDQorICAgICAgICAgICAgICN0KSkNCisgICAgICAgICAgIDs7IFRlc3Rz IGNhbiBvbmx5IGJlIHJ1biBhZnRlciB0aGUgbGlicmFyeSBoYXMgYmVlbiBpbnN0YWxsZWQgYW5k IG5vdA0KKyAgICAgICAgICAgOzsgd2l0aGluIHRoZSBzb3VyY2UgZGlyZWN0b3J5Lg0KKyAgICAg ICAgIChkZWxldGUgJ2NoZWNrKQ0KKyAgICAgICAgIChhZGQtYWZ0ZXIgJ2luc3RhbGwgJ2NoZWNr DQorICAgICAgICAgICAobGFtYmRhKiAoIzprZXkgaW5wdXRzIG91dHB1dHMgIzphbGxvdy1vdGhl ci1rZXlzKQ0KKyAgICAgICAgICAgICAoYWRkLWluc3RhbGxlZC1weXRob25wYXRoIGlucHV0cyBv dXRwdXRzKQ0KKyAgICAgICAgICAgICAod2l0aC1kaXJlY3RvcnktZXhjdXJzaW9uICIvdG1wIg0K KyAgICAgICAgICAgICAgICh6ZXJvPyAoc3lzdGVtKiAicHl0aG9uIiAiLWMiDQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICJpbXBvcnQgc2NpcHk7IHNjaXB5LnRlc3QoJ2Z1bGwnKSIp KSkNCisgICAgICAgICAgICAgI3QpKSkpKQ0KICAgICAoaG9tZS1wYWdlICJodHRwOi8vd3d3LnNj aXB5Lm9yZy8iKQ0KICAgICAoc3lub3BzaXMgIlRoZSBTY2lweSBsaWJyYXJ5IHByb3ZpZGVzIGVm ZmljaWVudCBudW1lcmljYWwgcm91dGluZXMiKQ0KICAgICAoZGVzY3JpcHRpb24gIlRoZSBTY2lQ eSBsaWJyYXJ5IGlzIG9uZSBvZiB0aGUgY29yZSBwYWNrYWdlcyB0aGF0IG1ha2UgdXANCkBAIC00 MTQ1LDE1ICs0MTQ0LDggQEAgcm91dGluZXMgc3VjaCBhcyByb3V0aW5lcyBmb3IgbnVtZXJpY2Fs IGludGVncmF0aW9uIGFuZCBvcHRpbWl6YXRpb24uIikNCiAgICAgKGxpY2Vuc2UgbGljZW5zZTpi c2QtMykpKQ0KIA0KIChkZWZpbmUtcHVibGljIHB5dGhvbjItc2NpcHkNCi0gIChsZXQgKChzY2lw eSAocGFja2FnZS13aXRoLXB5dGhvbjINCi0gICAgICAgICAgICAgICAgKHN0cmlwLXB5dGhvbjIt dmFyaWFudCBweXRob24tc2NpcHkpKSkpDQotICAgIChwYWNrYWdlIChpbmhlcml0IHNjaXB5KQ0K LSAgICAgICAgICAgICA7OyBNYWtlIHN1cmUgdG8gdXNlIHNwZWNpYWwgcGFja2FnZXMgZm9yIFB5 dGhvbiAyIGluc3RlYWQNCi0gICAgICAgICAgICAgOzsgb2YgdGhvc2UgYXV0b21hdGljYWxseSBy ZXdyaXR0ZW4gYnkgcGFja2FnZS13aXRoLXB5dGhvbjIuDQotICAgICAgICAgICAgIChuYXRpdmUt aW5wdXRzDQotICAgICAgICAgICAgICBgKCgicHl0aG9uMi1zcGhpbngiICxweXRob24yLXNwaGlu eC0xLjIuMykNCi0gICAgICAgICAgICAgICAgLEAoZm9sZCBhbGlzdC1kZWxldGUgKHBhY2thZ2Ut bmF0aXZlLWlucHV0cyBzY2lweSkNCi0gICAgICAgICAgICAgICAgICAgICAgICAnKCJweXRob24t c3BoaW54IikpKSkpKSkNCisgIChwYWNrYWdlLXdpdGgtcHl0aG9uMg0KKyAgIChzdHJpcC1weXRo b24yLXZhcmlhbnQgcHl0aG9uLXNjaXB5KSkpDQogDQogKGRlZmluZS1wdWJsaWMgcHl0aG9uLXNv Y2tzaXB5LWJyYW5jaA0KICAgKHBhY2thZ2UNCi0tIA0KMi4xMS4xDQoNCg0KRnJvbSA0OTgyNzAz MWJiZWU4YzA2Yzg5ODI0Y2U1YzZhNzJmYWIzNjM1YjMxIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAw MQ0KRnJvbTogVGhvbWFzIERhbmNrYWVydCA8dGhvbWFzLmRhbmNrYWVydEBnbWFpbC5jb20+DQpE YXRlOiBTYXQsIDI1IEZlYiAyMDE3IDIzOjM1OjIyICswMTAwDQpTdWJqZWN0OiBbUEFUQ0ggOC84 XSBnbnU6IFJlbW92ZSBweXRob24tc3BoaW54LTEuMi4zLg0KDQoqIGdudS9wYWNrYWdlcy9weXRo b24uc2NtIChweXRob24tc3BoaW54LTEuMi4zLCBweXRob24yLXNwaGlueC0xLjIuMyk6IFJlbW92 ZSB2YXJpYWJsZXMuDQotLS0NCiBnbnUvcGFja2FnZXMvcHl0aG9uLnNjbSB8IDE4IC0tLS0tLS0t LS0tLS0tLS0tLQ0KIDEgZmlsZSBjaGFuZ2VkLCAxOCBkZWxldGlvbnMoLSkNCg0KZGlmZiAtLWdp dCBhL2dudS9wYWNrYWdlcy9weXRob24uc2NtIGIvZ251L3BhY2thZ2VzL3B5dGhvbi5zY20NCmlu ZGV4IDQwNGFjMzhlMy4uZTNmZmY0ODNiIDEwMDY0NA0KLS0tIGEvZ251L3BhY2thZ2VzL3B5dGhv bi5zY20NCisrKyBiL2dudS9wYWNrYWdlcy9weXRob24uc2NtDQpAQCAtMzAyOSwyNCArMzAyOSw2 IEBAIHNvdXJjZXMuIikNCiAgICAgICAocHJvcGFnYXRlZC1pbnB1dHMgYCgoInB5dGhvbjItcHl0 eiIgLHB5dGhvbjItcHl0eikNCiAgICAgICAgICAgICAgICAgICAgICAgICxAKHBhY2thZ2UtcHJv cGFnYXRlZC1pbnB1dHMgYmFzZSkpKSkpKQ0KIA0KLTs7IFRoaXMgaXMgbmVlZGVkIGZvciBweXRo b24tbWF0cGxvdGxpYkAxLjQgYW5kIHB5dGhvbi1zY2lweUAwLjE2LCBhdCBsZWFzdC4NCi07OyBU cnkgcmVtb3ZpbmcgdGhpcyB3aGVuIHRoZXkgYXJlIHVwZGF0ZWQuDQotKGRlZmluZS1wdWJsaWMg cHl0aG9uLXNwaGlueC0xLjIuMw0KLSAgKHBhY2thZ2UgKGluaGVyaXQgcHl0aG9uLXNwaGlueCkN Ci0gICAgICAgICAgICh2ZXJzaW9uICIxLjIuMyIpDQotICAgICAgICAgICAoc291cmNlIChvcmln aW4NCi0gICAgICAgICAgICAgICAgICAgICAobWV0aG9kIHVybC1mZXRjaCkNCi0gICAgICAgICAg ICAgICAgICAgICAodXJpIChweXBpLXVyaSAiU3BoaW54IiB2ZXJzaW9uKSkNCi0gICAgICAgICAg ICAgICAgICAgICAoc2hhMjU2DQotICAgICAgICAgICAgICAgICAgICAgIChiYXNlMzINCi0gICAg ICAgICAgICAgICAgICAgICAgICIwMTF4aXptM2pubWY0Y3ZzNWk2a2dmNmM1bm4wNDZoNzlpOGow dmQwZjI3eXc5ajNwNHdsIikpKSkNCi0gICAgICAgICAgIDs7IFhYWDogIidOb25lVHlwZScgb2Jq ZWN0IGhhcyBubyBhdHRyaWJ1dGUgJ3NwbGl0JyIuDQotICAgICAgICAgICAoYXJndW1lbnRzICco Izp0ZXN0cz8gI2YpKSkpDQotDQotKGRlZmluZS1wdWJsaWMgcHl0aG9uMi1zcGhpbngtMS4yLjMN Ci0gIChwYWNrYWdlIChpbmhlcml0IChwYWNrYWdlLXdpdGgtcHl0aG9uMg0KLSAgICAgICAgICAg ICAgICAgICAgIChzdHJpcC1weXRob24yLXZhcmlhbnQgcHl0aG9uLXNwaGlueC0xLjIuMykpKSkp DQotDQogKGRlZmluZS1wdWJsaWMgcHl0aG9uLXNwaGlueC1ydGQtdGhlbWUNCiAgIChwYWNrYWdl DQogICAgIChuYW1lICJweXRob24tc3BoaW54LXJ0ZC10aGVtZSIpDQotLSANCjIuMTEuMQ0KDQo= ----Next_Part(Thu_Mar__2_15_13_43_2017_513)---- From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH] Update scipy stack. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Mar 2017 09:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Thomas Danckaert Cc: 25834@debbugs.gnu.org, b.woodcroft@uq.edu.au Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148879088912573 (code B ref 25834); Mon, 06 Mar 2017 09:02:02 +0000 Received: (at 25834) by debbugs.gnu.org; 6 Mar 2017 09:01:29 +0000 Received: from localhost ([127.0.0.1]:41706 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ckoWH-0003Gj-M2 for submit@debbugs.gnu.org; Mon, 06 Mar 2017 04:01:29 -0500 Received: from dd1012.kasserver.com ([85.13.128.8]:44303) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ckoWE-0003GZ-J7 for 25834@debbugs.gnu.org; Mon, 06 Mar 2017 04:01:26 -0500 Received: from localhost (178.113.175.251.wireless.dyn.drei.com [178.113.175.251]) by dd1012.kasserver.com (Postfix) with ESMTPSA id 696C01CA1061; Mon, 6 Mar 2017 10:01:22 +0100 (CET) Date: Mon, 6 Mar 2017 10:01:21 +0100 From: Danny Milosavljevic Message-ID: <20170306100121.5590bfa8@scratchpost.org> In-Reply-To: <20170302.151343.231642285456771916.post@thomasdanckaert.be> References: <878tovhnvo.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <20170227.105436.886364398192522191.post@thomasdanckaert.be> <20170302.151343.231642285456771916.post@thomasdanckaert.be> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) 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 (/) Pushed python-scipy as 350932536a2e04bf4644cdad7ce2b91d8b12cd10 to master. Pushed python-testpath as b320f7bf06213087886d4f7fb12baccbc399f3e3 to master. Pushed python-colorspacious as 2aa6d3aeeb49f116aab2757b217cd25fab71d7d6 to master. Pushed python-ipython as 6d320eb0e320d6c9bcbca5fa9b5ffa7d1250bb8b to master. I'm not sure about splitting the documentation into extra packages so I didn't push those. Was that already discussed? From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH] Update scipy stack. Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Mar 2017 09:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: dannym@scratchpost.org Cc: 25834@debbugs.gnu.org, b.woodcroft@uq.edu.au Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148879280715588 (code B ref 25834); Mon, 06 Mar 2017 09:34:02 +0000 Received: (at 25834) by debbugs.gnu.org; 6 Mar 2017 09:33:27 +0000 Received: from localhost ([127.0.0.1]:41725 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ckp1D-00043M-2L for submit@debbugs.gnu.org; Mon, 06 Mar 2017 04:33:27 -0500 Received: from s02-out.spamexperts.axc.nl ([185.175.200.125]:41671) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ckp1B-000438-JV for 25834@debbugs.gnu.org; Mon, 06 Mar 2017 04:33:26 -0500 Received: from vserver42.axc.nl ([185.182.56.92]) by s02.spamexperts.axc.nl with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86) (envelope-from ) id 1ckp0z-0000n5-4X; Mon, 06 Mar 2017 10:33:16 +0100 Received: from mail.axc.nl ([159.253.0.157]:54014) by vserver42.axc.nl with esmtp (Exim 4.88) (envelope-from ) id 1ckp0p-0004w1-Hx; Mon, 06 Mar 2017 10:33:08 +0100 Date: Mon, 06 Mar 2017 10:32:54 +0100 (CET) Message-Id: <20170306.103254.1250108371165161377.post@thomasdanckaert.be> From: Thomas Danckaert In-Reply-To: <20170306100121.5590bfa8@scratchpost.org> References: <20170302.151343.231642285456771916.post@thomasdanckaert.be> <20170306100121.5590bfa8@scratchpost.org> X-Mailer: Mew version 6.7 on Emacs 25.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit PrimaryMX: Accepted email from trusted host. Hint: This skips spam scanning so make sure other host is not vulnerable X-Relay-Host: 159.253.0.157 X-Spam-Score: 0.0 (/) X-Spam-Report: Spam detection software, running on the system "vserver42.axc.nl", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Danny Milosavljevic Subject: Re: bug#25834: [PATCH] Update scipy stack. Date: Mon, 6 Mar 2017 10:01:21 +0100 > Pushed python-scipy as 350932536a2e04bf4644cdad7ce2b91d8b12cd10 to > master. > Pushed python-testpath as b320f7bf06213087886d4f7fb12baccbc399f3e3 > to master. > Pushed python-colorspacious as > 2aa6d3aeeb49f116aab2757b217cd25fab71d7d6 to master. > Pushed python-ipython as 6d320eb0e320d6c9bcbca5fa9b5ffa7d1250bb8b > to master. [...] Content analysis details: (0.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: gnu.org] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [159.253.0.157 listed in list.dnswl.org] SpamTally: Final spam score: 0 X-Originating-IP: 185.182.56.92 X-SpamExperts-Domain: vserver42.axc.nl X-SpamExperts-Username: 185.182.56.92 Authentication-Results: spamexperts.axc.nl; auth=pass smtp.auth=185.182.56.92@vserver42.axc.nl X-SpamExperts-Outgoing-Class: ham X-SpamExperts-Outgoing-Evidence: Combined (0.03) X-Recommended-Action: accept X-Filter-ID: s0sct1PQhAABKnZB5plbIaExX4b9HB97Y0LqBeziPXa8B5kabb+8+DRlCqSxA333/bPom7IVowNb jNmNSGjlJADpxEq2QWue0NVTi1XPmXej1KRrf1Y8eevl1lZRQAkHO76XSTAwtV4mg4i2ouCDa4AU hvIWAV5xUW/+gAh4vXoicpXLBJ9NiNQObUuGnkLtRcOb18WfxGyg6Om6u4YYm/YnilkpaeyDMPc2 Fv0EgLgvPRYKza70yK2TxRJHcdD+oEAP/to+02F3J4r01qcN199fxN2oReTDHAyOynaY0Cldue3r +qEeQYBWND7fDPGoUqYOv6lKxxeboK+YPP3g5J9Wyy39ARVu6lpph/EphEmSUaqSECP9/MJNMfS9 WPFvtKiR9oEdyOK7GnLP3Jw7nAFKpw6uarMIchUUKBPMSwq+4JuPx1txIimc74hAHIadNphVBjVf 5P+SlTb1ERcjFYbxR0PuC4wwYQTc8Sg/23VtqGjgyi5JHolhrWpNa9YQsl4SUWp4U8fCCSBjefGq te4ROxlmGgdR7QBaGWEQFYs+dvusjRV96oP1cmFb05OHyZAZLfpWinSu+danhtKvH9pAsaSpuQPS cbIWdeXhkZC4rAXOgWX2FBHgH187+EKv5hICVo92zvI9isesxBu4AK5YVcPPq3MXlUe9sP5+k0dp Y7f6EqR6zsgzOR3cDnOAx6r2UyEquOJ312nlohcIf0f/GiiVBZUI91hT4YqNwM06qQzLuCe/hQ3A 5i3Uw+OAbBH+DkNPnrywBHhKB8rPDBfx1bbfhyaO3VHMr4+RLj/ejVZe2CIQ4NKRrAu+ot9yoawp Wk4/Avf4ddNWXIeA/mXCw4B79dULiF06SdaL485A3lW0DVLNs0uKVQBFc4F2yEHETS2Gu0R39lyr 7CuCevU3Is2RjtGf2hEy7Yg8S6A= X-Report-Abuse-To: spam@s01.spamexperts.axc.nl X-Spam-Score: -0.0 (/) 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 (/) From: Danny Milosavljevic Subject: Re: bug#25834: [PATCH] Update scipy stack. Date: Mon, 6 Mar 2017 10:01:21 +0100 > Pushed python-scipy as 350932536a2e04bf4644cdad7ce2b91d8b12cd10 to > master. > Pushed python-testpath as b320f7bf06213087886d4f7fb12baccbc399f3e3 > to master. > Pushed python-colorspacious as > 2aa6d3aeeb49f116aab2757b217cd25fab71d7d6 to master. > Pushed python-ipython as 6d320eb0e320d6c9bcbca5fa9b5ffa7d1250bb8b > to master. Thanks! > I'm not sure about splitting the documentation into extra packages > so I didn't push those. Was that already discussed? Ricardo agreed that separate documentation packages are ok if we can avoid a large number of bootstrap packages: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25834#8 Thomas From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH] Update scipy stack. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Mar 2017 13:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Danny Milosavljevic , Thomas Danckaert Cc: 25834@debbugs.gnu.org Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148880673012009 (code B ref 25834); Mon, 06 Mar 2017 13:26:02 +0000 Received: (at 25834) by debbugs.gnu.org; 6 Mar 2017 13:25:30 +0000 Received: from localhost ([127.0.0.1]:41883 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cksdm-00037d-AF for submit@debbugs.gnu.org; Mon, 06 Mar 2017 08:25:30 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:57641) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cksdk-00037U-EW for 25834@debbugs.gnu.org; Mon, 06 Mar 2017 08:25:28 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 432E320AD9; Mon, 6 Mar 2017 08:25:28 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 06 Mar 2017 08:25:28 -0500 DKIM-Signature: v=1; a=rsa-sha1; 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=mesmtp; bh=BJiJgDpeShz7hJ6F/t3mt0kF9Vc=; b=sW15kZ Wcut1LIx6ARVwXIfUxqG45VbMjPyraIDSg5NM+2/K6JC2+Oh/0wax21EcA3RSatN bQeuZ95AXF7JhTQNB8pifcH5a9cEYxyZfMCj841HQVYXr+sLZLux6T2tufxqA3yi +K+qZ0G8h0/z1NuP9/unuu1ww1+PJeOFtSYao= DKIM-Signature: v=1; a=rsa-sha1; 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=smtpout; bh=BJiJgDpeShz7hJ 6F/t3mt0kF9Vc=; b=bYesDq/e9tbAup3pJ79NO/DUhiyA3SKhKvb3plmQhcYjJB NQ7+iUhzkw39EnUEDfAEkPTd7hqgM2c/hnWzRrjtVi/kq3GlcXuKXrJUyv/I+CQK frwAKeMco64AkPdWlbXbIIdSLI3GZSr6P2mBAzh6RypbWrxChPudafWmLjKJs= X-ME-Sender: X-Sasl-enc: J2OQr7j2f4Q1YXu152aOz2Fltfm7yJG4t5ixxYgNaU+/ 1488806727 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id CDA467E65C; Mon, 6 Mar 2017 08:25:27 -0500 (EST) From: Marius Bakke In-Reply-To: <20170306100121.5590bfa8@scratchpost.org> References: <878tovhnvo.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <20170227.105436.886364398192522191.post@thomasdanckaert.be> <20170302.151343.231642285456771916.post@thomasdanckaert.be> <20170306100121.5590bfa8@scratchpost.org> User-Agent: Notmuch/0.23.7 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Mon, 06 Mar 2017 14:25:26 +0100 Message-ID: <87shmq4jw9.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) 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 Danny Milosavljevic writes: > Pushed python-scipy as 350932536a2e04bf4644cdad7ce2b91d8b12cd10 to master. > Pushed python-testpath as b320f7bf06213087886d4f7fb12baccbc399f3e3 to master. > Pushed python-colorspacious as 2aa6d3aeeb49f116aab2757b217cd25fab71d7d6 to master. > Pushed python-ipython as 6d320eb0e320d6c9bcbca5fa9b5ffa7d1250bb8b to master. Thanks for pushing these! Please pay attention during the 'check' phase of Python packages -- both colorspacious and the shutils backport prints 'Ran 0 tests in...'. Usually this is a sign that they require some other command than 'python setup.py test', which is the default of python-build-system. I pushed a fix for python2-backports-shutil-get-terminal-size that I had in my queue, but it would be nice to enable tests on colorspacious as well. Any takers? :) > I'm not sure about splitting the documentation into extra packages so > I didn't push those. Was that already discussed? This approach works around a bootstrapping issue, and also a circular dependency in later versions. I'm currently building these and will push them later today, unless there are problems (or someone beats me to it :)) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAli9Y0YACgkQoqBt8qM6 VPqoGAf+OrFZ0SguxhpmwXYX2QzRZrG7cEVTD9HTN0MaZ4QceCJF8eBln5CeNA1e GDVb2gdWEiYYl4ZGgrTzwfJ/2XQ1OKOJKSUgoTNRQHGdKne/mtF4NKEoW9S8NrJl B4kgfdPt5Ge5NzcIzt7asj2R34JV5VnVaJfjgLUjhFpJvN8/j1jfHyYb8/HayzRO 7bYQBnJfidw/p3Olvtr93fHg3CSX0ZoKV027mF6R1UWd6PVBrk8mq+4c5V3L/93f WcMB+zeV9jcsQsZq8HTOqZ6NpblZoZzZohUOP+94iVEbiDg/kskVx6wmOWoQPC29 wapjZygVtTgGAB0mFYX5WKQ/7KtTEA== =G7bL -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH] Update scipy stack. Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Mar 2017 14:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: mbakke@fastmail.com Cc: dannym@scratchpost.org, 25834@debbugs.gnu.org Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148881120719271 (code B ref 25834); Mon, 06 Mar 2017 14:41:01 +0000 Received: (at 25834) by debbugs.gnu.org; 6 Mar 2017 14:40:07 +0000 Received: from localhost ([127.0.0.1]:41943 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cktny-00050l-T4 for submit@debbugs.gnu.org; Mon, 06 Mar 2017 09:40:07 -0500 Received: from s02-out.spamexperts.axc.nl ([185.175.200.125]:60997) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cktnx-00050C-Dl for 25834@debbugs.gnu.org; Mon, 06 Mar 2017 09:40:06 -0500 Received: from vserver42.axc.nl ([185.182.56.92]) by s02.spamexperts.axc.nl with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86) (envelope-from ) id 1cktnm-0004gI-A1; Mon, 06 Mar 2017 15:39:54 +0100 Received: from mail.axc.nl ([159.253.0.157]:50951) by vserver42.axc.nl with esmtp (Exim 4.88) (envelope-from ) id 1cktne-0002tV-5Z; Mon, 06 Mar 2017 15:39:53 +0100 Date: Mon, 06 Mar 2017 15:39:39 +0100 (CET) Message-Id: <20170306.153939.290573923111350891.post@thomasdanckaert.be> From: Thomas Danckaert In-Reply-To: <87shmq4jw9.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <20170302.151343.231642285456771916.post@thomasdanckaert.be> <20170306100121.5590bfa8@scratchpost.org> <87shmq4jw9.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> X-Mailer: Mew version 6.7 on Emacs 25.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="--Next_Part(Mon_Mar__6_15_39_39_2017_206)--" Content-Transfer-Encoding: 7bit PrimaryMX: Accepted email from trusted host. Hint: This skips spam scanning so make sure other host is not vulnerable X-Relay-Host: 159.253.0.157 X-Spam-Score: 0.0 (/) X-Spam-Report: Spam detection software, running on the system "vserver42.axc.nl", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Marius Bakke Subject: Re: bug#25834: [PATCH] Update scipy stack. Date: Mon, 06 Mar 2017 14:25:26 +0100 > Please pay attention during the 'check' phase of Python packages -- > both > colorspacious and the shutils backport prints 'Ran 0 tests in...'. > Usually this is a sign that they require some other command than > 'python > setup.py test', which is the default of python-build-system. > > I pushed a fix for python2-backports-shutil-get-terminal-size that > I had > in my queue, but it would be nice to enable tests on colorspacious > as > well. Any takers? :) [...] Content analysis details: (0.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: github.com] 0.0 RCVD_IN_DNSWL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to DNSWL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [159.253.0.157 listed in list.dnswl.org] SpamTally: Final spam score: 0 X-Originating-IP: 185.182.56.92 X-SpamExperts-Domain: vserver42.axc.nl X-SpamExperts-Username: 185.182.56.92 Authentication-Results: spamexperts.axc.nl; auth=pass smtp.auth=185.182.56.92@vserver42.axc.nl X-SpamExperts-Outgoing-Class: ham X-SpamExperts-Outgoing-Evidence: Combined (0.01) X-Recommended-Action: accept X-Filter-ID: s0sct1PQhAABKnZB5plbIaExX4b9HB97Y0LqBeziPXa8B5kabb+8+DRlCqSxA333/bPom7IVowNb jNmNSGjlJADpxEq2QWue0NVTi1XPmXej1KRrf1Y8eevl1lZRQAkHO76XSTAwtV4mg4i2ouCDa4AU hvIWAV5xUW/+gAh4vXq9ko6wMFwOaLrisbcryltjRcOb18WfxGyg6Om6u4YYm2kFY0FJsIJq6djg ZKvi14kvPRYKza70yK2TxRJHcdD+oEAP/to+02F3J4r01qcN199fxN2oReTDHAyOynaY0Cldue3r +qEeQYBWND7fDPGoUqYOv6lKxxeboK+YPP3g5J9Wyy39ARVu6lpph/EphEmSUaqSECP9/MJNMfS9 WPFvtKiR9oEdyOK7GnLP3Jw7nAFKpw6uarMIchUUKBPMSwp4NuvOrtWLDlbb57C7iRsBF/Ckqm++ RvDE1FwAYUuCFYbxR0PuC4wwYQTc8Sg/23VtqGjgyi5JHolhrWpNa9YQsl4SUWp4U8fCCSBjefGq te4ROxlmGgdR7QBaGWEQFYs+dvusjRV96oP1cmFb05OHyZAZLfpWinSu+danhtKvH9pAsaSpuQPS cbIWdeXhkZC4rAXOgWX2FBHgH187+EKv5hICVo92zvI9isesxBu4AK5YVcPPq3MXlUe9sP5+k0dp Y7f6EqR6zsgzOR3cDnOA6pehlgVgwpzbEaSnS2P12qSMI7QobjrD+AtTiuOYg946qQzLuCe/hQ3A 5i3Uw+OAbBH+DkNPnrywBHhKB8rPDBfx1bbfhyaO3VHMr4+RLj/ejVZe2CIQ4NKRrAu+ot9yn/U0 W9muKcSXIMr2FB6Q1Q+HXeKEQnSR48UqYuXSm53CiP+fs4K1tNGY+8GSj8EOgA+gyQHCVTKTJNjj 7SXfkAqkcNlpCQNy+ZxP03kDw64= X-Report-Abuse-To: spam@s01.spamexperts.axc.nl X-Spam-Score: -0.0 (/) 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 (/) ----Next_Part(Mon_Mar__6_15_39_39_2017_206)-- Content-Type: Text/Plain; charset=utf-8; format=flowed Content-Transfer-Encoding: base64 RnJvbTogTWFyaXVzIEJha2tlIDxtYmFra2VAZmFzdG1haWwuY29tPg0KU3ViamVjdDogUmU6IGJ1 ZyMyNTgzNDogW1BBVENIXSBVcGRhdGUgc2NpcHkgc3RhY2suDQpEYXRlOiBNb24sIDA2IE1hciAy MDE3IDE0OjI1OjI2ICswMTAwDQoNCj4gUGxlYXNlIHBheSBhdHRlbnRpb24gZHVyaW5nIHRoZSAn Y2hlY2snIHBoYXNlIG9mIFB5dGhvbiBwYWNrYWdlcyAtLSANCj4gYm90aA0KPiBjb2xvcnNwYWNp b3VzIGFuZCB0aGUgc2h1dGlscyBiYWNrcG9ydCBwcmludHMgJ1JhbiAwIHRlc3RzIGluLi4uJy4N Cj4gVXN1YWxseSB0aGlzIGlzIGEgc2lnbiB0aGF0IHRoZXkgcmVxdWlyZSBzb21lIG90aGVyIGNv bW1hbmQgdGhhbiANCj4gJ3B5dGhvbg0KPiBzZXR1cC5weSB0ZXN0Jywgd2hpY2ggaXMgdGhlIGRl ZmF1bHQgb2YgcHl0aG9uLWJ1aWxkLXN5c3RlbS4NCj4NCj4gSSBwdXNoZWQgYSBmaXggZm9yIHB5 dGhvbjItYmFja3BvcnRzLXNodXRpbC1nZXQtdGVybWluYWwtc2l6ZSB0aGF0IA0KPiBJIGhhZA0K PiBpbiBteSBxdWV1ZSwgYnV0IGl0IHdvdWxkIGJlIG5pY2UgdG8gZW5hYmxlIHRlc3RzIG9uIGNv bG9yc3BhY2lvdXMgDQo+IGFzDQo+IHdlbGwuIEFueSB0YWtlcnM/IDopDQoNCkkndmUgYXR0YWNo ZWQgYW4gYXR0ZW1wdCAobm93IHJ1bnMgMzQgdGVzdHMpLiAgQW0gSSByaWdodCB0aGF0IA0KcnVu bmluZyDigJxub3NldGVzdHMgY29sb3JzcGFjaW91cy8qLnB54oCdIGlzIHRoZSBvbmx5IHdheSB0 byBtYWtlIGl0IHJ1biANCnRoZSB0ZXN0cyBpbiB0aGlzIGNhc2U/DQoNCmNoZWVycywNCg0KVGhv bWFzDQo= ----Next_Part(Mon_Mar__6_15_39_39_2017_206)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0001-gnu-python-colorspacious-Run-tests.patch" >From 6714863034f9522512cdf2d45fef402eda00df7c Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Mon, 6 Mar 2017 15:33:34 +0100 Subject: [PATCH] gnu: python-colorspacious: Run tests. * gnu/packages/python.scm (python-colorspacious) [native-inputs]: Add python-nose. [arguments]: Add custom 'check phase which runs nosetests. --- gnu/packages/python.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e94aa812b..fa74d1c6f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3841,6 +3841,16 @@ To address this and enable easy cycling over arbitrary @code{kwargs}, the (build-system python-build-system) (propagated-inputs `(("python-numpy" ,python-numpy))) + (native-inputs + `(("python-nose" ,python-nose))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ (zero? + (apply system* + `("nosetests" + ,@(find-files "colorspacious" ".*\\.py"))))))))) (home-page "https://github.com/njsmith/colorspacious") (synopsis "Python library for colorspace conversions") (description "@code{colorspacious} is a Python library that lets you -- 2.11.1 ----Next_Part(Mon_Mar__6_15_39_39_2017_206)---- From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH] Update scipy stack. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Mar 2017 14:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Thomas Danckaert , b.woodcroft@uq.edu.au Cc: 25834@debbugs.gnu.org Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148881167820007 (code B ref 25834); Mon, 06 Mar 2017 14:48:02 +0000 Received: (at 25834) by debbugs.gnu.org; 6 Mar 2017 14:47:58 +0000 Received: from localhost ([127.0.0.1]:41961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cktva-0005Cd-Be for submit@debbugs.gnu.org; Mon, 06 Mar 2017 09:47:58 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:33777) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cktvY-0005CV-IR for 25834@debbugs.gnu.org; Mon, 06 Mar 2017 09:47:57 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id E6A432068D; Mon, 6 Mar 2017 09:47:54 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 06 Mar 2017 09:47:54 -0500 DKIM-Signature: v=1; a=rsa-sha1; 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=mesmtp; bh=Fdf35FzDcXpKUiCJVxU1sk061cA=; b=fxObnM LtOM5S2YLseHFIJLtEF87TcoUAkVPzT8PwkClatIQ/dI2JUSQwaTEv87I/xMkWk1 1LHIwNgeVRkslPci3i/x8XKIpc+QEGyIoZW/ShUJy3gxihXzZWp8mxwk1G+j8sVE vrTpbKsqaTyIFPPbt1VdnE6s//sz65su4G5GA= DKIM-Signature: v=1; a=rsa-sha1; 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=smtpout; bh=Fdf35FzDcXpKUi CJVxU1sk061cA=; b=gVhkaB1J9Fa1JT/CZiYpRexfLLjV7ubdonBVvfI7eVktLv fiCmqDnc78XjfoxOQX4PAH2WsuqZS4+ypjb6qbkz8eSQvQepPiH/aSIrh/ZbkFgh P5Pq80i3BVKJ1hy3EluA3J9fR8cKW4j1f2if+Z+YMqHjRaeBLWpQcC9HZZzhs= X-ME-Sender: X-Sasl-enc: UY6MI3jA/AWPdgsKtlPthee+xRsp8LPfK9+syMIMitpI 1488811674 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 84CC17E5E4; Mon, 6 Mar 2017 09:47:54 -0500 (EST) From: Marius Bakke In-Reply-To: <20170302.151343.231642285456771916.post@thomasdanckaert.be> References: <878tovhnvo.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <20170227.105436.886364398192522191.post@thomasdanckaert.be> <20170302.151343.231642285456771916.post@thomasdanckaert.be> User-Agent: Notmuch/0.23.7 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Mon, 06 Mar 2017 15:47:52 +0100 Message-ID: <87mvcy4g2v.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) 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 Hi Thomas! Thanks again for taking this on, and for your patience! The patches LGTM overall, but I have a couple of comments/questions. Thomas Danckaert writes: > From b73e26ce12dc2fd0b38937bc615f5071556dfd5a Mon Sep 17 00:00:00 2001 > From: Thomas Danckaert > Date: Tue, 21 Feb 2017 20:28:27 +0100 > Subject: [PATCH 3/8] gnu: python-numpy: Update to 1.12.0. > > * gnu/packages/python.scm (python-numpy): Update to 1.12.0. > [source]: Use github instead of sourceforge. > [native-inputs]: Add python-cython. > > To simplify the handling of dependency cycles (numpy documentation depe= nds > on matplotlib, which depends on numpy), we split out the documentation = into > a separate package: > (python-numpy-bootstrap, python2-numpy-bootstrap): Remove variables. > (python-numpy-documentation, python2-numpy-documentation): New variable= s. [...] > --- > gnu/packages/python.scm | 148 +++++++++++++++++++++++++++---------------= ------ > 1 file changed, 82 insertions(+), 66 deletions(-) > > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm > index c449ccb6e..d296ee1d9 100644 > --- a/gnu/packages/python.scm > +++ b/gnu/packages/python.scm > @@ -3402,24 +3402,26 @@ between language specification and implementation= aspects.") >=20=20 > ;; This version of numpy is missing the documentation and is only used to > ;; build matplotlib which is required to build numpy's documentation. Note to self: Update this comment. > -(define python-numpy-bootstrap > +(define-public python-numpy > (package > - (name "python-numpy-bootstrap") > - (version "1.10.4") > + (name "python-numpy") > + (version "1.12.0") > (source > (origin > (method url-fetch) > - (uri (string-append "mirror://sourceforge/numpy/NumPy/" version > - "/numpy-" version ".tar.gz")) > + (uri (string-append > + "https://github.com/numpy/numpy/archive/v" version ".tar.gz= ")) > + (file-name (string-append name "-" version ".tar.gz")) > (sha256 > (base32 > - "1bjjhvncraka5s6i4lg644jrxij6bvycxy7an20gcz3a0m11iygp")))) > + "025d4j4aakcp8w5i5diqh812cbbjgac7jszx1j56ivrbi1i8vv7d")))) > (build-system python-build-system) > (inputs > `(("openblas" ,openblas) > ("lapack" ,lapack))) > (native-inputs > - `(("python-nose" ,python-nose) > + `(("python-cython" ,python-cython) > + ("python-nose" ,python-nose) > ("gfortran" ,gfortran))) > (arguments > `(#:phases > @@ -3468,8 +3470,8 @@ and Fortran code, useful linear algebra, Fourier tr= ansform, and random number > capabilities.") > (license license:bsd-3))) >=20=20 > -(define python2-numpy-bootstrap > - (package-with-python2 python-numpy-bootstrap)) > +(define-public python2-numpy > + (package-with-python2 python-numpy)) >=20=20 > (define-public python-munch > (package > @@ -3526,69 +3528,83 @@ Models, is a program for performing both single-S= NP and SNP-set genome-wide > association studies (GWAS) on extremely large data sets.") > (license license:asl2.0))) >=20=20 > -(define-public python-numpy > - (package (inherit python-numpy-bootstrap) > - (name "python-numpy") > - (outputs '("out" "doc")) > - (inputs > - `(("which" ,which) > - ,@(package-inputs python-numpy-bootstrap))) > - (propagated-inputs > - `(("python-matplotlib" ,python-matplotlib) > - ("python-pyparsing" ,python-pyparsing) > - ,@(package-propagated-inputs python-numpy-bootstrap))) > +(define-public python-numpy-documentation > + (package > + (name "python-numpy-documentation") > + (version (package-version python-numpy)) > + (source (package-source python-numpy)) > + (build-system python-build-system) > (native-inputs > - `(("pkg-config" ,pkg-config) > + `(("python-matplotlib" ,python-matplotlib) > + ("python-numpy" ,python-numpy) > + ("pkg-config" ,pkg-config) > ("python-sphinx" ,python-sphinx) > ("python-numpydoc" ,python-numpydoc) > ("texlive" ,texlive) > ("texinfo" ,texinfo) > ("perl" ,perl) > - ,@(package-native-inputs python-numpy-bootstrap))) > - (arguments > - `(,@(substitute-keyword-arguments > - (package-arguments python-numpy-bootstrap) > - ((#:phases phases) > - `(alist-cons-after > - 'install 'install-doc > - (lambda* (#:key inputs outputs #:allow-other-keys) > - ;; Make installed package available for building the > - ;; documentation > - (add-installed-pythonpath inputs outputs) > - (let* ((data (string-append (assoc-ref outputs "doc") "/= share")) > - (doc (string-append > - data "/doc/" ,name "-" > - ,(package-version python-numpy-bootstrap))) > - (info (string-append data "/info")) > - (html (string-append doc "/html")) > - (pyver ,(string-append "PYVER=3D"))) > - (with-directory-excursion "doc" > - (mkdir-p html) > - (system* "make" "html" pyver) > - (system* "make" "latex" "PAPER=3Da4" pyver) > - (system* "make" "-C" "build/latex" > - "all-pdf" "PAPER=3Da4" pyver) > - ;; FIXME: Generation of the info file fails. > - ;; (system* "make" "info" pyver) > - ;; (mkdir-p info) > - ;; (copy-file "build/texinfo/numpy.info" > - ;; (string-append info "/numpy.info")) > - (for-each (lambda (file) > - (copy-file (string-append "build/latex" = file) > - (string-append doc file))) > - '("/numpy-ref.pdf" "/numpy-user.pdf")) > - (with-directory-excursion "build/html" > - (for-each (lambda (file) > - (let* ((dir (dirname file)) > - (tgt-dir (string-append html "/= " dir))) > - (unless (equal? "." dir) > - (mkdir-p tgt-dir)) > - (install-file file html))) > - (find-files "." ".*")))))) > - ,phases))))))) > + ("scipy-sphinx-theme" > + ,(origin ; The build script expects scipy-sphinx-theme as a git = submodule > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/scipy/scipy-sphinx-theme.git") > + (commit "c466764e22"))) > + (sha256 > + (base32 > + "0q2y87clwlsgc7wvlsn9pzyssybcq10plwhq2w1ydykfsyyqbmkl"))= )) Do you know if packaging this would work? Also, please use full commit hashes. I will add this and fix indentation before pushing. > + ,@(package-native-inputs python-numpy))) > + (arguments > + `(#:tests? #f ; we're only generating the documentation > + #:phases > + (modify-phases %standard-phases > + (delete 'build) > + (replace 'install > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (let* ((data (string-append (assoc-ref outputs "out") "/sha= re")) > + (doc (string-append > + data "/doc/" ,name "-" > + ,(package-version python-numpy))) > + (info-reader (string-append data "/info")) > + (html (string-append doc "/html")) > + (scipy-sphinx-theme "scipy-sphinx-theme") > + (sphinx-theme-checkout (assoc-ref inputs scipy-sphin= x-theme)) > + (pyver ,(string-append "PYVER=3D"))) > + (with-directory-excursion "doc" > + (copy-recursively sphinx-theme-checkout scipy-sphinx-th= eme) > + (mkdir-p html) > + (system* "make" "html" pyver) > + (system* "make" "latex" "PAPER=3Da4" pyver) > + (system* "make" "-C" "build/latex" > + "all-pdf" "PAPER=3Da4" pyver) > + ;; FIXME: Generation of the info file fails. > + ;; (system* "make" "info" pyver) > + ;; (mkdir-p info) > + ;; (copy-file "build/texinfo/numpy.info" > + ;; (string-append info "/numpy.info")) > + (for-each (lambda (file) > + (copy-file (string-append "build/latex" fil= e) > + (string-append doc file))) > + '("/numpy-ref.pdf" "/numpy-user.pdf")) > + (with-directory-excursion "build/html" > + (for-each (lambda (file) > + (let* ((dir (dirname file)) > + (tgt-dir (string-append html "/" d= ir))) > + (unless (equal? "." dir) > + (mkdir-p tgt-dir)) > + (install-file file html))) > + (find-files "." ".*"))))) > + #t))))) > + (home-page (package-home-page python-numpy)) > + (synopsis "Documentation for the python-numpy package") > + (description (package-description python-numpy)) > + (license (package-license python-numpy)))) >=20=20 > -(define-public python2-numpy > - (package-with-python2 python-numpy)) > +(define-public python2-numpy-documentation > + (let ((numpy-documentation (package-with-python2 python-numpy-document= ation))) > + (package > + (inherit numpy-documentation) > + (native-inputs `(("python2-functools32" ,python2-functools32) > + ,@(package-native-inputs numpy-documentation)))))) Do we need a python2 variant of the documentation? Does it differ from the python3 variant? Actually these were my only questions (but it applies to matplotlib documentation as well). The patches LGTM, great work! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAli9dpkACgkQoqBt8qM6 VPpplQf+PHXYuiuSFJqraU/PGhpKz4G7bSKDvAMxVCxiAA99YBoWe3k60r5KmHS5 1ukYywkbVHJgTK9/euPIuJ3rOfwI26utvbjIrFMjP+umNQ/W6lPO12KgDPyUe9oS vbuC58e11W3tdlZE3dqyl4gd2XqTHsU6TKXkYudBxLHzCmAUXa/6yzvwg3R+rrD7 dgflBzaHzOXmR+qvNNzaUnW1Wc9k3pIQK69Dsa+ta5UFYqA5o26dUc1iwCW8uvKP 7mvOcooCC3GChWOaYuMdAFS4PgyijcBFO18yZK3QD/7+BolVzUAByj9lfxccf3Lc rdghAXSrbCSCmdDugscpqBfa0TWUcw== =yXXz -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH 5/7] gnu: python-matplotlib: Update to 2.0.0. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Mar 2017 17:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Thomas Danckaert , 25834@debbugs.gnu.org Cc: Thomas Danckaert Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148882282813220 (code B ref 25834); Mon, 06 Mar 2017 17:54:01 +0000 Received: (at 25834) by debbugs.gnu.org; 6 Mar 2017 17:53:48 +0000 Received: from localhost ([127.0.0.1]:43075 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ckwpQ-0003RA-6p for submit@debbugs.gnu.org; Mon, 06 Mar 2017 12:53:48 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:42272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ckwpL-0003Qy-A6 for 25834@debbugs.gnu.org; Mon, 06 Mar 2017 12:53:47 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id D245F20AF2; Mon, 6 Mar 2017 12:53:42 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Mon, 06 Mar 2017 12:53:42 -0500 DKIM-Signature: v=1; a=rsa-sha1; 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=mesmtp; bh=9pgY/9v+7tH9wsfU3SaMapLYvos=; b=0deUF8 S5QfewnHjYKBCwuqwGacn9NKxukbBF0y3DFAMNUKlBxT8VI4cHuLGTv2K/mTeRxn ADg4CMu+B4+dbmhmAX4aEg3gH2dj5eHz1FNq2N9rk/CVgptnpBhMieQMg393kC0g x94znca1O2QvfAIphxM+GiOh6gC68c3cmZPf0= DKIM-Signature: v=1; a=rsa-sha1; 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=smtpout; bh=9pgY/9v+7tH9ws fU3SaMapLYvos=; b=PtBqaF3fHzmRL6BfKGz7Upd++DZ/6N2x4fiYFyxsTMSH+y CjJqxy4U0ySqWbVISBAdcA4jMzWkD2XTHeJLbm33fM/76lFjnqcaarc96HDQjyv9 azx/3p9mV7dT/DK2A3TNkdlx6G+zdheq2TW2rRBlECgGOYr67pEo6pw76ZMiA= X-ME-Sender: X-Sasl-enc: cAPhMkJGx4JUp4S2D+uYCUkK9VNY/7NDhjKBhGUBAUMc 1488822822 Received: from localhost (unknown [185.3.4.227]) by mail.messagingengine.com (Postfix) with ESMTPA id 6239424132; Mon, 6 Mar 2017 12:53:42 -0500 (EST) From: Marius Bakke In-Reply-To: <20170222112253.30004-5-thomas.danckaert@gmail.com> References: <20170222.113015.1486949640371512143.post@thomasdanckaert.be> <20170222112253.30004-1-thomas.danckaert@gmail.com> <20170222112253.30004-5-thomas.danckaert@gmail.com> User-Agent: Notmuch/0.23.7 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Mon, 06 Mar 2017 18:53:39 +0100 Message-ID: <87innm47h8.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) 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 Thomas Danckaert writes: > From: Thomas Danckaert > > * gnu/packages/python.scm (python-matplotlib): Update to 2.0.0. > [source]: Remove Tk backend patch, use Github instead of Sourceforge. > [outputs]: Remove "doc" output. > [propagated-inputs]: Add python-cycler. > [native-inputs]: Remove python-sphinx, python-numpydoc, texlive and texinfo. > (python-matplotlib-documentation, python2-matplotlib-documentation): New > variable. > * gnu/packages/patches/matplotlib-setupext-tk.patch: Delete file. > * gnu/local.mk (dist_patch_DATA): Remove patch. Apparently the python2 variant of this package requires "python2-subprocess32". Could you look into packaging it? It also requires "python2-functools32", but this dependency is removed again in the matplotlib master branch. I have this in my local branch. I found these dependencies by building dependent packages. Too bad the setup script only prints a warning if they are not found, instead of failing. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAli9oiMACgkQoqBt8qM6 VPoMmgf/YJQ0IOMT22QyrB1C71WyXkiH5zSrqn2SicwsQ8JCUhgGLxc87dWZuwjp RHrLqLufcNNxGJKiqb+uuI7UtQ3ZDsESaGON2nUf59WNfdOB31tpDvGRGD0+5uCA QoXX0vtqsdajj7BLLybWSbuoQEcYQh9CbgA3YPN+6BAu9ND9HHpKHAnc/vgxenbH 2tzT48yrp+pQtYmfzsYxVzfMP1aV+JS70Ze33BnlqHc2GIWNaVqRFIWnSP3hOlzq lw8Yir5N9hYHfDUu1WeNyiMmdJThi8pA6LB8lih8/Z1VjxrkRnhvjH+jV/ADKLf1 cC/nvCLnFfmGMNHWr385P/4RSuMG/A== =aIR7 -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH 5/7] gnu: python-matplotlib: Update to 2.0.0. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Mar 2017 21:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Thomas Danckaert , 25834@debbugs.gnu.org Cc: Thomas Danckaert Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148883693416603 (code B ref 25834); Mon, 06 Mar 2017 21:49:02 +0000 Received: (at 25834) by debbugs.gnu.org; 6 Mar 2017 21:48:54 +0000 Received: from localhost ([127.0.0.1]:43296 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cl0Ur-0004Jc-CP for submit@debbugs.gnu.org; Mon, 06 Mar 2017 16:48:54 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:49375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cl0Uo-0004JS-84 for 25834@debbugs.gnu.org; Mon, 06 Mar 2017 16:48:48 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 1C1ED20A07; Mon, 6 Mar 2017 16:48:46 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 06 Mar 2017 16:48:46 -0500 DKIM-Signature: v=1; a=rsa-sha1; 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=mesmtp; bh=GnMpp1uL+nLlW6S8Iuy09eu6U3k=; b=sEd0Hh X6bio6OwLGMeOb2nrhHYE6wTveLk5y0nOigLsmzWWb7xWqpUwKqEXxIKfqigd8z+ 9oBZgEqYxfw/Z6lS0Vfpw8yJ+f+C4s4FMU7cnLrEq8Jgypf4bm1dJfpm0leoUYWo UwMmHFtwsVI0lHhKByydoP1n2Qcch1hOnczRc= DKIM-Signature: v=1; a=rsa-sha1; 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=smtpout; bh=GnMpp1uL+nLlW6 S8Iuy09eu6U3k=; b=JB1qJbxU1F5dBLScO9UYLwtAoUzHpTNc5cIM4kxgbcRWW0 zvx2AnWjnZE3WKWk0T0o6gFJAAaP0cMY/5+qQ6B+danN/VMTjIEdNPHabYBXJHn6 E6Nrd0DvtORYmobxrs/mvak5GAX6ExK/s2zXdHRlHen9LCLQOAcXFFoXwUQK0= X-ME-Sender: X-Sasl-enc: TUJOjhAMQtQMWgaUAwKaL5DFuUku3rGWRaJggWiISwnk 1488836925 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id A61317E0CF; Mon, 6 Mar 2017 16:48:45 -0500 (EST) From: Marius Bakke In-Reply-To: <87innm47h8.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <20170222.113015.1486949640371512143.post@thomasdanckaert.be> <20170222112253.30004-1-thomas.danckaert@gmail.com> <20170222112253.30004-5-thomas.danckaert@gmail.com> <87innm47h8.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> User-Agent: Notmuch/0.23.7 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Mon, 06 Mar 2017 22:48:43 +0100 Message-ID: <877f423wlg.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) 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 (/) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Marius Bakke writes: > Thomas Danckaert writes: > >> From: Thomas Danckaert >> >> * gnu/packages/python.scm (python-matplotlib): Update to 2.0.0. >> [source]: Remove Tk backend patch, use Github instead of Sourceforge. >> [outputs]: Remove "doc" output. >> [propagated-inputs]: Add python-cycler. >> [native-inputs]: Remove python-sphinx, python-numpydoc, texlive and texinfo. >> (python-matplotlib-documentation, python2-matplotlib-documentation): New >> variable. >> * gnu/packages/patches/matplotlib-setupext-tk.patch: Delete file. >> * gnu/local.mk (dist_patch_DATA): Remove patch. > > Apparently the python2 variant of this package requires > "python2-subprocess32". Could you look into packaging it? I've packaged it (attached). I intended to apply these patches on a new 'python-updates' branch so we could deal with the fallout more leisurely, but since there are already failures after the scipy update, we might as well jump in it. I have updates for python-statsmodels and python-pandas in my queue as well. Doing a final round of building dependent packages now, will probably push later tonight. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-python2-subprocess32.patch Content-Transfer-Encoding: quoted-printable From=20faeda754ff318cfa050c110122f66620538990c8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 6 Mar 2017 21:58:19 +0100 Subject: [PATCH] gnu: Add python2-subprocess32. * gnu/packages/python.scm (python2-subprocess32): New variable. * gnu/packages/patches/python2-subprocess32-disable-input-test.patch: New f= ile. * gnu/local.mk (dist_patch_DATA): Add it. =2D-- gnu/local.mk | 1 + .../python2-subprocess32-disable-input-test.patch | 18 ++++++++++ gnu/packages/python.scm | 41 ++++++++++++++++++= ++++ 3 files changed, 60 insertions(+) create mode 100644 gnu/packages/patches/python2-subprocess32-disable-input= -test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9a4dd693b..a2bbefcca 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -870,6 +870,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %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/qemu-CVE-2016-10155.patch \ %D%/packages/patches/qemu-CVE-2017-2615.patch \ %D%/packages/patches/qemu-CVE-2017-5525.patch \ diff --git a/gnu/packages/patches/python2-subprocess32-disable-input-test.p= atch b/gnu/packages/patches/python2-subprocess32-disable-input-test.patch new file mode 100644 index 000000000..05b4eef1b =2D-- /dev/null +++ b/gnu/packages/patches/python2-subprocess32-disable-input-test.patch @@ -0,0 +1,18 @@ +This test tries to send a KeyboardInterrupt, which does +not work in the build environment. + +--- a/test_subprocess32.py 2017-03-06 22:21:49.334045485 +0100 ++++ b/test_subprocess32.py 2017-03-06 22:22:02.490439949 +0100 +@@ -1299,12 +1299,6 @@ + getattr(p, method)(*args) + return p +=20 +- def test_send_signal(self): +- p =3D self._kill_process('send_signal', signal.SIGINT) +- _, stderr =3D p.communicate() +- self.assertIn('KeyboardInterrupt', stderr) +- self.assertNotEqual(p.wait(), 0) +- + def test_kill(self): + p =3D self._kill_process('kill') + _, stderr =3D p.communicate() diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3c5d0f7e3..d46739be6 100644 =2D-- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9040,6 +9040,47 @@ authenticated session objects providing things like = keep-alive.") 3.2.3 for use with older versions of Python and PyPy.") (license license:expat))) =20 +(define-public python2-subprocess32 + (package + (name "python2-subprocess32") + (version "3.2.7") + (source (origin + (method url-fetch) + (uri (pypi-uri "subprocess32" version)) + (sha256 + (base32 + "14350dhhlhyz5gqzi3lihn9m6lvskx5mcb20srx1kgsk9i50li8y")) + (patches + (search-patches "python2-subprocess32-disable-input-test.pa= tch")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2 + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-/bin/sh + (lambda _ + (substitute* '("subprocess32.py" + "test_subprocess32.py") + (("/bin/sh") (which "sh"))) + #t)) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; For some reason this package fails to import + ;; _posixsubprocess.so when PYTHONPATH is set to the build + ;; directory. Running tests after install is easier. + (add-installed-pythonpath inputs outputs) + (zero? (system* "python" "test_subprocess32.py"))))))) + (home-page "https://github.com/google/python-subprocess32") + (synopsis "Backport of the subprocess module from Python 3.2") + (description + "This is a backport of the @code{subprocess} standard library module +from Python 3.2 and 3.3 for use on Python 2. It includes bugfixes and some +new features. On POSIX systems it is guaranteed to be reliable when used +in threaded applications. It includes timeout support from Python 3.3 but +otherwise matches 3.2=E2=80=99s API.") + (license license:psfl))) + (define-public python2-futures (package (name "python2-futures") =2D-=20 2.12.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAli92TsACgkQoqBt8qM6 VPqm+wgAyeCzqGBDE9b0Pk7JVZtEOZu4BhCAV1WC0il6Zd4/Jwf3hEeuIgdXYLgU DmzIanSRkRJneBz8Sx8PT2nRKioxPdiapivI+fvXkdQo/yC/EDgQYg+7B6out+hq 2JTddnOqAkG9QLL8sErD1eD8plhdeufEZI3/8VzOGA+hxj8IKG7u+HaYNO5NJS01 o5vLQdcHtRKfFG28QIEgzO/Z2XNrw7PqJlXPyx0KGY4V9INKLYKowTfgfi5KIehg I/rtsO8YPWCPTTcNw1LPY7N9qyehi4S1hZvdObIxUXc+w56mgYfeOMTvcL8zHHbR eFRNg/sIF0dUweYgPJ7sDJY/O4euEQ== =8QiO -----END PGP SIGNATURE----- --==-=-=-- From unknown Sun Jun 22 07:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25834: [PATCH 5/7] gnu: python-matplotlib: Update to 2.0.0. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Mar 2017 22:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Thomas Danckaert , 25834@debbugs.gnu.org Cc: Thomas Danckaert Received: via spool by 25834-submit@debbugs.gnu.org id=B25834.148883976221058 (code B ref 25834); Mon, 06 Mar 2017 22:37:01 +0000 Received: (at 25834) by debbugs.gnu.org; 6 Mar 2017 22:36:02 +0000 Received: from localhost ([127.0.0.1]:43330 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cl1EX-0005TX-TJ for submit@debbugs.gnu.org; Mon, 06 Mar 2017 17:36:02 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:55383) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cl1EW-0005TC-Qx for 25834@debbugs.gnu.org; Mon, 06 Mar 2017 17:36:01 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 93D5320B9D; Mon, 6 Mar 2017 17:36:00 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 06 Mar 2017 17:36:00 -0500 DKIM-Signature: v=1; a=rsa-sha1; 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=mesmtp; bh=yNqeDUto6jKWvbS2/SGImETGGmQ=; b=I32V5E ViVoOyb0u3ojaoGORrIw2T/xEe95aAoKxDS9iAYHOBpp1ghnydwLBRvXZxev+BQC ErcUErPYrW9Us2nC/SROhu7qnyEjbt9E2CDVfsQXnbPQHzj242w67tQVepMOR8J8 JkNmuAs5GtOHfxFqmu1NMCUouFqKrBvpXsFWY= DKIM-Signature: v=1; a=rsa-sha1; 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=smtpout; bh=yNqeDUto6jKWvb S2/SGImETGGmQ=; b=hfEAjkMlaeOI2OPA6K9NOyKJ35zfPrZ09CN6pb+0hR4hqx +dnPxoB9ehoZCQzRMh8TjT9exftl9kg2VRtj6uD7r3C1r+EyvtexJxsOvu/nPsEB mwG/LIeHIhfSwLEvOrWlfymSl3y1wQyCPAyBZSD6qGFbvBzNaOAT1xMN2nVjY= X-ME-Sender: X-Sasl-enc: QlAIfwUiyrchMrgkgPl9SQVOoOl5MklOz93swfhtkdtK 1488839760 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 2857C7E5A8; Mon, 6 Mar 2017 17:36:00 -0500 (EST) From: Marius Bakke In-Reply-To: <877f423wlg.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <20170222.113015.1486949640371512143.post@thomasdanckaert.be> <20170222112253.30004-1-thomas.danckaert@gmail.com> <20170222112253.30004-5-thomas.danckaert@gmail.com> <87innm47h8.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <877f423wlg.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> User-Agent: Notmuch/0.23.7 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Mon, 06 Mar 2017 23:35:58 +0100 Message-ID: <871sua3uep.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) 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 Marius Bakke writes: > I have updates for python-statsmodels and python-pandas in my queue as > well. Doing a final round of building dependent packages now, will > probably push later tonight. And it's live! Thanks again for taking this on. Wrt colorspacious tests, I usually look at how upstream runs their tests, typically in ".travis.yml" or "tox.ini". Will have a look at the patch before closing this bug. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAli95E4ACgkQoqBt8qM6 VPo7qQgAz7ADAexL6TcjF0UznDeko+/j9FR8zcR24+pX22AU+hmmOGuG9UY7sfgy VqAQL+wm7oTBEADNEf32ocvHt+2g2FLnqwensvWNvMlxOPLVpG1CT01QYpj20Sv3 c1vSQ+8TSuj2Ex2g2d5B1ersPQ5Tuji7m4fI6Ead/2ydchepSZ3XYC0ZiNRuX42M QWzaV5PCbc3SoI2a2sVkL4feW5XCHvknSrf1+NTt+E0auKnjku1D+yynksKsasoq cMv+e5dosCINbbWGzL9YlG4TC31Acl7apKGX2mywcpDS2xOlja0Mubq3IpKnV7Db n97Jf+dHlJg3ji18ToFft4Ulgbx92Q== =cxwo -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 07:50:45 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Thomas Danckaert Subject: bug#25834: closed (Re: bug#25834: [PATCH] Update scipy stack.) Message-ID: References: <87y3wi2f0p.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <20170222.113015.1486949640371512143.post@thomasdanckaert.be> X-Gnu-PR-Message: they-closed 25834 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 25834@debbugs.gnu.org Date: Mon, 06 Mar 2017 22:54:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1488840842-22749-1" This is a multi-part message in MIME format... ------------=_1488840842-22749-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #25834: Update scientific Python packages which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 25834@debbugs.gnu.org. --=20 25834: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D25834 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1488840842-22749-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 25834-done) by debbugs.gnu.org; 6 Mar 2017 22:53:46 +0000 Received: from localhost ([127.0.0.1]:43355 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cl1Vi-0005uA-6J for submit@debbugs.gnu.org; Mon, 06 Mar 2017 17:53:46 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:38868) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cl1Vg-0005u3-Un for 25834-done@debbugs.gnu.org; Mon, 06 Mar 2017 17:53:45 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id C849620A01; Mon, 6 Mar 2017 17:53:44 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 06 Mar 2017 17:53:44 -0500 DKIM-Signature: v=1; a=rsa-sha1; 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=mesmtp; bh=cbcy6aGio8IEtXsbSkJgJ1m6gxA=; b=bQyfwf 9hc3wk/8sEjrSIy25PWPOeRsrVTilqZw8P3Vy/ZR7q6jUzkBFW0k7ql+p86XOZb9 JJJb6zpx2Z3CGWhiE3DIlw0/zqXlXdrQnn81ztWPRdxq3obEimYreFN+HJRyznMd VMDqp6q2ujibK4R1m/4jtxt4fD7YOa7XKUadk= DKIM-Signature: v=1; a=rsa-sha1; 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=smtpout; bh=cbcy6aGio8IEtX sbSkJgJ1m6gxA=; b=QZDHljpAurB2+wswiXQkWp7X//otmeT5kbJn+Atdr9F07M IAuZzs/RW7N65LS+OnfifKYsmnMoGpLxHVaZ2VouKWLT6av+oHtAdHFbP6C6eDKv 0tYuviYoayyHHoEKvYLzYhg6eX7um8C+lFBeVAxCwNzb4KIrPlQJE+Ylc8Kos= X-ME-Sender: X-Sasl-enc: 7KHSQGpjx2sK90wBvsPI2gkxwUAvpBktwQpZIq4+HGhT 1488840824 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 5B52F7E033; Mon, 6 Mar 2017 17:53:44 -0500 (EST) From: Marius Bakke To: Thomas Danckaert Subject: Re: bug#25834: [PATCH] Update scipy stack. In-Reply-To: <20170306.153939.290573923111350891.post@thomasdanckaert.be> References: <20170302.151343.231642285456771916.post@thomasdanckaert.be> <20170306100121.5590bfa8@scratchpost.org> <87shmq4jw9.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <20170306.153939.290573923111350891.post@thomasdanckaert.be> User-Agent: Notmuch/0.23.7 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Mon, 06 Mar 2017 23:53:42 +0100 Message-ID: <87y3wi2f0p.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> 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: 25834-done Cc: dannym@scratchpost.org, 25834-done@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; charset=utf-8 Content-Transfer-Encoding: quoted-printable Thomas Danckaert writes: > From: Marius Bakke > Subject: Re: bug#25834: [PATCH] Update scipy stack. > Date: Mon, 06 Mar 2017 14:25:26 +0100 > >> Please pay attention during the 'check' phase of Python packages --=20 >> both >> colorspacious and the shutils backport prints 'Ran 0 tests in...'. >> Usually this is a sign that they require some other command than=20 >> 'python >> setup.py test', which is the default of python-build-system. >> >> I pushed a fix for python2-backports-shutil-get-terminal-size that=20 >> I had >> in my queue, but it would be nice to enable tests on colorspacious=20 >> as >> well. Any takers? :) > > I've attached an attempt (now runs 34 tests). Am I right that=20 > running =E2=80=9Cnosetests colorspacious/*.py=E2=80=9D is the only way to= make it run=20 > the tests in this case? Thanks! By adding "--all-modules" to the "nosetests" invocation, it was able to discover the tests without having to add them as arguments. Pushed! Closing this bug now, wahoo! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAli96HYACgkQoqBt8qM6 VPoJeggAigjnGKBpHlqh5atstIYjZK6bl7i0eTZgmpy/hp6DbkuOKW2+B8P6b2kH oVeh86mWFOQtuECh6gfg4zgJ/N+c/wH8/EnHiaPXRFeNt2sumEaGqdm0wDOOCBNk YdTW31j7bvKbjmeV8jX0RTvz8K0/WWFe0vd8UGn8rxWfx5XRX/lYUFJrefsl2Hmq 22O5L0tXVPYAEmvbNh2wJ4QARnfZfLR5e77GL30VFj02NcHuHGLKrF0C257Hyy5D WWWfDlZSVcKIWqA2kDWBW52LfhIA7BhA6xGYi03kMnGvZ55nyqVg+hJe48Yf1c0x 0y7p+F9zlVgTlVjnMSpItwKfUouZTA== =7R2c -----END PGP SIGNATURE----- --=-=-=-- ------------=_1488840842-22749-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 22 Feb 2017 10:30:48 +0000 Received: from localhost ([127.0.0.1]:49637 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgUC8-0000s2-KC for submit@debbugs.gnu.org; Wed, 22 Feb 2017 05:30:48 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49413) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgUC7-0000rq-46 for submit@debbugs.gnu.org; Wed, 22 Feb 2017 05:30:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cgUBy-0008Ed-R1 for submit@debbugs.gnu.org; Wed, 22 Feb 2017 05:30:42 -0500 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 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:55642) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cgUBy-0008EZ-O4 for submit@debbugs.gnu.org; Wed, 22 Feb 2017 05:30:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgUBs-00058V-LM for guix-patches@gnu.org; Wed, 22 Feb 2017 05:30:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cgUBp-0008Cj-Hc for guix-patches@gnu.org; Wed, 22 Feb 2017 05:30:32 -0500 Received: from s01.spamexperts.axc.nl ([185.182.56.9]:51108) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cgUBp-0008CH-AR for guix-patches@gnu.org; Wed, 22 Feb 2017 05:30:29 -0500 Received: from vserver42.axc.nl ([159.253.0.80]) by s01.spamexperts.axc.nl with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86) (envelope-from ) id 1cgUBj-0001lZ-Kz for guix-patches@gnu.org; Wed, 22 Feb 2017 11:30:24 +0100 Received: from mail.axc.nl ([159.253.0.157]:41646) by vserver42.axc.nl with esmtp (Exim 4.87) (envelope-from ) id 1cgUBi-0004Zs-DQ for guix-patches@gnu.org; Wed, 22 Feb 2017 11:30:22 +0100 Date: Wed, 22 Feb 2017 11:30:15 +0100 (CET) Message-Id: <20170222.113015.1486949640371512143.post@thomasdanckaert.be> To: guix-patches@gnu.org Subject: Update scientific Python packages From: Thomas Danckaert X-Mailer: Mew version 6.7 on Emacs 25.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=utf-8; format=flowed Content-Transfer-Encoding: base64 PrimaryMX: Accepted email from trusted host. Hint: This skips spam scanning so make sure other host is not vulnerable X-Relay-Host: 159.253.0.157 SpamTally: Final spam score: 0 X-Originating-IP: 159.253.0.80 X-SpamExperts-Domain: vserver42.axc.nl X-SpamExperts-Username: 159.253.0.80 Authentication-Results: spamexperts.axc.nl; auth=pass smtp.auth=159.253.0.80@vserver42.axc.nl X-SpamExperts-Outgoing-Class: unsure X-SpamExperts-Outgoing-Evidence: Combined (0.52) X-Recommended-Action: accept X-Filter-ID: s0sct1PQhAABKnZB5plbIaExX4b9HB97Y0LqBeziPXa8B5kabb+8+DRlCqSxA333/bPom7IVowNb jNmNSGjlJADpxEq2QWue0NVTi1XPmXej1KRrf1Y8eevl1lZRQAkHO76XSTAwtV4mg4i2ouCDa4AU hvIWAV5xUW/+gAh4vXpdmWmyer3yZEAjdCpCLi1/RcOb18WfxGyg6Om6u4YYm9u7/gK7OuHe71YS Xk/wo1zEJmXb7Ar/H99E7t+JzjZEexI6JliONwAnIAZqFP/xQOWBOXp8nHKe0R+FkIqN7hkbx4Px vydb/x32mhLBChw5NNMPtXItjLG4t9x0O63zbyLpQCk9LN96ieg5guM8uFge9Gory97ytKcl8m2v CNJ8q16AUQgygDMMJTOfrbMny4YMMMN9gXSa/QHmQlxnbwnJ+LDk+6c65WNHYJFrd5FIBZ6++Dfk TVlBWsR5QGkluYsktHOcNcA7Yit+vIPIFAQmEqN5fXoI0ArDZbumk3L6kihXO2fRb8rpv65HbpOd qmjDv/9lZWhS1i8CvLmhSHJulq+YCc1Jf9I1b2AZYErcjxqVInDtyLKdhpFYlh+5iwrwZePlKAja dVACXd5CVMStI4g+l6rCWbY0MZcgnbHscInbHxcQ7Yqf+SyeuX7VEg4xvSXNEuNAac1x4Dq+Rw46 YAui7CC12a7HCFC49T/2Hl+n4wJpi0aO64WmIrQSsoiOiAWzgWYfW4v6sNykXCUhQhivpDmZttuJ xBIdw0/3PmQkm/R/q0s7MghuhwYFI0CYbodT30ON66voTSWuQNhsvNhNiZMpZAonHM9TXt5r X-Report-Abuse-To: spam@s01.spamexperts.axc.nl 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.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 (----) SGksDQoNCkknbSBzdWJtaXR0aW5nIGEgcGF0Y2ggc2VyaWVzIHRvIHVwZGF0ZSBudW1weSwgbWF0 cGxvdGxpYiwgc2NpcHkgYW5kIA0KaXB5dGhvbi4gIEkndmUgc3BsaXQgb3V0IHRoZSBkb2N1bWVu dGF0aW9uIGZvciBudW1weSBhbmQgbWF0cGxvdGxpYiANCmludG8gc2VwYXJhdGUgcGFja2FnZXMg dG8gYXZvaWQgaXNzdWVzIHdpdGggdGhlIGZvbGxvd2luZyBjeWNsaWMgDQpkZXBlbmRlbmNpZXM6 DQoNCiAgLSBudW1weSBkb2N1bWVudGF0aW9uIGRlcGVuZHMgb24gbWF0cGxvdGxpYiwgd2hpY2gg ZGVwZW5kcyBvbiBudW1weS4NCg0KICAtIGRvY3VtZW50YXRpb24gZm9yIHRoZSBuZXcgdmVyc2lv biBvZiBtYXRwbG90bGliIGFsc28gZGVwZW5kcyBvbg0KICAgIGlweXRob24sIHdoaWNoIGRlcGVu ZHMgb24gbWF0cGxvdGxpYiBhbmQgbnVtcHkuDQoNCklmIHRoZSBwcmVmZXJlbmNlIGlzIHRvIHdv cmsgd2l0aCBtdWx0aXBsZSBvdXRwdXRzIGluc3RlYWQsIEkgY2FuIA0Kd29yayBvdXQgc29tZXRo aW5nIHdpdGgg4oCcYm9vdHN0cmFw4oCdIHBhY2thZ2VzIGFuZCANCnBhY2thZ2UtaW5wdXQtcmV3 cml0aW5nLCBidXQgSSBsaWtlIHRoZSBzaW1wbGljaXR5IG9mIHNlcGFyYXRlIA0KZG9jdW1lbnRh dGlvbiBwYWNrYWdlcyAod2hpY2ggYWxzbyBhdm9pZHMgcmVwZWF0ZWRseSBidWlsZGluZyB0aGUg DQpzYW1lIHBhY2thZ2UgZm9yIGJvb3RzdHJhcHBpbmcgcHVycG9zZXMpLg0KDQpUaG9tYXMNCg== ------------=_1488840842-22749-1-- From unknown Sun Jun 22 07:50:45 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Thomas Danckaert Subject: bug#25705: closed (Re: bug#25834: [PATCH] Update scipy stack.) Message-ID: References: <87y3wi2f0p.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <20170213.105706.1529657444244506620.post@thomasdanckaert.be> X-Gnu-PR-Message: they-closed 25705 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 25705@debbugs.gnu.org Date: Mon, 06 Mar 2017 22:54:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1488840842-22749-3" This is a multi-part message in MIME format... ------------=_1488840842-22749-3 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #25834: [PATCH] gnu: python-matplotlib: Don't propagate python-numpy-bootst= rap. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 25705@debbugs.gnu.org. --=20 25834: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D25834 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1488840842-22749-3 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 25834-done) by debbugs.gnu.org; 6 Mar 2017 22:53:46 +0000 Received: from localhost ([127.0.0.1]:43355 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cl1Vi-0005uA-6J for submit@debbugs.gnu.org; Mon, 06 Mar 2017 17:53:46 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:38868) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cl1Vg-0005u3-Un for 25834-done@debbugs.gnu.org; Mon, 06 Mar 2017 17:53:45 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id C849620A01; Mon, 6 Mar 2017 17:53:44 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 06 Mar 2017 17:53:44 -0500 DKIM-Signature: v=1; a=rsa-sha1; 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=mesmtp; bh=cbcy6aGio8IEtXsbSkJgJ1m6gxA=; b=bQyfwf 9hc3wk/8sEjrSIy25PWPOeRsrVTilqZw8P3Vy/ZR7q6jUzkBFW0k7ql+p86XOZb9 JJJb6zpx2Z3CGWhiE3DIlw0/zqXlXdrQnn81ztWPRdxq3obEimYreFN+HJRyznMd VMDqp6q2ujibK4R1m/4jtxt4fD7YOa7XKUadk= DKIM-Signature: v=1; a=rsa-sha1; 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=smtpout; bh=cbcy6aGio8IEtX sbSkJgJ1m6gxA=; b=QZDHljpAurB2+wswiXQkWp7X//otmeT5kbJn+Atdr9F07M IAuZzs/RW7N65LS+OnfifKYsmnMoGpLxHVaZ2VouKWLT6av+oHtAdHFbP6C6eDKv 0tYuviYoayyHHoEKvYLzYhg6eX7um8C+lFBeVAxCwNzb4KIrPlQJE+Ylc8Kos= X-ME-Sender: X-Sasl-enc: 7KHSQGpjx2sK90wBvsPI2gkxwUAvpBktwQpZIq4+HGhT 1488840824 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 5B52F7E033; Mon, 6 Mar 2017 17:53:44 -0500 (EST) From: Marius Bakke To: Thomas Danckaert Subject: Re: bug#25834: [PATCH] Update scipy stack. In-Reply-To: <20170306.153939.290573923111350891.post@thomasdanckaert.be> References: <20170302.151343.231642285456771916.post@thomasdanckaert.be> <20170306100121.5590bfa8@scratchpost.org> <87shmq4jw9.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <20170306.153939.290573923111350891.post@thomasdanckaert.be> User-Agent: Notmuch/0.23.7 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Mon, 06 Mar 2017 23:53:42 +0100 Message-ID: <87y3wi2f0p.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> 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: 25834-done Cc: dannym@scratchpost.org, 25834-done@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; charset=utf-8 Content-Transfer-Encoding: quoted-printable Thomas Danckaert writes: > From: Marius Bakke > Subject: Re: bug#25834: [PATCH] Update scipy stack. > Date: Mon, 06 Mar 2017 14:25:26 +0100 > >> Please pay attention during the 'check' phase of Python packages --=20 >> both >> colorspacious and the shutils backport prints 'Ran 0 tests in...'. >> Usually this is a sign that they require some other command than=20 >> 'python >> setup.py test', which is the default of python-build-system. >> >> I pushed a fix for python2-backports-shutil-get-terminal-size that=20 >> I had >> in my queue, but it would be nice to enable tests on colorspacious=20 >> as >> well. Any takers? :) > > I've attached an attempt (now runs 34 tests). Am I right that=20 > running =E2=80=9Cnosetests colorspacious/*.py=E2=80=9D is the only way to= make it run=20 > the tests in this case? Thanks! By adding "--all-modules" to the "nosetests" invocation, it was able to discover the tests without having to add them as arguments. Pushed! Closing this bug now, wahoo! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAli96HYACgkQoqBt8qM6 VPoJeggAigjnGKBpHlqh5atstIYjZK6bl7i0eTZgmpy/hp6DbkuOKW2+B8P6b2kH oVeh86mWFOQtuECh6gfg4zgJ/N+c/wH8/EnHiaPXRFeNt2sumEaGqdm0wDOOCBNk YdTW31j7bvKbjmeV8jX0RTvz8K0/WWFe0vd8UGn8rxWfx5XRX/lYUFJrefsl2Hmq 22O5L0tXVPYAEmvbNh2wJ4QARnfZfLR5e77GL30VFj02NcHuHGLKrF0C257Hyy5D WWWfDlZSVcKIWqA2kDWBW52LfhIA7BhA6xGYi03kMnGvZ55nyqVg+hJe48Yf1c0x 0y7p+F9zlVgTlVjnMSpItwKfUouZTA== =7R2c -----END PGP SIGNATURE----- --=-=-=-- ------------=_1488840842-22749-3 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 13 Feb 2017 16:25:30 +0000 Received: from localhost ([127.0.0.1]:38768 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cdJRR-00044p-2P for submit@debbugs.gnu.org; Mon, 13 Feb 2017 11:25:30 -0500 Received: from eggs.gnu.org ([208.118.235.92]:60378) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cdDO0-0001g2-Lu for submit@debbugs.gnu.org; Mon, 13 Feb 2017 04:57:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdDNt-00055u-Qa for submit@debbugs.gnu.org; Mon, 13 Feb 2017 04:57:27 -0500 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 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:42081) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cdDNt-00055o-N1 for submit@debbugs.gnu.org; Mon, 13 Feb 2017 04:57:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdDNr-0005OO-Bn for guix-patches@gnu.org; Mon, 13 Feb 2017 04:57:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdDNo-00054t-84 for guix-patches@gnu.org; Mon, 13 Feb 2017 04:57:23 -0500 Received: from s01-out.spamexperts.axc.nl ([159.253.0.252]:50915 helo=s01.spamexperts.axc.nl) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cdDNn-00053C-Tk for guix-patches@gnu.org; Mon, 13 Feb 2017 04:57:20 -0500 Received: from vserver42.axc.nl ([159.253.0.80]) by s01.spamexperts.axc.nl with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86) (envelope-from ) id 1cdDNi-0001HQ-9w for guix-patches@gnu.org; Mon, 13 Feb 2017 10:57:15 +0100 Received: from mail.axc.nl ([159.253.0.157]:36681) by vserver42.axc.nl with esmtp (Exim 4.87) (envelope-from ) id 1cdDNf-00079i-4E for guix-patches@gnu.org; Mon, 13 Feb 2017 10:57:12 +0100 Date: Mon, 13 Feb 2017 10:57:06 +0100 (CET) Message-Id: <20170213.105706.1529657444244506620.post@thomasdanckaert.be> To: guix-patches@gnu.org Subject: Re: [PATCH] gnu: python-matplotlib: Don't propagate python-numpy-bootstrap. From: Thomas Danckaert In-Reply-To: <87lgtw1dk7.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <20170127.160509.2073167591783697985.post@thomasdanckaert.be> <87lgtw1dk7.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> X-Mailer: Mew version 6.7 on Emacs 25.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="--Next_Part(Mon_Feb_13_10_57_06_2017_780)--" Content-Transfer-Encoding: 7bit PrimaryMX: Accepted email from trusted host. Hint: This skips spam scanning so make sure other host is not vulnerable X-Relay-Host: 159.253.0.157 SpamTally: Final spam score: 0 X-Originating-IP: 159.253.0.80 X-SpamExperts-Domain: vserver42.axc.nl X-SpamExperts-Username: 159.253.0.80 Authentication-Results: spamexperts.axc.nl; auth=pass smtp.auth=159.253.0.80@vserver42.axc.nl X-SpamExperts-Outgoing-Class: ham X-SpamExperts-Outgoing-Evidence: Combined (0.08) X-Recommended-Action: accept X-Filter-ID: s0sct1PQhAABKnZB5plbIaExX4b9HB97Y0LqBeziPXa8B5kabb+8+DRlCqSxA333/bPom7IVowNb jNmNSGjlJADpxEq2QWue0NVTi1XPmXej1KRrf1Y8eevl1lZRQAkHO76XSTAwtV4mg4i2ouCDa4AU hvIWAV5xUW/+gAh4vXrtekYxQQ65lzZPTEQn+2OvRcOb18WfxGyg6Om6u4YYm8yBvA44TxJ2BrQa x3n5LL7EJmXb7Ar/H99E7t+JzjZEexI6JliONwAnIAZqFP/xQOWBOXp8nHKe0R+FkIqN7hkbx4Px vydb/x32mhLBChw5NNMPtXItjLG4t9x0O63zbyLpQCk9LN96ieg5guM8uFge9Gory97ytKcl8m2v CNJ8q16AUQgygDMMJTOfrbMnyyb0Ety1oZ2DVzPzjUiWGILJ+LDk+6c65WNHYJFrd5FIBZ6++Dfk TVlBWsR5QGkluYsktHOcNcA7Yit+vIPIFAQmEqN5fXoI0ArDZbumk3L6kihXO2fRb8rpv65HbpOd qmjDv/9lZWhS1i8CvLmhSHJulq+YCc1Jf9I1b2AZYErcjxqVInDtyLKdhpFYlh+5i0pJkzvQFD0n 4ZCeWWj00iQamUdylUIKhf3z2GAHxH7IPQLknV/giIGyET6Ud4s0+n5XXI/X5B0jdhesmqoNgONq cv1vEpWYiTaJTFEUbubLHVeKzqBaz6un8X9sFXQPX2qVkZd+eCLhuqseETzEU8VAXhnmv8IKiWRl JbLXqI+UVkJ9sCJMIHqoPynQs9FfbBzGbFi/uYrHETUC0C3YrDAwvP5xMsfMnkHediUusmK7MS+4 ayUpOtEhdxekWDmK9g== X-Report-Abuse-To: spam@s01.spamexperts.axc.nl 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.0 (----) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Mon, 13 Feb 2017 11:25:27 -0500 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 (----) ----Next_Part(Mon_Feb_13_10_57_06_2017_780)-- Content-Type: Text/Plain; charset=utf-8; format=flowed; format=flowed Content-Transfer-Encoding: base64 KGNvbnRpbnVpbmcgdGhlIGRpc2N1c3Npb24gZnJvbSANCmh0dHBzOi8vbGlzdHMuZ251Lm9yZy9h cmNoaXZlL2h0bWwvZ3VpeC1kZXZlbC8yMDE3LTAxL21zZzAyMjM5Lmh0bWwpDQoNCkZyb206IE1h cml1cyBCYWtrZSA8bWJha2tlQGZhc3RtYWlsLmNvbT4NClN1YmplY3Q6IFJlOiBbUEFUQ0hdIGdu dTogcHl0aG9uLW1hdHBsb3RsaWI6IERvbid0IHByb3BhZ2F0ZSANCnB5dGhvbi1udW1weS1ib290 c3RyYXAuDQpEYXRlOiBGcmksIDI3IEphbiAyMDE3IDIwOjU3OjEyICswMTAwDQoNCj4+IFRoaXMg cGF0Y2ggd29ya3MgYXJvdW5kIGl0IGJ5IGNyZWF0aW5nIGFuIGludGVybWVkaWF0ZQ0KPj4gcHl0 aG9uLW1hdHBsb3RsaWItYm9vdHN0cmFwIHBhY2thZ2UgYXMgd2VsbCwgd2hpY2ggaXMgdGhlbiB1 c2VkIGFzIA0KPj4gYQ0KPj4gbmF0aXZlIGlucHV0IHRvIGdlbmVyYXRlIHRoZSBkb2N1bWVudGF0 aW9uIG9mIHB5dGhvbi1udW1weS4NCj4+IHB5dGhvbi1udW1weSBpcyB0aGVuIHVzZWQgYXMgYSBw cm9wYWdhdGVkIGlucHV0IG9mIA0KPj4gcHl0aG9uLW1hdHBsb3RsaWIsDQo+PiBzbyBweXRob24t bnVtcHktYm9vdHN0cmFwIGRvZXNuJ3QgYXBwZWFyIGluIHVzZXIncyBwcm9maWxlcyANCj4+IGFu eW1vcmUuDQo+Pg0KPj4gV2hhdCBkbyB5b3UgdGhpbms/DQo+DQo+IFRoaXMgc291bmRzIHNlbnNp YmxlLiBEb2VzIG51bXB5IG5vdCByZXF1aXJlIGFueSBtYXRwbG90bGliIA0KPiBmdW5jdGlvbnMg YXQNCj4gcnVudGltZT8NCg0KTm8uIEl0J3MganVzdCB1c2VkIGZvciB0aGUgZG9jdW1lbnRhdGlv bi4gIFdpdGggdGhlIGF0dGFjaGVkIHBhdGNoLCANCnRoZSBkZXBlbmRlbmN5IGNoYWluIGlzIHRo aXM6DQoNCm1hdHBsb3RsaWIgLT4gbnVtcHkgLT4gbWF0cGxvdGxpYi1ib290c3RyYXAgLT4gbnVt cHktYm9vdHN0cmFwIA0KKD3igJxudW1weS13aXRob3V0LWRvY3PigJ0pDQoNCj4gSWYgc28sIHRo aXMgcGF0Y2ggTEdUTS4gVGhlIG5ldyBtYXRwbG90bGliLWJvb3RzdHJhcCB2YXJpYWJsZXMNCj4g c2hvdWxkIGhhdmUgYW4gZXhwbGFpbmluZyBjb21tZW50IHRob3VnaCA6KQ0KDQpJJ3ZlIGFkZGVk IGEgY29tbWVudCBhbmQgZml4ZWQgc29tZSBsb25nIGxpbmVzLg0KDQpUaG9tYXMNCg== ----Next_Part(Mon_Feb_13_10_57_06_2017_780)-- Content-Type: Text/X-Patch; charset=utf-8 Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="0001-gnu-python-matplotlib-Don-t-propagate-python-numpy-b.patch" RnJvbSA4YTk1ODRkZDE5NmRhZTM1MjBmZTJhYzRiMDUwYTllMGM4ODUwM2Y4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQ0KRnJvbTogVGhvbWFzIERhbmNrYWVydCA8dGhvbWFzLmRhbmNrYWVydEBn bWFpbC5jb20+DQpEYXRlOiBGcmksIDI3IEphbiAyMDE3IDEyOjEyOjQyICswMTAwDQpTdWJqZWN0 OiBbUEFUQ0hdIGdudTogcHl0aG9uLW1hdHBsb3RsaWI6IERvbid0IHByb3BhZ2F0ZQ0KIHB5dGhv bi1udW1weS1ib290c3RyYXAuDQoNCiogZ251L3BhY2thZ2VzL3B5dGhvbi5zY20gKHB5dGhvbi1t YXRwbG90bGliLWJvb3RzdHJhcCxweXRob24yLW1hdHBsb3RsaWItYm9vdHN0cmFwKToNCiAgTmV3 IHZhcmlhYmxlcy4NCiAgKHB5dGhvbi1tYXRwbG90bGliLCBweXRob24yLW1hdHBsb3RsaWIpIFtw cm9wYWdhdGVkLWlucHV0c106IFVzZQ0KICBweXRob24tbnVtcHkgaW5zdGVhZCBvZiBweXRob24t bnVtcHktYm9vdHN0cmFwLg0KICAocHl0aG9uLW51bXB5LCBweXRob24yLW51bXB5KSBbcHJvcGFn YXRlZC1pbnB1dHMsbmF0aXZlLWlucHV0c106IFJlcGxhY2UNCiAgbWF0cGxvdGxpYiBieSBuYXRp dmUgaW5wdXRzIG1hdHBsb3RsaWItYm9vdHN0cmFwLg0KLS0tDQogZ251L3BhY2thZ2VzL3B5dGhv bi5zY20gfCAyNiArKysrKysrKysrKysrKysrKysrKy0tLS0tLQ0KIDEgZmlsZSBjaGFuZ2VkLCAy MCBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQ0KDQpkaWZmIC0tZ2l0IGEvZ251L3BhY2th Z2VzL3B5dGhvbi5zY20gYi9nbnUvcGFja2FnZXMvcHl0aG9uLnNjbQ0KaW5kZXggODFmOTIwMC4u MTRkMmUyMyAxMDA2NDQNCi0tLSBhL2dudS9wYWNrYWdlcy9weXRob24uc2NtDQorKysgYi9nbnUv cGFja2FnZXMvcHl0aG9uLnNjbQ0KQEAgLTMzLDcgKzMzLDcgQEANCiA7OzsgQ29weXJpZ2h0IMKp IDIwMTYgQXJ1biBJc2FhYyA8YXJ1bmlzYWFjQHN5c3RlbXJlYm9vdC5uZXQ+DQogOzs7IENvcHly aWdodCDCqSAyMDE2IEp1bGllbiBMZXBpbGxlciA8anVsaWVuQGxlcGlsbGVyLmV1Pg0KIDs7OyBD b3B5cmlnaHQgwqkgMjAxNiwgMjAxNyBUb2JpYXMgR2VlcmluY2t4LVJpY2UgPG1lQHRvYmlhcy5n cj4NCi07OzsgQ29weXJpZ2h0IMKpIDIwMTYgVGhvbWFzIERhbmNrYWVydCA8cG9zdEB0aG9tYXNk YW5ja2FlcnQuYmU+DQorOzs7IENvcHlyaWdodCDCqSAyMDE2LCAyMDE3IFRob21hcyBEYW5ja2Fl cnQgPHBvc3RAdGhvbWFzZGFuY2thZXJ0LmJlPg0KIDs7OyBDb3B5cmlnaHQgwqkgMjAxNyBDYXJs byBaYW5jYW5hcm8gPGNhcmxvQHphbmNhbmFyby5pZC5hdT4NCiA7OzsNCiA7OzsgVGhpcyBmaWxl IGlzIHBhcnQgb2YgR05VIEd1aXguDQpAQCAtMzQwNCwxMSArMzQwNCwxMSBAQCBhc3NvY2lhdGlv biBzdHVkaWVzIChHV0FTKSBvbiBleHRyZW1lbHkgbGFyZ2UgZGF0YSBzZXRzLiIpDQogICAgICBg KCgid2hpY2giICx3aGljaCkNCiAgICAgICAgLEAocGFja2FnZS1pbnB1dHMgcHl0aG9uLW51bXB5 LWJvb3RzdHJhcCkpKQ0KICAgICAocHJvcGFnYXRlZC1pbnB1dHMNCi0gICAgIGAoKCJweXRob24t bWF0cGxvdGxpYiIgLHB5dGhvbi1tYXRwbG90bGliKQ0KLSAgICAgICAoInB5dGhvbi1weXBhcnNp bmciICxweXRob24tcHlwYXJzaW5nKQ0KKyAgICAgYCgoInB5dGhvbi1weXBhcnNpbmciICxweXRo b24tcHlwYXJzaW5nKQ0KICAgICAgICAsQChwYWNrYWdlLXByb3BhZ2F0ZWQtaW5wdXRzIHB5dGhv bi1udW1weS1ib290c3RyYXApKSkNCiAgICAgKG5hdGl2ZS1pbnB1dHMNCiAgICAgIGAoKCJwa2ct Y29uZmlnIiAscGtnLWNvbmZpZykNCisgICAgICAgKCJweXRob24tbWF0cGxvdGxpYiIgLHB5dGhv bi1tYXRwbG90bGliLWJvb3RzdHJhcCkgOyB0byBidWlsZCBkb2N1bWVudGF0aW9uDQogICAgICAg ICgicHl0aG9uLXNwaGlueCIgLHB5dGhvbi1zcGhpbngpDQogICAgICAgICgicHl0aG9uLW51bXB5 ZG9jIiAscHl0aG9uLW51bXB5ZG9jKQ0KICAgICAgICAoInRleGxpdmUiICx0ZXhsaXZlKQ0KQEAg LTM0NTgsNyArMzQ1OCwxMSBAQCBhc3NvY2lhdGlvbiBzdHVkaWVzIChHV0FTKSBvbiBleHRyZW1l bHkgbGFyZ2UgZGF0YSBzZXRzLiIpDQogICAgICAgICAgICAgICAscGhhc2VzKSkpKSkpKQ0KIA0K IChkZWZpbmUtcHVibGljIHB5dGhvbjItbnVtcHkNCi0gIChwYWNrYWdlLXdpdGgtcHl0aG9uMiBw eXRob24tbnVtcHkpKQ0KKyAgKGxldCAoKG51bXB5IChwYWNrYWdlLXdpdGgtcHl0aG9uMiBweXRo b24tbnVtcHkpKSkNCisgICAgKHBhY2thZ2UgKGluaGVyaXQgbnVtcHkpDQorICAgICAgICAgICAg IChuYXRpdmUtaW5wdXRzDQorICAgICAgICAgICAgICBgKCgicHl0aG9uLW1hdHBsb3RsaWIiICxw eXRob24yLW1hdHBsb3RsaWItYm9vdHN0cmFwKQ0KKyAgICAgICAgICAgICAgICAsQChhbGlzdC1k ZWxldGUgInB5dGhvbi1tYXRwbG90bGliIiAocGFja2FnZS1uYXRpdmUtaW5wdXRzIG51bXB5KSkp KSkpKQ0KIA0KIChkZWZpbmUtcHVibGljIHB5dGhvbi1weWdpdDINCiAgIChwYWNrYWdlDQpAQCAt MzYyMyw3ICszNjI3LDcgQEAgdHJhbnNjZW5kZW50YWwgZnVuY3Rpb25zKS4iKQ0KICAgICAgICAo ImdvYmplY3QtaW50cm9zcGVjdGlvbiIgLGdvYmplY3QtaW50cm9zcGVjdGlvbikNCiAgICAgICAg KCJweXRob24tdGtpbnRlciIgLHB5dGhvbiAidGsiKQ0KICAgICAgICAoInB5dGhvbi1kYXRldXRp bCIgLHB5dGhvbi1kYXRldXRpbC0yKQ0KLSAgICAgICAoInB5dGhvbi1udW1weSIgLHB5dGhvbi1u dW1weS1ib290c3RyYXApDQorICAgICAgICgicHl0aG9uLW51bXB5IiAscHl0aG9uLW51bXB5KQ0K ICAgICAgICAoInB5dGhvbi1waWxsb3ciICxweXRob24tcGlsbG93KQ0KICAgICAgICAoInB5dGhv bi1weXR6IiAscHl0aG9uLXB5dHopDQogICAgICAgICgicHl0aG9uLXNpeCIgLHB5dGhvbi1zaXgp DQpAQCAtMzc0MCw4ICszNzQ0LDE4IEBAIHRvb2xraXRzLiIpDQogICAgICAgIGAoKCJweXRob24y LXB5Y2Fpcm8iICxweXRob24yLXB5Y2Fpcm8pDQogICAgICAgICAgKCJweXRob24yLXB5Z29iamVj dC0yIiAscHl0aG9uMi1weWdvYmplY3QtMikNCiAgICAgICAgICAoInB5dGhvbjItdGtpbnRlciIg LHB5dGhvbi0yICJ0ayIpDQorICAgICAgICAgKCJweXRob24yLW51bXB5IiAscHl0aG9uMi1udW1w eSkNCiAgICAgICAgICAsQChmb2xkIGFsaXN0LWRlbGV0ZSAocGFja2FnZS1wcm9wYWdhdGVkLWlu cHV0cyBtYXRwbG90bGliKQ0KLSAgICAgICAgICAgICAgICAgJygicHl0aG9uLXB5Y2Fpcm8iICJw eXRob24tcHlnb2JqZWN0IiAicHl0aG9uLXRraW50ZXIiKSkpKSkpKQ0KKyAgICAgICAgICAgICAg ICAgJygicHl0aG9uLXB5Y2Fpcm8iICJweXRob24tcHlnb2JqZWN0IiAicHl0aG9uLXRraW50ZXIi DQorICAgICAgICAgICAgICAgICAgICJweXRob24tbnVtcHkiKSkpKSkpKQ0KKw0KKzs7IFVzZSBg Ym9vdHN0cmFwYCB2ZXJzaW9ucyBvZiBtYXRwbG90bGliIHRvIGJ1aWxkIG51bXB5IGRvY3VtZW50 YXRpb24uDQorKGRlZmluZSBweXRob24tbWF0cGxvdGxpYi1ib290c3RyYXANCisgICgocGFja2Fn ZS1pbnB1dC1yZXdyaXRpbmcgYCgoLHB5dGhvbi1udW1weSAuICxweXRob24tbnVtcHktYm9vdHN0 cmFwKSkpDQorICAgcHl0aG9uLW1hdHBsb3RsaWIpKQ0KKyhkZWZpbmUgcHl0aG9uMi1tYXRwbG90 bGliLWJvb3RzdHJhcA0KKyAgKChwYWNrYWdlLWlucHV0LXJld3JpdGluZyBgKCgscHl0aG9uMi1u dW1weSAuICxweXRob24yLW51bXB5LWJvb3RzdHJhcCkpKQ0KKyAgIHB5dGhvbjItbWF0cGxvdGxp YikpDQogDQogKGRlZmluZS1wdWJsaWMgcHl0aG9uMi1weXNucHRvb2xzDQogICAocGFja2FnZQ0K LS0gDQoyLjcuNA0KDQo= ----Next_Part(Mon_Feb_13_10_57_06_2017_780)---- ------------=_1488840842-22749-3--