From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 178481396D0 for ; Thu, 31 Aug 2017 02:20:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 628091FC049; Thu, 31 Aug 2017 02:20:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F6341FC049 for ; Thu, 31 Aug 2017 02:20:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2A5D4340AC7 for ; Thu, 31 Aug 2017 02:20:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B758B887E for ; Thu, 31 Aug 2017 02:20:26 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1504146019.9350101fe3e6c017f6cb301181263f7c48fdb048.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/jupyter_client/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/jupyter_client/files/jupyter_client-5.1.0-setuptools.patch X-VCS-Directories: dev-python/jupyter_client/files/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 9350101fe3e6c017f6cb301181263f7c48fdb048 X-VCS-Branch: master Date: Thu, 31 Aug 2017 02:20:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 601665da-a5b5-4f26-9615-b52d230a1071 X-Archives-Hash: f03d743346c83c6c198ec028269cfa53 commit: 9350101fe3e6c017f6cb301181263f7c48fdb048 Author: Benda Xu gentoo org> AuthorDate: Thu Aug 31 02:19:43 2017 +0000 Commit: Benda XU gentoo org> CommitDate: Thu Aug 31 02:20:19 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9350101f dev-python/jupyter_client: include the missing patch. Credit: Harris Landgarten Bug: 629376 Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../files/jupyter_client-5.1.0-setuptools.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dev-python/jupyter_client/files/jupyter_client-5.1.0-setuptools.patch b/dev-python/jupyter_client/files/jupyter_client-5.1.0-setuptools.patch new file mode 100644 index 00000000000..ff7dcb0f3d4 --- /dev/null +++ b/dev-python/jupyter_client/files/jupyter_client-5.1.0-setuptools.patch @@ -0,0 +1,39 @@ +From f9bd2643d42b3354b27e64368d8c15cad18101d2 Mon Sep 17 00:00:00 2001 +From: Philipp A +Date: Tue, 8 Aug 2017 17:38:52 +0200 +Subject: [PATCH] Always use setuptools if availabe +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When running `python* setup.py install`, the `jupyter-run` script doesn’t get installed without this. +--- + setup.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 60fa17c..0831f7a 100644 +--- a/setup.py ++++ b/setup.py +@@ -70,6 +70,7 @@ + ], + ) + ++# require setuptools for these cases + if 'develop' in sys.argv or any(a.startswith('bdist') for a in sys.argv): + import setuptools + +@@ -85,7 +86,12 @@ + 'test': ['ipykernel', 'ipython', 'mock', 'pytest'], + } + +-if 'setuptools' in sys.modules: ++# always try to use setuptools if available ++try: ++ import setuptools ++except ImportError: ++ pass ++else: + setup_args.update(setuptools_args) + setup_args['entry_points'] = { + 'console_scripts': [