[PR PATCH] python3-jupyter_console: revert to using tarball from pypi

[PR PATCH] python3-jupyter_console: revert to using tarball from pypi

[non-Jedi]

[-- Attachment #1: Type: text/plain, Size: 538 bytes --]

There is a new pull request by non-Jedi against master on the void-packages repository

https://github.com/non-Jedi/void-packages python3-jupyter_console/add-script2
https://github.com/void-linux/void-packages/pull/23473

python3-jupyter_console: revert to using tarball from pypi
This reverts #23446 and instead patches setup.py to use setuptools
instead of distutils which automatically generates the necessary
jupyter-console script.

@sgn

A patch file from https://github.com/void-linux/void-packages/pull/23473.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-jupyter_console/add-script2-23473.patch --]
[-- Type: text/x-diff, Size: 2232 bytes --]

From 94a78fe1eab2806a476db375cc67d6c80238bf65 Mon Sep 17 00:00:00 2001
From: Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>
Date: Wed, 8 Jul 2020 12:47:54 -0400
Subject: [PATCH] python3-jupyter_console: revert to using tarball from pypi

This reverts #23446 and instead patches setup.py to use setuptools
instead of distutils which automatically generates the necessary
jupyter-console script.
---
 .../python3-jupyter_console/patches/setuptools.diff   | 11 +++++++++++
 srcpkgs/python3-jupyter_console/template              |  7 +++----
 2 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/python3-jupyter_console/patches/setuptools.diff

diff --git a/srcpkgs/python3-jupyter_console/patches/setuptools.diff b/srcpkgs/python3-jupyter_console/patches/setuptools.diff
new file mode 100644
index 00000000000..4c39edde077
--- /dev/null
+++ b/srcpkgs/python3-jupyter_console/patches/setuptools.diff
@@ -0,0 +1,11 @@
+--- setup.py
++++ setup.py
+@@ -51,7 +51,7 @@
+ import os
+ from glob import glob
+ 
+-from distutils.core import setup
++from setuptools import setup
+ 
+ pjoin = os.path.join
+ here = os.path.abspath(os.path.dirname(__file__))
diff --git a/srcpkgs/python3-jupyter_console/template b/srcpkgs/python3-jupyter_console/template
index 3a56c47392b..d2639818678 100644
--- a/srcpkgs/python3-jupyter_console/template
+++ b/srcpkgs/python3-jupyter_console/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jupyter_console'
 pkgname=python3-jupyter_console
 version=6.1.0
-revision=2
+revision=3
 archs=noarch
 wrksrc="jupyter_console-${version}"
 build_style=python3-module
@@ -13,9 +13,8 @@ short_desc="Jupyter terminal console (Python3)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/jupyter/jupyter_console"
-# pypi release of jupyter_console v6.1.0 does not include scripts dir
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=838c95c99ce52978e1660e7a30dd933dede158e2f4da1bc5fad1a8fad44570b7
+distfiles="${PYPI_SITE}/j/jupyter_console/jupyter_console-${version}.tar.gz"
+checksum=6f6ead433b0534909df789ea64f0a14cdf9b6b2360757756f08182be4b9e431b
 # alternatives will be a conflict
 conflicts="python-jupyter_console<=6.0.0_2"
 

Re: [PR PATCH] [Merged]: python3-jupyter_console: revert to using tarball from pypi

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 357 bytes --]

There's a merged pull request on the void-packages repository

python3-jupyter_console: revert to using tarball from pypi
https://github.com/void-linux/void-packages/pull/23473

Description:
This reverts #23446 and instead patches setup.py to use setuptools
instead of distutils which automatically generates the necessary
jupyter-console script.

@sgn