1 |
commit: 9350101fe3e6c017f6cb301181263f7c48fdb048 |
2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 31 02:19:43 2017 +0000 |
4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 31 02:20:19 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9350101f |
7 |
|
8 |
dev-python/jupyter_client: include the missing patch. |
9 |
|
10 |
Credit: Harris Landgarten |
11 |
Bug: 629376 |
12 |
|
13 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
14 |
|
15 |
.../files/jupyter_client-5.1.0-setuptools.patch | 39 ++++++++++++++++++++++ |
16 |
1 file changed, 39 insertions(+) |
17 |
|
18 |
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 |
19 |
new file mode 100644 |
20 |
index 00000000000..ff7dcb0f3d4 |
21 |
--- /dev/null |
22 |
+++ b/dev-python/jupyter_client/files/jupyter_client-5.1.0-setuptools.patch |
23 |
@@ -0,0 +1,39 @@ |
24 |
+From f9bd2643d42b3354b27e64368d8c15cad18101d2 Mon Sep 17 00:00:00 2001 |
25 |
+From: Philipp A <flying-sheep@×××.de> |
26 |
+Date: Tue, 8 Aug 2017 17:38:52 +0200 |
27 |
+Subject: [PATCH] Always use setuptools if availabe |
28 |
+MIME-Version: 1.0 |
29 |
+Content-Type: text/plain; charset=UTF-8 |
30 |
+Content-Transfer-Encoding: 8bit |
31 |
+ |
32 |
+When running `python* setup.py install`, the `jupyter-run` script doesn’t get installed without this. |
33 |
+--- |
34 |
+ setup.py | 8 +++++++- |
35 |
+ 1 file changed, 7 insertions(+), 1 deletion(-) |
36 |
+ |
37 |
+diff --git a/setup.py b/setup.py |
38 |
+index 60fa17c..0831f7a 100644 |
39 |
+--- a/setup.py |
40 |
++++ b/setup.py |
41 |
+@@ -70,6 +70,7 @@ |
42 |
+ ], |
43 |
+ ) |
44 |
+ |
45 |
++# require setuptools for these cases |
46 |
+ if 'develop' in sys.argv or any(a.startswith('bdist') for a in sys.argv): |
47 |
+ import setuptools |
48 |
+ |
49 |
+@@ -85,7 +86,12 @@ |
50 |
+ 'test': ['ipykernel', 'ipython', 'mock', 'pytest'], |
51 |
+ } |
52 |
+ |
53 |
+-if 'setuptools' in sys.modules: |
54 |
++# always try to use setuptools if available |
55 |
++try: |
56 |
++ import setuptools |
57 |
++except ImportError: |
58 |
++ pass |
59 |
++else: |
60 |
+ setup_args.update(setuptools_args) |
61 |
+ setup_args['entry_points'] = { |
62 |
+ 'console_scripts': [ |