* [PR PATCH] Python 3 restore alternatives
@ 2020-10-14 0:21 sgn
2020-10-15 2:12 ` ahesford
` (12 more replies)
0 siblings, 13 replies; 14+ messages in thread
From: sgn @ 2020-10-14 0:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages python-3-restore-alternatives
https://github.com/void-linux/void-packages/pull/25583
Python 3 restore alternatives
A patch file from https://github.com/void-linux/void-packages/pull/25583.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python-3-restore-alternatives-25583.patch --]
[-- Type: text/x-diff, Size: 67269 bytes --]
From a3e8954c5b91a5ad407ffc0e7bf2c74f5136700d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:18:44 +0700
Subject: [PATCH 01/52] python3-Cheroot: restore alternatives
---
srcpkgs/python3-Cheroot/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-Cheroot/template b/srcpkgs/python3-Cheroot/template
index 95fb8cd16fd..dd530169705 100644
--- a/srcpkgs/python3-Cheroot/template
+++ b/srcpkgs/python3-Cheroot/template
@@ -1,7 +1,7 @@
# Template file for 'python3-Cheroot'
pkgname=python3-Cheroot
version=8.3.1
-revision=3
+revision=4
wrksrc="cheroot-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ homepage="https://github.com/cherrypy/cheroot"
changelog="https://github.com/cherrypy/cheroot/blob/master/CHANGES.rst"
distfiles="${PYPI_SITE}/c/cheroot/cheroot-${version}.tar.gz"
checksum=7076d5845f64d729e4155ec2650ad24ee70209340d11b9e619a82e9210a579b8
-conflicts="python-Cheroot>=0"
+alternatives="cheroot:cheroot:/usr/bin/cheroot3"
pre_build() {
vsed -i setup.cfg \
@@ -25,5 +25,6 @@ pre_build() {
}
post_install() {
+ mv $DESTDIR/usr/bin/cheroot $DESTDIR/usr/bin/cheroot3
vlicense LICENSE.md
}
From 1c0bd93c2e2414c9909e2cf07264a6563de4632d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:18:44 +0700
Subject: [PATCH 02/52] python3-Flask: restore alternatives
---
srcpkgs/python3-Flask/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-Flask/template b/srcpkgs/python3-Flask/template
index e761c1104c9..727848704e9 100644
--- a/srcpkgs/python3-Flask/template
+++ b/srcpkgs/python3-Flask/template
@@ -1,7 +1,7 @@
# Template file for 'python3-Flask'
pkgname=python3-Flask
version=1.1.2
-revision=3
+revision=4
wrksrc="${pkgname#*-}-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -15,8 +15,9 @@ license="BSD-3-Clause"
homepage="http://flask.pocoo.org"
distfiles="${PYPI_SITE}/F/Flask/Flask-${version}.tar.gz"
checksum=4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060
-conflicts="python-Flask>=0"
+alternatives="flask:flask:/usr/bin/flask3"
post_install() {
+ mv $DESTDIR/usr/bin/flask $DESTDIR/usr/bin/flask3
vlicense LICENSE.rst
}
From 138eccbfeae0db885d100ed2436b521ed6affdc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:18:45 +0700
Subject: [PATCH 03/52] python3-Mako: restore alternatives
---
srcpkgs/python3-Mako/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-Mako/template b/srcpkgs/python3-Mako/template
index b9fd76af94b..800a99e2620 100644
--- a/srcpkgs/python3-Mako/template
+++ b/srcpkgs/python3-Mako/template
@@ -1,7 +1,7 @@
# Template file for 'python3-Mako'
pkgname=python3-Mako
version=1.1.3
-revision=3
+revision=4
wrksrc="Mako-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,12 +13,13 @@ license="MIT"
homepage="https://www.makotemplates.org/"
distfiles="${PYPI_SITE}/M/Mako/Mako-${version}.tar.gz"
checksum=8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27
-conflicts="python-Mako>=0"
+alternatives="mako-render:mako-render:/usr/bin/mako-render3"
do_check() {
tox -e py27,py${py3_ver/./}
}
post_install() {
+ mv $DESTDIR/usr/bin/mako-render $DESTDIR/usr/bin/mako-render3
vlicense LICENSE
}
From aef64bc0fcaacdd4a8e19182ee30d6cdd518d296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:18:47 +0700
Subject: [PATCH 04/52] python3-Pyro4: restore alternatives
---
srcpkgs/python3-Pyro4/template | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-Pyro4/template b/srcpkgs/python3-Pyro4/template
index a60b9ff99da..fd20dda80e8 100644
--- a/srcpkgs/python3-Pyro4/template
+++ b/srcpkgs/python3-Pyro4/template
@@ -1,7 +1,7 @@
# Template file for 'python3-Pyro4'
pkgname=python3-Pyro4
version=4.80
-revision=3
+revision=4
wrksrc="${pkgname#*-}-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,8 +13,19 @@ homepage="https://pythonhosted.org/Pyro4/"
distfiles="${PYPI_SITE}/P/Pyro4/Pyro4-${version}.tar.gz"
checksum=46847ca703de3f483fbd0b2d22622f36eff03e6ef7ec7704d4ecaa3964cb2220
-conflicts="python-Pyro4>=0"
+alternatives="pyro4-check-config:pyro4-check-config:/usr/bin/pyro4-check-config3
+ pyro4-flameserver:pyro4-flameserver:/usr/bin/pyro4-flameserver3
+ pyro4-httpgateway:pyro4-httpgateway:/usr/bin/pyro4-httpgateway3
+ pyro4-ns:pyro4-ns:/usr/bin/pyro4-ns3
+ pyro4-nsc:pyro4-nsc:/usr/bin/pyro4-nsc3
+ pyro4-test-echoserver:pyro4-test-echoserver:/usr/bin/pyro4-test-echoserver3"
post_install() {
+ mv $DESTDIR/usr/bin/pyro4-check-config $DESTDIR/usr/bin/pyro4-check-config3
+ mv $DESTDIR/usr/bin/pyro4-flameserver $DESTDIR/usr/bin/pyro4-flameserver3
+ mv $DESTDIR/usr/bin/pyro4-httpgateway $DESTDIR/usr/bin/pyro4-httpgateway3
+ mv $DESTDIR/usr/bin/pyro4-ns $DESTDIR/usr/bin/pyro4-ns3
+ mv $DESTDIR/usr/bin/pyro4-nsc $DESTDIR/usr/bin/pyro4-nsc3
+ mv $DESTDIR/usr/bin/pyro4-test-echoserver $DESTDIR/usr/bin/pyro4-test-echoserver3
vlicense LICENSE
}
From da79d7527cf21c66801c09bed62b7d6ac0650980 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:18:47 +0700
Subject: [PATCH 05/52] python3-Sphinx: restore alternatives
---
srcpkgs/python3-Sphinx/template | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-Sphinx/template b/srcpkgs/python3-Sphinx/template
index 0036808052d..65c4ba70690 100644
--- a/srcpkgs/python3-Sphinx/template
+++ b/srcpkgs/python3-Sphinx/template
@@ -1,7 +1,7 @@
# Template file for 'python3-Sphinx'
pkgname=python3-Sphinx
version=3.2.1
-revision=3
+revision=4
wrksrc=Sphinx-${version}
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -19,12 +19,19 @@ license="BSD-3-Clause"
homepage="http://sphinx-doc.org"
distfiles="${PYPI_SITE}/S/Sphinx/Sphinx-${version}.tar.gz"
checksum=321d6d9b16fa381a5306e5a0b76cd48ffbc588e6340059a729c6fdd66087e0e8
-conflicts="python-Sphinx>=0"
+alternatives="sphinx-apidoc:sphinx-apidoc:/usr/bin/sphinx-apidoc3
+ sphinx-autogen:sphinx-autogen:/usr/bin/sphinx-autogen3
+ sphinx-build:sphinx-build:/usr/bin/sphinx-build3
+ sphinx-quickstart:sphinx-quickstart:/usr/bin/sphinx-quickstart3"
do_check() {
PYTHONPATH=$(pwd)/build/lib pytest
}
post_install() {
+ mv $DESTDIR/usr/bin/sphinx-apidoc $DESTDIR/usr/bin/sphinx-apidoc3
+ mv $DESTDIR/usr/bin/sphinx-autogen $DESTDIR/usr/bin/sphinx-autogen3
+ mv $DESTDIR/usr/bin/sphinx-build $DESTDIR/usr/bin/sphinx-build3
+ mv $DESTDIR/usr/bin/sphinx-quickstart $DESTDIR/usr/bin/sphinx-quickstart3
vlicense LICENSE
}
From 34de28706b642b9b95dd1999fd3ada5fedf03860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:18:49 +0700
Subject: [PATCH 06/52] python3-Unidecode: restore alternatives
---
srcpkgs/python3-Unidecode/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-Unidecode/template b/srcpkgs/python3-Unidecode/template
index 9dbf90e2df4..1ad696eeabd 100644
--- a/srcpkgs/python3-Unidecode/template
+++ b/srcpkgs/python3-Unidecode/template
@@ -1,7 +1,7 @@
# Template file for 'python3-Unidecode'
pkgname=python3-Unidecode
version=1.1.1
-revision=4
+revision=5
wrksrc="Unidecode-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,8 +12,12 @@ license="GPL-2.0-or-later"
homepage="https://pypi.org/project/Unidecode/"
distfiles="${PYPI_SITE}/U/Unidecode/Unidecode-${version}.tar.gz"
checksum=2b6aab710c2a1647e928e36d69c21e76b453cd455f4e2621000e54b2a9b8cce8
-conflicts="python-Unidecode>=0"
+alternatives="unidecode:unidecode:/usr/bin/unidecode3"
do_check() {
python3 setup.py test
}
+
+post_install() {
+ mv $DESTDIR/usr/bin/unidecode $DESTDIR/usr/bin/unidecode3
+}
From ddb43271c55e4adc51194c58b112d8d03dfb3f3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:18:50 +0700
Subject: [PATCH 07/52] python3-arxiv2bib: restore alternatives
---
srcpkgs/python3-arxiv2bib/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-arxiv2bib/template b/srcpkgs/python3-arxiv2bib/template
index b59206102e3..c337ea95b44 100644
--- a/srcpkgs/python3-arxiv2bib/template
+++ b/srcpkgs/python3-arxiv2bib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-arxiv2bib'
pkgname=python3-arxiv2bib
version=1.0.8
-revision=5
+revision=6
wrksrc="arxiv2bib-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,9 +12,10 @@ license="BSD-3-Clause"
homepage="http://nathangrigg.github.io/arxiv2bib"
distfiles="${PYPI_SITE}/a/arxiv2bib/arxiv2bib-${version}.tar.gz"
checksum=137608ed8aa4da6594350152964b9b0f46c6efcb07f8a4dfd50309c968b647a8
-conflicts="python-arxiv2bib>=0"
+alternatives="arxiv2bib:arxiv2bib:/usr/bin/arxiv2bib3"
post_install() {
+ mv $DESTDIR/usr/bin/arxiv2bib $DESTDIR/usr/bin/arxiv2bib3
sed -n '3,28p' arxiv2bib.py > LICENSE
vlicense LICENSE
}
From 09d09e81cfe129129b304c6d818e9a019f4e8ed5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:18:51 +0700
Subject: [PATCH 08/52] python3-chroot: restore alternatives
---
srcpkgs/python3-chroot/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-chroot/template b/srcpkgs/python3-chroot/template
index 0698fd872c3..ce3f9a08165 100644
--- a/srcpkgs/python3-chroot/template
+++ b/srcpkgs/python3-chroot/template
@@ -1,7 +1,7 @@
# Template file for 'python3-chroot'
pkgname=python3-chroot
version=0.10.1
-revision=1
+revision=2
wrksrc="pychroot-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools python3-snakeoil"
@@ -13,8 +13,9 @@ homepage="https://github.com/pkgcore/pychroot"
#changelog="https://github.com/pkgcore/pychroot/blob/master/NEWS.rst"
distfiles="${PYPI_SITE}/p/pychroot/pychroot-${version}.tar.gz"
checksum=10b2d5195062d110df8e28bcdb1d79d1e8109fb77a226455ab2df6b40e7ff289
-conflicts="python-chroot>=0"
+alternatives="pychroot:pychroot:/usr/bin/pychroot3"
post_install() {
+ mv $DESTDIR/usr/bin/pychroot $DESTDIR/usr/bin/pychroot3
vlicense LICENSE
}
From 989f5fde4a77be50a2eeddc2c12a281c3b890bfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:18:53 +0700
Subject: [PATCH 09/52] python3-codespell: restore alternatives
---
srcpkgs/python3-codespell/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-codespell/template b/srcpkgs/python3-codespell/template
index 98583fb9259..2e4e99f927f 100644
--- a/srcpkgs/python3-codespell/template
+++ b/srcpkgs/python3-codespell/template
@@ -1,7 +1,7 @@
# Template file for 'python3-codespell'
pkgname=python3-codespell
version=1.16.0
-revision=4
+revision=5
wrksrc="codespell-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,4 +12,8 @@ license="GPL-2.0-or-later"
homepage="https://github.com/codespell-project/codespell"
distfiles="${homepage}/archive/v${version}.tar.gz"
checksum=53d22aefa1daf3365ca4625877271d23d143c0a92c16e55daf5cd14b6494b8f4
-conflicts="python-codespell>=0"
+alternatives="codespell:codespell:/usr/bin/codespell3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/codespell $DESTDIR/usr/bin/codespell3
+}
From 41edfeb2e6090e3944fcea8312bd5b59e798d9dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:18:54 +0700
Subject: [PATCH 10/52] python3-cram: restore alternatives
---
srcpkgs/python3-cram/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-cram/template b/srcpkgs/python3-cram/template
index c66a8e66783..8a3542ddcb8 100644
--- a/srcpkgs/python3-cram/template
+++ b/srcpkgs/python3-cram/template
@@ -1,7 +1,7 @@
# Template file for 'python3-cram'
pkgname=python3-cram
version=0.7
-revision=5
+revision=6
wrksrc="cram-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,4 +12,8 @@ license="GPL-2.0-or-later"
homepage="https://bitheap.org/cram/"
distfiles="${PYPI_SITE}/c/cram/cram-${version}.tar.gz"
checksum=7da7445af2ce15b90aad5ec4792f857cef5786d71f14377e9eb994d8b8337f2f
-conflicts="python-cram>=0"
+alternatives="cram:cram:/usr/bin/cram3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/cram $DESTDIR/usr/bin/cram3
+}
From 25dbd5dcb1f951c97f5a5b6a6bac40b80741dab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:18:56 +0700
Subject: [PATCH 11/52] python3-cssutils: restore alternatives
---
srcpkgs/python3-cssutils/template | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-cssutils/template b/srcpkgs/python3-cssutils/template
index 83910cdada3..00e8af52ccf 100644
--- a/srcpkgs/python3-cssutils/template
+++ b/srcpkgs/python3-cssutils/template
@@ -1,7 +1,7 @@
# Template file for 'python3-cssutils'
pkgname=python3-cssutils
version=1.0.2
-revision=5
+revision=6
wrksrc="cssutils-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -14,4 +14,12 @@ homepage="https://pypi.org/project/cssutils/"
distfiles="${PYPI_SITE}/c/cssutils/cssutils-${version}.tar.gz"
checksum=a2fcf06467553038e98fea9cfe36af2bf14063eb147a70958cfcaa8f5786acaf
-conflicts="python-cssutils>=0"
+alternatives="csscapture:csscapture:/usr/bin/csscapture3
+ csscombine:csscombine:/usr/bin/csscombine3
+ cssparse:cssparse:/usr/bin/cssparse3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/csscapture $DESTDIR/usr/bin/csscapture3
+ mv $DESTDIR/usr/bin/csscombine $DESTDIR/usr/bin/csscombine3
+ mv $DESTDIR/usr/bin/cssparse $DESTDIR/usr/bin/cssparse3
+}
From a8a41e002b4e9425a4853e8a3125f533ff9cd5d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:18:57 +0700
Subject: [PATCH 12/52] python3-dulwich: restore alternatives
---
srcpkgs/python3-dulwich/template | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-dulwich/template b/srcpkgs/python3-dulwich/template
index 14abdb26feb..2cb25809a95 100644
--- a/srcpkgs/python3-dulwich/template
+++ b/srcpkgs/python3-dulwich/template
@@ -1,7 +1,7 @@
# Template file for 'python3-dulwich'
pkgname=python3-dulwich
version=0.19.14
-revision=4
+revision=5
wrksrc="dulwich-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -15,13 +15,18 @@ homepage="https://www.dulwich.io/"
distfiles="${PYPI_SITE}/d/dulwich/dulwich-${version}.tar.gz"
checksum=d1320232c859ab086fff79eee8fa6ddbcbcbe01ff0c64c9bed48eca470b00b46
-conflicts="python-dulwich>=0"
+alternatives="dul-receive-pack:dul-receive-pack:/usr/bin/dul-receive-pack3
+ dul-upload-pack:dul-upload-pack:/usr/bin/dul-upload-pack3
+ dulwich:dulwich:/usr/bin/dulwich3"
do_check() {
python3 setup.py test
}
post_install() {
+ mv $DESTDIR/usr/bin/dul-receive-pack $DESTDIR/usr/bin/dul-receive-pack3
+ mv $DESTDIR/usr/bin/dul-upload-pack $DESTDIR/usr/bin/dul-upload-pack3
+ mv $DESTDIR/usr/bin/dulwich $DESTDIR/usr/bin/dulwich3
# remove extra docs
rm -rf ${DESTDIR}/usr/lib/python*/site-packages/docs
}
From 56b2fee0dcfd02cf1ac3822f9858c03a4b5d93cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:18:58 +0700
Subject: [PATCH 13/52] python3-envdir: restore alternatives
---
srcpkgs/python3-envdir/template | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-envdir/template b/srcpkgs/python3-envdir/template
index c1d3e392587..a315b99553a 100644
--- a/srcpkgs/python3-envdir/template
+++ b/srcpkgs/python3-envdir/template
@@ -1,7 +1,7 @@
# Template file for 'python3-envdir'
pkgname=python3-envdir
version=1.0.1
-revision=5
+revision=6
wrksrc="envdir-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,8 +12,11 @@ license="MIT"
homepage="https://github.com/jezdez/envdir"
distfiles="https://github.com/jezdez/envdir/archive/${version}.tar.gz"
checksum=779a308a07a673f391db87ef639d4b0f9921238bba02dd3e98c3281520faee95
-conflicts="python-envdir>=0"
+alternatives="envdir:envdir:/usr/bin/envdir3
+ envshell:envshell:/usr/bin/envshell3"
post_install() {
+ mv $DESTDIR/usr/bin/envdir $DESTDIR/usr/bin/envdir3
+ mv $DESTDIR/usr/bin/envshell $DESTDIR/usr/bin/envshell3
vlicense LICENSE
}
From 412fdf7b18a0024ae7219d06b0f63fed7aad7a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:00 +0700
Subject: [PATCH 14/52] python3-exifread: restore alternatives
---
srcpkgs/python3-exifread/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-exifread/template b/srcpkgs/python3-exifread/template
index 3e90335a4b2..a0bac87b6a8 100644
--- a/srcpkgs/python3-exifread/template
+++ b/srcpkgs/python3-exifread/template
@@ -1,7 +1,7 @@
# Template file for 'python3-exifread'
pkgname=python3-exifread
version=2.3.1
-revision=3
+revision=4
wrksrc="exif-py-${version}"
build_style="python3-module"
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
homepage="https://github.com/ianare/exif-py"
distfiles="https://github.com/ianare/exif-py/archive/${version}.tar.gz"
checksum=b6b012d72df9af6e8a4fb439914f3a293f0a63c2087c21e94f5b6e1221de45f4
-conflicts="python-exifread>=0"
+alternatives="EXIF.py:EXIF.py:/usr/bin/EXIF.py3"
pre_build() {
# Upstream didn't update version in this file
@@ -20,5 +20,6 @@ pre_build() {
}
post_install() {
+ mv $DESTDIR/usr/bin/EXIF.py $DESTDIR/usr/bin/EXIF.py3
vlicense LICENSE.txt
}
From dc7cbbea48d00d53db0aa1f991886b75bfdbc0af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:00 +0700
Subject: [PATCH 15/52] python3-future: restore alternatives
---
srcpkgs/python3-future/template | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-future/template b/srcpkgs/python3-future/template
index 6782bef15f0..fa63c47e1d1 100644
--- a/srcpkgs/python3-future/template
+++ b/srcpkgs/python3-future/template
@@ -1,7 +1,7 @@
# Template file for 'python3-future'
pkgname=python3-future
version=0.18.2
-revision=4
+revision=5
wrksrc="future-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,8 +13,11 @@ homepage="https://python-future.org/"
distfiles="${PYPI_SITE}/f/future/future-${version}.tar.gz"
checksum=b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d
-conflicts="python-future>=0"
+alternatives="futurize:futurize:/usr/bin/futurize3
+ pasteurize:pasteurize:/usr/bin/pasteurize3"
post_install() {
+ mv $DESTDIR/usr/bin/futurize $DESTDIR/usr/bin/futurize3
+ mv $DESTDIR/usr/bin/pasteurize $DESTDIR/usr/bin/pasteurize3
vlicense LICENSE.txt
}
From 4651c7f9902a471a1ee17181ac36dd06312b570b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:01 +0700
Subject: [PATCH 16/52] python3-gitlab: restore alternatives
---
srcpkgs/python3-gitlab/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-gitlab/template b/srcpkgs/python3-gitlab/template
index 8ef62b2570e..33965137a99 100644
--- a/srcpkgs/python3-gitlab/template
+++ b/srcpkgs/python3-gitlab/template
@@ -1,7 +1,7 @@
# Template file for 'python3-gitlab'
pkgname=python3-gitlab
version=1.12.1
-revision=4
+revision=5
wrksrc=python-gitlab-$version
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -14,8 +14,12 @@ homepage="https://github.com/gpocentek/python-gitlab"
changelog="https://raw.githubusercontent.com/python-gitlab/python-gitlab/master/ChangeLog.rst"
distfiles="${PYPI_SITE}/p/python-gitlab/python-gitlab-${version}.tar.gz"
checksum=984e110c1f76fd939652c30ce3101267a7064e34417cbfc4687e6106d4db54ec
-conflicts="python-gitlab>=0"
+alternatives="gitlab:gitlab:/usr/bin/gitlab3"
do_check() {
python2 setup.py test
}
+
+post_install() {
+ mv $DESTDIR/usr/bin/gitlab $DESTDIR/usr/bin/gitlab3
+}
From 2fb42887dbc1a72e9bbb66f34b2631fe88f0061a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:03 +0700
Subject: [PATCH 17/52] python3-grako: restore alternatives
---
srcpkgs/python3-grako/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-grako/template b/srcpkgs/python3-grako/template
index 6ee30b92454..dc2c3552a17 100644
--- a/srcpkgs/python3-grako/template
+++ b/srcpkgs/python3-grako/template
@@ -1,7 +1,7 @@
# Template file for 'python3-grako'
pkgname=python3-grako
version=3.99.9
-revision=7
+revision=8
wrksrc="grako-$version"
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
@@ -13,12 +13,13 @@ license="BSD-2-Clause"
homepage="https://bitbucket.org/neogeny/grako"
distfiles="$PYPI_SITE/g/grako/grako-$version.zip"
checksum=fcc37309eab7cd0cbbb26cfd6a54303fbb80a00a58ab295d1e665bc69189c364
-conflicts="python-grako>=0"
+alternatives="grako:grako:/usr/bin/grako3"
pre_build() {
sed -i '/setup_requires=/d' setup.py
}
post_install() {
+ mv $DESTDIR/usr/bin/grako $DESTDIR/usr/bin/grako3
# TODO: Find out why we need to change these permissions manually
chmod -R +r "${DESTDIR}/${py3_sitelib}"
vlicense LICENSE.txt
From 57c2777fbac6a1161c080fd756d1c60739213229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:05 +0700
Subject: [PATCH 18/52] python3-hoedown: restore alternatives
---
srcpkgs/python3-hoedown/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-hoedown/template b/srcpkgs/python3-hoedown/template
index 95843689b5b..4f68e41c31f 100644
--- a/srcpkgs/python3-hoedown/template
+++ b/srcpkgs/python3-hoedown/template
@@ -1,7 +1,7 @@
# Template file for 'python3-hoedown'
pkgname=python3-hoedown
version=0.3.0
-revision=5
+revision=6
wrksrc="hoedown-$version"
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
@@ -12,7 +12,7 @@ homepage="https://github.com/hhatto/python-hoedown"
license="MIT"
distfiles="${PYPI_SITE}/h/hoedown/hoedown-${version}.tar.gz"
checksum=f987998271adbba8cae3d622ebaa566d72e86f0c5af73131a819f7da6ccbeb90
-conflicts="python-hoedown>=0"
+alternatives="hoedownpy:hoedownpy:/usr/bin/hoedownpy3"
post_extract() {
rm -f hoedownpy/hoedown.c
@@ -21,3 +21,7 @@ post_extract() {
pre_build() {
python3 setup.py compile_cython
}
+
+post_install() {
+ mv $DESTDIR/usr/bin/hoedownpy $DESTDIR/usr/bin/hoedownpy3
+}
From 2bbcb1b86ab0c9ee92ac0af47bad20dbce198ea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:06 +0700
Subject: [PATCH 19/52] python3-icalendar: restore alternatives
---
srcpkgs/python3-icalendar/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-icalendar/template b/srcpkgs/python3-icalendar/template
index 78d1433b144..a4698ee58d4 100644
--- a/srcpkgs/python3-icalendar/template
+++ b/srcpkgs/python3-icalendar/template
@@ -1,7 +1,7 @@
# Template file for 'python3-icalendar'
pkgname=python3-icalendar
version=4.0.6
-revision=3
+revision=4
wrksrc="icalendar-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,8 +13,9 @@ license="BSD-2-Clause"
homepage="https://github.com/collective/icalendar"
distfiles="${PYPI_SITE}/i/icalendar/icalendar-${version}.tar.gz"
checksum=7e6fe7232622abe32d8f54d0936ffcd5a9087198a4c2f1ec1803a7dd9fdd979f
-conflicts="python-icalendar>=0"
+alternatives="icalendar:icalendar:/usr/bin/icalendar3"
post_install() {
+ mv $DESTDIR/usr/bin/icalendar $DESTDIR/usr/bin/icalendar3
vlicense LICENSE.rst LICENSE
}
From f5f779295888399b233e4e34fc378c72cbd39619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:08 +0700
Subject: [PATCH 20/52] python3-isort: restore alternatives
---
srcpkgs/python3-isort/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-isort/template b/srcpkgs/python3-isort/template
index 67c12e9e63f..8e5ece3b212 100644
--- a/srcpkgs/python3-isort/template
+++ b/srcpkgs/python3-isort/template
@@ -1,7 +1,7 @@
# Template file for 'python3-isort'
pkgname=python3-isort
version=4.3.21
-revision=4
+revision=5
wrksrc="isort-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -14,12 +14,13 @@ homepage="https://github.com/timothycrosley/isort"
changelog="https://raw.githubusercontent.com/timothycrosley/isort/master/CHANGELOG.md"
distfiles="${PYPI_SITE}/i/isort/isort-${version}.tar.gz"
checksum=54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1
-conflicts="python-isort>=0"
+alternatives="isort:isort:/usr/bin/isort3"
do_check() {
pytest3 test_isort.py
}
post_install() {
+ mv $DESTDIR/usr/bin/isort $DESTDIR/usr/bin/isort3
vlicense LICENSE
}
From c74279f48bdb3d22f043b09d588561bb5aba4507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:09 +0700
Subject: [PATCH 21/52] python3-jmespath: restore alternatives
---
srcpkgs/python3-jmespath/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-jmespath/template b/srcpkgs/python3-jmespath/template
index 236829aac1e..0d8b6377253 100644
--- a/srcpkgs/python3-jmespath/template
+++ b/srcpkgs/python3-jmespath/template
@@ -1,7 +1,7 @@
# Template file for 'python3-jmespath'
pkgname=python3-jmespath
version=0.10.0
-revision=3
+revision=4
wrksrc="jmespath.py-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,8 +12,9 @@ license="MIT"
homepage="http://jmespath.org"
distfiles="https://github.com/jmespath/jmespath.py/archive/${version}.tar.gz"
checksum=999b0ef13b798cf04de5451a51201d63a6feaf07c3fdcfbab4e5bca2b4ac653e
-conflicts="python-jmespath>=0"
+alternatives="jp.py:jp.py:/usr/bin/jp.py3"
post_install() {
+ mv $DESTDIR/usr/bin/jp.py $DESTDIR/usr/bin/jp.py3
vlicense LICENSE.txt
}
From 5b8a9abe895a3b636bcf942ebf3e65cfdae7984f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:10 +0700
Subject: [PATCH 22/52] python3-jsonpointer: restore alternatives
---
srcpkgs/python3-jsonpointer/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-jsonpointer/template b/srcpkgs/python3-jsonpointer/template
index 0b88878f690..d34a4c22f35 100644
--- a/srcpkgs/python3-jsonpointer/template
+++ b/srcpkgs/python3-jsonpointer/template
@@ -1,7 +1,7 @@
# Template file for 'python3-jsonpointer'
pkgname=python3-jsonpointer
version=2.0
-revision=4
+revision=5
wrksrc="jsonpointer-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,8 +12,9 @@ license="BSD-3-Clause"
homepage="https://github.com/stefankoegl/python-json-pointer"
distfiles="${PYPI_SITE}/j/jsonpointer/jsonpointer-${version}.tar.gz"
checksum=c192ba86648e05fdae4f08a17ec25180a9aef5008d973407b581798a83975362
-conflicts="python-jsonpointer>=0"
+alternatives="jsonpointer:jsonpointer:/usr/bin/jsonpointer3"
post_install() {
+ mv $DESTDIR/usr/bin/jsonpointer $DESTDIR/usr/bin/jsonpointer3
vlicense LICENSE.txt LICENSE
}
From 6db8e7ef47422cf82a987cbcb97c936c4383c6ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:11 +0700
Subject: [PATCH 23/52] python3-jsonschema: restore alternatives
---
srcpkgs/python3-jsonschema/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template
index c3954b106dc..19ea51d070b 100644
--- a/srcpkgs/python3-jsonschema/template
+++ b/srcpkgs/python3-jsonschema/template
@@ -2,7 +2,7 @@
pkgname=python3-jsonschema
reverts="3.0.2_1"
version=2.6.0
-revision=6
+revision=7
wrksrc="jsonschema-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="MIT"
homepage="https://github.com/Julian/jsonschema"
distfiles="${PYPI_SITE}/j/jsonschema/jsonschema-${version}.tar.gz"
checksum=6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02
-conflicts="python-jsonschema>=0"
+alternatives="jsonschema:jsonschema:/usr/bin/jsonschema3"
pre_build() {
vsed -i setup.py \
@@ -23,5 +23,6 @@ pre_build() {
version=\"${version}\","
}
post_install() {
+ mv $DESTDIR/usr/bin/jsonschema $DESTDIR/usr/bin/jsonschema3
vlicense COPYING LICENSE
}
From 6c9b867265957064732587926981af4ccfcc1702 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:13 +0700
Subject: [PATCH 24/52] python3-kaptan: restore alternatives
---
srcpkgs/python3-kaptan/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-kaptan/template b/srcpkgs/python3-kaptan/template
index c2a0d57586d..85f037955b4 100644
--- a/srcpkgs/python3-kaptan/template
+++ b/srcpkgs/python3-kaptan/template
@@ -1,7 +1,7 @@
# Template file for 'python3-kaptan'
pkgname=python3-kaptan
version=0.5.12
-revision=4
+revision=5
wrksrc="kaptan-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,8 +12,9 @@ license="BSD-3-Clause"
homepage="https://github.com/emre/kaptan"
distfiles="${PYPI_SITE}/k/kaptan/kaptan-${version}.tar.gz"
checksum=@b0714c3c0c58006ca6d9fc5528d103685773ed22496d5dd582fbd7efe6a67c7a
-conflicts="python-kaptan>=0"
+alternatives="kaptan:kaptan:/usr/bin/kaptan3"
post_install() {
+ mv $DESTDIR/usr/bin/kaptan $DESTDIR/usr/bin/kaptan3
vlicense LICENSE
}
From 55b039d6974ea666c54f76b884f3238475fc5671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:14 +0700
Subject: [PATCH 25/52] python3-mygpoclient: restore alternatives
---
srcpkgs/python3-mygpoclient/template | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-mygpoclient/template b/srcpkgs/python3-mygpoclient/template
index a3d39790977..6e166c63040 100644
--- a/srcpkgs/python3-mygpoclient/template
+++ b/srcpkgs/python3-mygpoclient/template
@@ -1,7 +1,7 @@
# Template file for 'python3-mygpoclient'
pkgname=python3-mygpoclient
version=1.8
-revision=5
+revision=6
wrksrc="mygpoclient-${version}"
build_style=python3-module
hostmakedepends="python3-devel"
@@ -12,8 +12,16 @@ license="GPL-3.0-or-later"
homepage="https://github.com/gpodder/mygpoclient"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=65fcb3ab220a2ba2d32a77f969b423a2f663413b6c485b7b02e5a955b28e68d2
-conflicts="python-mygpoclient>=0"
+alternatives="mygpo-bpsync:mygpo-bpsync:/usr/bin/mygpo-bpsync3
+ mygpo-list-devices:mygpo-list-devices:/usr/bin/mygpo-list-devices3
+ mygpo-simple-client:mygpo-simple-client:/usr/bin/mygpo-simple-client3"
pre_build() {
sed -i '/share\/man\/man1/d' setup.py
}
+
+post_install() {
+ mv $DESTDIR/usr/bin/mygpo-bpsync $DESTDIR/usr/bin/mygpo-bpsync3
+ mv $DESTDIR/usr/bin/mygpo-list-devices $DESTDIR/usr/bin/mygpo-list-devices3
+ mv $DESTDIR/usr/bin/mygpo-simple-client $DESTDIR/usr/bin/mygpo-simple-client3
+}
From 12da7813738c28c445c226b9d6202801c0358c79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:15 +0700
Subject: [PATCH 26/52] python3-natsort: restore alternatives
---
srcpkgs/python3-natsort/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-natsort/template b/srcpkgs/python3-natsort/template
index 0cc3ea1e95e..b9b6c715187 100644
--- a/srcpkgs/python3-natsort/template
+++ b/srcpkgs/python3-natsort/template
@@ -1,7 +1,7 @@
# Template file for 'python3-natsort'
pkgname=python3-natsort
version=6.0.0
-revision=4
+revision=5
wrksrc="natsort-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,12 +13,13 @@ license="MIT"
homepage="https://github.com/SethMMorton/natsort"
distfiles="${PYPI_SITE}/n/natsort/natsort-${version}.tar.gz"
checksum=ff3effb5618232866de8d26e5af4081a4daa9bb0dfed49ac65170e28e45f2776
-conflicts="python-natsort>=0"
+alternatives="natsort:natsort:/usr/bin/natsort3"
do_check() {
python3 -m pytest
}
post_install() {
+ mv $DESTDIR/usr/bin/natsort $DESTDIR/usr/bin/natsort3
vlicense LICENSE
}
From 5108f30613d42f98df74528c0f9c6bd3247593c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:17 +0700
Subject: [PATCH 27/52] python3-ndg_httpsclient: restore alternatives
---
srcpkgs/python3-ndg_httpsclient/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-ndg_httpsclient/template b/srcpkgs/python3-ndg_httpsclient/template
index 03c0861f8d9..6bbdd2ef372 100644
--- a/srcpkgs/python3-ndg_httpsclient/template
+++ b/srcpkgs/python3-ndg_httpsclient/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ndg_httpsclient'
pkgname=python3-ndg_httpsclient
version=0.5.1
-revision=4
+revision=5
wrksrc="ndg_httpsclient-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,8 +12,9 @@ license="BSD-3-Clause"
homepage="https://github.com/cedadev/ndg_httpsclient"
distfiles="${PYPI_SITE}/n/ndg_httpsclient/ndg_httpsclient-${version}.tar.gz"
checksum=d72faed0376ab039736c2ba12e30695e2788c4aa569c9c3e3d72131de2592210
-conflicts="python-ndg_httpsclient>=0"
+alternatives="ndg_httpclient:ndg_httpclient:/usr/bin/ndg_httpclient3"
post_install() {
+ mv $DESTDIR/usr/bin/ndg_httpclient $DESTDIR/usr/bin/ndg_httpclient3
vlicense ndg/httpsclient/LICENSE
}
From 1edead2761fa841258711d08974c3652aa2c5dd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:18 +0700
Subject: [PATCH 28/52] python3-netaddr: restore alternatives
---
srcpkgs/python3-netaddr/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-netaddr/template b/srcpkgs/python3-netaddr/template
index 7f548522595..a2d647de04e 100644
--- a/srcpkgs/python3-netaddr/template
+++ b/srcpkgs/python3-netaddr/template
@@ -1,7 +1,7 @@
# Template file for 'python3-netaddr'
pkgname=python3-netaddr
version=0.8.0
-revision=1
+revision=2
wrksrc="netaddr-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,12 +13,13 @@ license="BSD-3-Clause"
homepage="https://github.com/drkjam/netaddr/"
distfiles="${PYPI_SITE}/n/netaddr/netaddr-${version}.tar.gz"
checksum=d6cc57c7a07b1d9d2e917aa8b36ae8ce61c35ba3fcd1b83ca31c5a0ee2b5a243
-conflicts="python-netaddr>=0"
+alternatives="netaddr:netaddr:/usr/bin/netaddr3"
do_check() {
python3 -m pytest
}
post_install() {
+ mv $DESTDIR/usr/bin/netaddr $DESTDIR/usr/bin/netaddr3
vlicense LICENSE
}
From 24cffce0ce98d730fb22830fc8d968be2800e8ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:20 +0700
Subject: [PATCH 29/52] python3-nose2: restore alternatives
---
srcpkgs/python3-nose2/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-nose2/template b/srcpkgs/python3-nose2/template
index d1f95c3e373..f824df162fa 100644
--- a/srcpkgs/python3-nose2/template
+++ b/srcpkgs/python3-nose2/template
@@ -1,7 +1,7 @@
# Template file for 'python3-nose2'
pkgname=python3-nose2
version=0.8.0
-revision=4
+revision=5
wrksrc="nose2-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,8 +12,9 @@ license="BSD-2-Clause"
homepage="https://github.com/nose-devs/nose2"
distfiles="${PYPI_SITE}/n/nose2/nose2-${version}.tar.gz"
checksum=9052f2b46807b63d9bdf68e0768da1f8386368889b50043fd5d0889c470258f3
-conflicts="python-nose2>=0"
+alternatives="nose2:nose2:/usr/bin/python3-nose2"
post_install() {
+ mv $DESTDIR/usr/bin/nose2 $DESTDIR/usr/bin/python3-nose2
vlicense license.txt
}
From 239097293c92520583bc28d3cbd8fb8cc86430b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:21 +0700
Subject: [PATCH 30/52] python3-numpy-stl: restore alternatives
---
srcpkgs/python3-numpy-stl/template | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-numpy-stl/template b/srcpkgs/python3-numpy-stl/template
index 2876d3266ad..11a7e38d0c0 100644
--- a/srcpkgs/python3-numpy-stl/template
+++ b/srcpkgs/python3-numpy-stl/template
@@ -1,7 +1,7 @@
# Template file for 'python3-numpy-stl'
pkgname=python3-numpy-stl
version=2.11.2
-revision=2
+revision=3
wrksrc="numpy-stl-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
@@ -14,7 +14,9 @@ homepage="https://github.com/WoLpH/numpy-stl/"
distfiles="https://github.com/WoLpH/numpy-stl/archive/v${version}.tar.gz"
checksum=d1985a27fa8c28e5883bf9cb9c3c33a0ac7fad196fc6162d59c701ab18740ac4
-conflicts="python-numpy-stl>=0"
+alternatives="stl:stl:/usr/bin/stl3
+ stl2ascii:stl2ascii:/usr/bin/stl2ascii3
+ stl2bin:stl2bin:/usr/bin/stl2bin3"
pre_build() {
sed -i '/setup_requires=/d' setup.py
@@ -22,3 +24,9 @@ pre_build() {
pkg_install() {
vlicense LICENSE
}
+
+post_install() {
+ mv $DESTDIR/usr/bin/stl $DESTDIR/usr/bin/stl3
+ mv $DESTDIR/usr/bin/stl2ascii $DESTDIR/usr/bin/stl2ascii3
+ mv $DESTDIR/usr/bin/stl2bin $DESTDIR/usr/bin/stl2bin3
+}
From ac270c7db8d0d22fb87a24a52f6337928749d29b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:23 +0700
Subject: [PATCH 31/52] python3-pipenv: restore alternatives
---
srcpkgs/python3-pipenv/template | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index 23b298c1988..401db422b4d 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pipenv'
pkgname=python3-pipenv
version=2020.8.13
-revision=3
+revision=4
wrksrc="pipenv-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,13 +12,16 @@ license="MIT"
homepage="https://github.com/pypa/pipenv"
distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
checksum=eff0e10eadb330f612edfa5051d3d8e775e9e0e918c3c50361da703bd0daa035
-conflicts="python-pipenv>=0"
+alternatives="pipenv:pipenv:/usr/bin/pipenv3
+ pipenv-resolver:pipenv-resolver:/usr/bin/pipenv-resolver3"
post_extract() {
sed -i '/certifi/d' setup.py
}
post_install() {
+ mv $DESTDIR/usr/bin/pipenv $DESTDIR/usr/bin/pipenv3
+ mv $DESTDIR/usr/bin/pipenv-resolver $DESTDIR/usr/bin/pipenv-resolver3
vlicense LICENSE
# remove files only valid for Python 2
rm -rf ${DESTDIR}/${py3_sitelib}/pipenv/patched/yaml2
From e40c9194dddef133eef7ee678615211970c1c1ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:24 +0700
Subject: [PATCH 32/52] python3-proselint: restore alternatives
---
srcpkgs/python3-proselint/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-proselint/template b/srcpkgs/python3-proselint/template
index 3a35c699861..c0a260e0610 100644
--- a/srcpkgs/python3-proselint/template
+++ b/srcpkgs/python3-proselint/template
@@ -1,7 +1,7 @@
# Template file for 'python3-proselint'
pkgname=python3-proselint
version=0.10.2
-revision=4
+revision=5
wrksrc="proselint-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,9 +13,10 @@ homepage="https://github.com/amperser/proselint"
changelog="https://raw.githubusercontent.com/amperser/proselint/master/CHANGELOG.md"
distfiles="${PYPI_SITE}/p/proselint/proselint-${version}.tar.gz"
checksum=3a87eb393056d1bc77d898e4bcf8998f50e9ad84f7b9ff7cf2720509ac8ef904
-conflicts="python-proselint>=0"
+alternatives="proselint:proselint:/usr/bin/proselint3"
post_install() {
+ mv $DESTDIR/usr/bin/proselint $DESTDIR/usr/bin/proselint3
vlicense LICENSE.md
# remove tests directory polluting site-packages
rm -rf ${DESTDIR}/usr/lib/python*/site-packages/tests
From 49762d6bcf59b0ac906db3be3b0c835414e88f43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:26 +0700
Subject: [PATCH 33/52] python3-pyflakes: restore alternatives
---
srcpkgs/python3-pyflakes/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pyflakes/template b/srcpkgs/python3-pyflakes/template
index f0a017a14bb..24dde634114 100644
--- a/srcpkgs/python3-pyflakes/template
+++ b/srcpkgs/python3-pyflakes/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pyflakes'
pkgname=python3-pyflakes
version=2.2.0
-revision=3
+revision=4
wrksrc="pyflakes-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,8 +12,9 @@ license="MIT"
homepage="https://github.com/PyCQA/pyflakes"
distfiles="${PYPI_SITE}/p/pyflakes/pyflakes-${version}.tar.gz"
checksum=35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8
-conflicts="python-pyflakes>=0"
+alternatives="pyflakes:pyflakes:/usr/bin/pyflakes3"
post_install() {
+ mv $DESTDIR/usr/bin/pyflakes $DESTDIR/usr/bin/pyflakes3
vlicense LICENSE
}
From 7525c5ed8627f1fe51b81cc29b73e4a43395580f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:27 +0700
Subject: [PATCH 34/52] python3-pyscss: restore alternatives
---
srcpkgs/python3-pyscss/template | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pyscss/template b/srcpkgs/python3-pyscss/template
index 1dad6f1f4bc..5ac62d4a9e7 100644
--- a/srcpkgs/python3-pyscss/template
+++ b/srcpkgs/python3-pyscss/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pyscss'
pkgname=python3-pyscss
version=1.3.7
-revision=3
+revision=4
wrksrc="pyScss-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools pcre-devel"
@@ -14,8 +14,11 @@ homepage="http://github.com/Kronuz/pyScss"
distfiles="${PYPI_SITE}/p/pyScss/pyScss-${version}.tar.gz"
checksum=f1df571569021a23941a538eb154405dde80bed35dc1ea7c5f3e18e0144746bf
-conflicts="python-pyscss>=0"
+alternatives="less2scss:less2scss:/usr/bin/less2scss3
+ pyscss:pyscss:/usr/bin/pyscss3"
post_install() {
+ mv $DESTDIR/usr/bin/less2scss $DESTDIR/usr/bin/less2scss3
+ mv $DESTDIR/usr/bin/pyscss $DESTDIR/usr/bin/pyscss3
vlicense LICENSE
}
From 19f36328e0677fbba2c9fb80c1a88bae7ff3c797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:29 +0700
Subject: [PATCH 35/52] python3-pysrt: restore alternatives
---
srcpkgs/python3-pysrt/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pysrt/template b/srcpkgs/python3-pysrt/template
index 2f5097e0eae..f34e775a600 100644
--- a/srcpkgs/python3-pysrt/template
+++ b/srcpkgs/python3-pysrt/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pysrt'
pkgname=python3-pysrt
version=1.1.2
-revision=3
+revision=4
wrksrc="pysrt-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,4 +12,8 @@ license="GPL-3.0-only"
homepage="https://github.com/byroot/pysrt"
distfiles="${PYPI_SITE}/p/pysrt/pysrt-${version}.tar.gz"
checksum=b4f844ba33e4e7743e9db746492f3a193dc0bc112b153914698e7c1cdeb9b0b9
-conflicts="python-pysrt>=0"
+alternatives="srt:srt:/usr/bin/srt3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/srt $DESTDIR/usr/bin/srt3
+}
From 9d1030e4da7444adfa3cdcd1b3845af376e1a297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:30 +0700
Subject: [PATCH 36/52] python3-pyzbar: restore alternatives
---
srcpkgs/python3-pyzbar/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pyzbar/template b/srcpkgs/python3-pyzbar/template
index ce1d59993af..c09de67cff3 100644
--- a/srcpkgs/python3-pyzbar/template
+++ b/srcpkgs/python3-pyzbar/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pyzbar'
pkgname=python3-pyzbar
version=0.1.8
-revision=4
+revision=5
wrksrc="pyzbar-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,9 +12,10 @@ license="MIT"
homepage="https://github.com/NaturalHistoryMuseum/pyzbar/"
distfiles="https://github.com/NaturalHistoryMuseum/pyzbar/archive/v${version}.tar.gz"
checksum=f51c82c2864f8e5a8d44f55853e027f8cbc592324b7afffa62100f2f9c54cbdb
-conflicts="python-pyzbar>=0"
+alternatives="read_zbar.py:read_zbar.py:/usr/bin/read_zbar.py3"
post_install() {
+ mv $DESTDIR/usr/bin/read_zbar.py $DESTDIR/usr/bin/read_zbar.py3
vlicense LICENSE.txt
# These only exec read_zbar.py
rm "$DESTDIR"/usr/bin/read_zbar
From 4832a1532dfb86bf0315bad5241885b08383065e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:32 +0700
Subject: [PATCH 37/52] python3-raven: restore alternatives
---
srcpkgs/python3-raven/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-raven/template b/srcpkgs/python3-raven/template
index b5cca718861..05d563e0bde 100644
--- a/srcpkgs/python3-raven/template
+++ b/srcpkgs/python3-raven/template
@@ -1,7 +1,7 @@
# Template file for 'python3-raven'
pkgname=python3-raven
version=6.10.0
-revision=4
+revision=5
wrksrc="raven-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,9 +12,10 @@ license="BSD-3-Clause"
homepage="https://github.com/getsentry/raven-python"
distfiles="${PYPI_SITE}/r/raven/raven-${version}.tar.gz"
checksum=3fa6de6efa2493a7c827472e984ce9b020797d0da16f1db67197bcc23c8fae54
-conflicts="python-raven>=0"
+alternatives="raven:raven:/usr/bin/raven3"
post_install() {
+ mv $DESTDIR/usr/bin/raven $DESTDIR/usr/bin/raven3
# use system ca-certificates
rm -f ${DESTDIR}/${py3_sitelib}/raven/data/cacert.pem
ln -sf /etc/ssl/cert.pem ${DESTDIR}/${py3_sitelib}/raven/data/cacert.pem
From 48fdbb65c65390897365cd200bd309791e1bf795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:33 +0700
Subject: [PATCH 38/52] python3-rsa: restore alternatives
---
srcpkgs/python3-rsa/template | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-rsa/template b/srcpkgs/python3-rsa/template
index a4c915dc72b..63dcce32faf 100644
--- a/srcpkgs/python3-rsa/template
+++ b/srcpkgs/python3-rsa/template
@@ -1,7 +1,7 @@
# Template file for 'python3-rsa'
pkgname=python3-rsa
version=4.0
-revision=4
+revision=5
wrksrc="${pkgname#*-}-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,4 +13,18 @@ homepage="https://stuvel.eu/rsa"
distfiles="${PYPI_SITE}/r/rsa/rsa-${version}.tar.gz"
checksum=1a836406405730121ae9823e19c6e806c62bbad73f890574fff50efa4122c487
-conflicts="python-rsa>=0"
+alternatives="pyrsa-decrypt:pyrsa-decrypt:/usr/bin/pyrsa-decrypt3
+ pyrsa-encrypt:pyrsa-encrypt:/usr/bin/pyrsa-encrypt3
+ pyrsa-keygen:pyrsa-keygen:/usr/bin/pyrsa-keygen3
+ pyrsa-priv2pub:pyrsa-priv2pub:/usr/bin/pyrsa-priv2pub3
+ pyrsa-sign:pyrsa-sign:/usr/bin/pyrsa-sign3
+ pyrsa-verify:pyrsa-verify:/usr/bin/pyrsa-verify3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/pyrsa-decrypt $DESTDIR/usr/bin/pyrsa-decrypt3
+ mv $DESTDIR/usr/bin/pyrsa-encrypt $DESTDIR/usr/bin/pyrsa-encrypt3
+ mv $DESTDIR/usr/bin/pyrsa-keygen $DESTDIR/usr/bin/pyrsa-keygen3
+ mv $DESTDIR/usr/bin/pyrsa-priv2pub $DESTDIR/usr/bin/pyrsa-priv2pub3
+ mv $DESTDIR/usr/bin/pyrsa-sign $DESTDIR/usr/bin/pyrsa-sign3
+ mv $DESTDIR/usr/bin/pyrsa-verify $DESTDIR/usr/bin/pyrsa-verify3
+}
From 874166d65089b9ce72d76732b1f2f398d5e0b972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:34 +0700
Subject: [PATCH 39/52] python3-scour: restore alternatives
---
srcpkgs/python3-scour/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-scour/template b/srcpkgs/python3-scour/template
index 193b2c601ea..40ef9682a0d 100644
--- a/srcpkgs/python3-scour/template
+++ b/srcpkgs/python3-scour/template
@@ -1,7 +1,7 @@
# Template file for 'python3-scour'
pkgname=python3-scour
version=0.37
-revision=4
+revision=5
wrksrc="scour-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -14,8 +14,12 @@ homepage="https://github.com/scour-project/scour"
changelog="https://raw.githubusercontent.com/scour-project/scour/master/HISTORY.md"
distfiles="${homepage}/archive/v${version}.tar.gz"
checksum=4fcb961586d8a6d98ac9343ca5647421b98fdc79b51d81a1d3d18576b7908823
-conflicts="python-scour>=0"
+alternatives="scour:scour:/usr/bin/scour3"
do_check() {
python3 setup.py test
}
+
+post_install() {
+ mv $DESTDIR/usr/bin/scour $DESTDIR/usr/bin/scour3
+}
From 9728e9c939d21f19dc47ab8af594d0f1e9aa7638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:35 +0700
Subject: [PATCH 40/52] python3-stem: restore alternatives
---
srcpkgs/python3-stem/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-stem/template b/srcpkgs/python3-stem/template
index b8778508bf6..db54958d65a 100644
--- a/srcpkgs/python3-stem/template
+++ b/srcpkgs/python3-stem/template
@@ -1,7 +1,7 @@
# Template file for 'python3-stem'
pkgname=python3-stem
version=1.8.0
-revision=3
+revision=4
wrksrc="stem-${version/b/}"
build_style=python3-module
hostmakedepends="python3-devel"
@@ -13,4 +13,8 @@ homepage="https://stem.torproject.org/"
changelog="https://stem.torproject.org/change_log.html#version-1-7"
distfiles="${PYPI_SITE}/s/stem/stem-${version}.tar.gz"
checksum=a0b48ea6224e95f22aa34c0bc3415f0eb4667ddeae3dfb5e32a6920c185568c2
-conflicts="python-stem>=0"
+alternatives="tor-prompt:tor-prompt:/usr/bin/tor-prompt3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/tor-prompt $DESTDIR/usr/bin/tor-prompt3
+}
From ba256d6664f368b8578892c70d26ef22aec6f6e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:36 +0700
Subject: [PATCH 41/52] python3-stormssh: restore alternatives
---
srcpkgs/python3-stormssh/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-stormssh/template b/srcpkgs/python3-stormssh/template
index d3986e9290d..eb488944620 100644
--- a/srcpkgs/python3-stormssh/template
+++ b/srcpkgs/python3-stormssh/template
@@ -1,7 +1,7 @@
# Template file for 'python3-stormssh'
pkgname=python3-stormssh
version=0.7.0
-revision=4
+revision=5
wrksrc=storm-${version}
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,8 +12,9 @@ license="MIT"
homepage="https://github.com/emre/storm"
distfiles="https://github.com/emre/storm/archive/${version}.tar.gz"
checksum=c2e5da1cb4a27b309ed7e470c5acebe2822f7928c5ef0e38f9dade247cf9a6c6
-conflicts="python-stormssh>=0"
+alternatives="storm:storm:/usr/bin/storm3"
post_install() {
+ mv $DESTDIR/usr/bin/storm $DESTDIR/usr/bin/storm3
vlicense LICENSE
}
From 86920491d1866f374e69be62ad345e0f3e99824d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:37 +0700
Subject: [PATCH 42/52] python3-tempora: restore alternatives
---
srcpkgs/python3-tempora/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-tempora/template b/srcpkgs/python3-tempora/template
index c4dbebd31b3..7ae151f82ad 100644
--- a/srcpkgs/python3-tempora/template
+++ b/srcpkgs/python3-tempora/template
@@ -1,7 +1,7 @@
# Template file for 'python3-tempora'
pkgname=python3-tempora
version=2.0.0
-revision=3
+revision=4
wrksrc="tempora-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/jaraco/tempora"
distfiles="${PYPI_SITE}/t/tempora/tempora-${version}.tar.gz"
checksum=f11df59b34b9a87d395cce031274f6ff3d2be2171dd1db32dff9ab1fcb5352fa
-conflicts="python-tempora>=0"
+alternatives="calc-prorate:calc-prorate:/usr/bin/calc-prorate3"
pre_build() {
vsed -i setup.py \
@@ -21,5 +21,6 @@ pre_build() {
}
post_install() {
+ mv $DESTDIR/usr/bin/calc-prorate $DESTDIR/usr/bin/calc-prorate3
vlicense LICENSE
}
From 99b1f5dc1689eb31fc42668a2907f17dfc20450a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:38 +0700
Subject: [PATCH 43/52] python3-tmuxp: restore alternatives
---
srcpkgs/python3-tmuxp/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-tmuxp/template b/srcpkgs/python3-tmuxp/template
index 825903b8ca7..f60059e12f9 100644
--- a/srcpkgs/python3-tmuxp/template
+++ b/srcpkgs/python3-tmuxp/template
@@ -1,7 +1,7 @@
# Template file for 'python3-tmuxp'
pkgname=python3-tmuxp
version=1.5.4
-revision=3
+revision=4
wrksrc="tmuxp-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="MIT"
homepage="https://github.com/tmux-python/tmuxp/"
distfiles="${PYPI_SITE}/t/tmuxp/tmuxp-${version}.tar.gz"
checksum=371105eb69efc457de52fb7a6de0b431a0179c5b54e9ec78180746463153168f
-conflicts="python-tmuxp>=0"
+alternatives="tmuxp:tmuxp:/usr/bin/tmuxp3"
pre_configure() {
# Remove version restrictions
@@ -23,5 +23,6 @@ pre_configure() {
}
post_install() {
+ mv $DESTDIR/usr/bin/tmuxp $DESTDIR/usr/bin/tmuxp3
vlicense LICENSE
}
From 43bb4033331c5e256de75ec94a792823b65c39e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:40 +0700
Subject: [PATCH 44/52] python3-tqdm: restore alternatives
---
srcpkgs/python3-tqdm/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-tqdm/template b/srcpkgs/python3-tqdm/template
index 96c8d07f049..3de1c1369f6 100644
--- a/srcpkgs/python3-tqdm/template
+++ b/srcpkgs/python3-tqdm/template
@@ -1,7 +1,7 @@
# Template file for 'python3-tqdm'
pkgname=python3-tqdm
version=4.48.2
-revision=3
+revision=4
wrksrc="tqdm-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,9 +12,10 @@ license="MPL-2.0, MIT"
homepage="https://tqdm.github.io/"
distfiles="https://github.com/tqdm/tqdm/archive/v${version}.tar.gz"
checksum=91a61673103ae2d5a1b93672ff60455d689b58372c08b1a27e1a7def71dc05a3
-conflicts="python-tqdm>=0"
+alternatives="tqdm:tqdm:/usr/bin/tqdm3"
post_install() {
+ mv $DESTDIR/usr/bin/tqdm $DESTDIR/usr/bin/tqdm3
vman tqdm/tqdm.1 tqdm.1
vlicense LICENCE
}
From 0202c34bc072fb8f005adc81e32c8c04308de80b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:41 +0700
Subject: [PATCH 45/52] python3-urbandict: restore alternatives
---
srcpkgs/python3-urbandict/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-urbandict/template b/srcpkgs/python3-urbandict/template
index 430acb937dc..cf505331dda 100644
--- a/srcpkgs/python3-urbandict/template
+++ b/srcpkgs/python3-urbandict/template
@@ -1,7 +1,7 @@
# Template file for 'python3-urbandict'
pkgname=python3-urbandict
version=0.6.1
-revision=3
+revision=4
wrksrc="urbandict-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,4 +12,8 @@ license="Unlicense"
homepage="https://github.com/novel/py-urbandict"
distfiles="${PYPI_SITE}/u/urbandict/urbandict-${version}.tar.gz"
checksum=a19685ffa2450bea2df9bf328a6ce7c3c1e2213c95171ae2263b987cc54d201b
-conflicts="python-urbandict>=0"
+alternatives="urbandicli:urbandicli:/usr/bin/urbandicli3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/urbandicli $DESTDIR/usr/bin/urbandicli3
+}
From a1269bca7f66c0870ee865cb3176fae4052ca05c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:42 +0700
Subject: [PATCH 46/52] python3-vint: restore alternatives
---
srcpkgs/python3-vint/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-vint/template b/srcpkgs/python3-vint/template
index 3944d9b507e..4fd4ca7e379 100644
--- a/srcpkgs/python3-vint/template
+++ b/srcpkgs/python3-vint/template
@@ -1,7 +1,7 @@
# Template file for 'python3-vint'
pkgname=python3-vint
version=0.3.19
-revision=5
+revision=6
wrksrc="vim-vint-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,7 +12,8 @@ license="MIT"
homepage="https://github.com/Kuniwak/vint"
distfiles="${PYPI_SITE}/v/vim-vint/vim-vint-${version}.tar.gz"
checksum=aba8938f4c720e5c70a25f4dc7d845c5ce87aba0b778d1686f18b8da0c88f234
-conflicts="python-vint>=0"
+alternatives="vint:vint:/usr/bin/vint3"
post_install() {
+ mv $DESTDIR/usr/bin/vint $DESTDIR/usr/bin/vint3
vlicense LICENSE.txt
}
From 4ffaa393c570566b6f53a0da662513d303cf4516 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:44 +0700
Subject: [PATCH 47/52] python3-vobject: restore alternatives
---
srcpkgs/python3-vobject/template | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-vobject/template b/srcpkgs/python3-vobject/template
index f727f5b1a35..d716426299c 100644
--- a/srcpkgs/python3-vobject/template
+++ b/srcpkgs/python3-vobject/template
@@ -1,7 +1,7 @@
# Template file for 'python3-vobject'
pkgname=python3-vobject
version=0.9.6.1
-revision=4
+revision=5
wrksrc="vobject-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,4 +12,10 @@ license="Apache-2.0"
homepage="https://eventable.github.io/vobject"
distfiles="${PYPI_SITE}/v/vobject/vobject-${version}.tar.gz"
checksum=96512aec74b90abb71f6b53898dd7fe47300cc940104c4f79148f0671f790101
-conflicts="python-vobject>=0"
+alternatives="change_tz:change_tz:/usr/bin/change_tz3
+ ics_diff:ics_diff:/usr/bin/ics_diff3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/change_tz $DESTDIR/usr/bin/change_tz3
+ mv $DESTDIR/usr/bin/ics_diff $DESTDIR/usr/bin/ics_diff3
+}
From 54b3950f68082668002d160f269c9a7302158266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:45 +0700
Subject: [PATCH 48/52] python3-watchdog: restore alternatives
---
srcpkgs/python3-watchdog/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-watchdog/template b/srcpkgs/python3-watchdog/template
index df369a2bce4..cb3045a7f6a 100644
--- a/srcpkgs/python3-watchdog/template
+++ b/srcpkgs/python3-watchdog/template
@@ -1,7 +1,7 @@
# Template file for 'python3-watchdog'
pkgname=python3-watchdog
version=0.9.0
-revision=4
+revision=5
wrksrc="watchdog-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,4 +12,8 @@ license="Apache-2.0"
homepage="http://github.com/gorakhargosh/watchdog"
distfiles="${PYPI_SITE}/w/watchdog/watchdog-${version}.tar.gz"
checksum=965f658d0732de3188211932aeb0bb457587f04f63ab4c1e33eab878e9de961d
-conflicts="python-watchdog>=0"
+alternatives="watchmedo:watchmedo:/usr/bin/watchmedo3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/watchmedo $DESTDIR/usr/bin/watchmedo3
+}
From c893851339bb3e16fd20e33060a6ef86bd84cff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:46 +0700
Subject: [PATCH 49/52] python3-watchman: restore alternatives
---
srcpkgs/python3-watchman/template | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-watchman/template b/srcpkgs/python3-watchman/template
index c06e798cd57..7c1969a50ed 100644
--- a/srcpkgs/python3-watchman/template
+++ b/srcpkgs/python3-watchman/template
@@ -1,7 +1,7 @@
# Template file for 'python3-watchman'
pkgname=python3-watchman
version=1.4.1
-revision=6
+revision=7
create_wrksrc=yes
build_wrksrc="pywatchman-${version}"
build_style=python3-module
@@ -16,11 +16,14 @@ distfiles="${PYPI_SITE}/p/pywatchman/pywatchman-${version}.tar.gz
https://raw.githubusercontent.com/facebook/watchman/master/python/LICENSE>LICENSE.txt"
checksum="d0047eb275deafb0011eda0a1a815fbd9742478c3d2b5ad6956d300e447dc2f9
d96f8d0b74d194c021f153c562307697128da61143515c947580b2489a341980"
-conflicts="python-watchman>=0"
+alternatives="watchman-make:watchman-make:/usr/bin/watchman-make3
+ watchman-wait:watchman-wait:/usr/bin/watchman-wait3"
do_check() {
:
}
post_install() {
+ mv $DESTDIR/usr/bin/watchman-make $DESTDIR/usr/bin/watchman-make3
+ mv $DESTDIR/usr/bin/watchman-wait $DESTDIR/usr/bin/watchman-wait3
vlicense ../LICENSE.txt
}
From 8758d95b7eee0af16a4febc99fd451eec5b36498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:48 +0700
Subject: [PATCH 50/52] python3-wheel: restore alternatives
---
srcpkgs/python3-wheel/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-wheel/template b/srcpkgs/python3-wheel/template
index 35388e37451..73a97b0b9b3 100644
--- a/srcpkgs/python3-wheel/template
+++ b/srcpkgs/python3-wheel/template
@@ -1,7 +1,7 @@
# Template file for 'python3-wheel'
pkgname=python3-wheel
version=0.35.1
-revision=3
+revision=4
wrksrc="wheel-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -15,10 +15,11 @@ distfiles="${PYPI_SITE}/w/wheel/wheel-${version}.tar.gz
https://raw.githubusercontent.com/pypa/wheel/${version}/LICENSE.txt"
checksum="99a22d87add3f634ff917310a3d87e499f19e663413a52eb9232c447aa646c9f
cca9e20c6af1fcfbf69408f377769286cbeebcded336100c9b4a3f35fbe635e4"
-conflicts="python-wheel>=0"
+alternatives="wheel:wheel:/usr/bin/wheel3"
skip_extraction="LICENSE.txt"
post_install() {
+ mv $DESTDIR/usr/bin/wheel $DESTDIR/usr/bin/wheel3
cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/LICENSE.txt .
vlicense LICENSE.txt
}
From 78c48c1a8728914d4637d4cef20d28b34cdf02a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:49 +0700
Subject: [PATCH 51/52] python3-yamllint: restore alternatives
---
srcpkgs/python3-yamllint/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-yamllint/template b/srcpkgs/python3-yamllint/template
index 6aeedcabe3f..c7ac9f82654 100644
--- a/srcpkgs/python3-yamllint/template
+++ b/srcpkgs/python3-yamllint/template
@@ -1,7 +1,7 @@
# Template file for 'python3-yamllint'
pkgname=python3-yamllint
version=1.15.0
-revision=4
+revision=5
wrksrc="yamllint-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,8 +13,12 @@ license="GPL-3.0-or-later"
homepage="https://github.com/adrienverge/yamllint"
distfiles="${homepage}/archive/v${version}.tar.gz"
checksum=9c27608ec61777f83c2cb29158b247a02079ad2aebb86522dd941397e3e78f6a
-conflicts="python-yamllint>=0"
+alternatives="yamllint:yamllint:/usr/bin/yamllint3"
do_check() {
python3 setup.py test
}
+
+post_install() {
+ mv $DESTDIR/usr/bin/yamllint $DESTDIR/usr/bin/yamllint3
+}
From 1493b91c468275793fa2eea636a3ddd8322a175f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 14 Oct 2020 07:19:49 +0700
Subject: [PATCH 52/52] xmldiff: restore alternatives
---
srcpkgs/xmldiff/template | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xmldiff/template b/srcpkgs/xmldiff/template
index 8f252be2061..2d47bb21051 100644
--- a/srcpkgs/xmldiff/template
+++ b/srcpkgs/xmldiff/template
@@ -1,7 +1,7 @@
# Template file for 'xmldiff'
pkgname=xmldiff
version=2.4
-revision=3
+revision=4
wrksrc="xmldiff-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,7 +13,8 @@ homepage="https://github.com/Shoobx/xmldiff"
changelog="https://raw.githubusercontent.com/Shoobx/xmldiff/master/CHANGES.rst"
distfiles="${PYPI_SITE}/x/xmldiff/xmldiff-${version}.tar.gz"
checksum=05bea20ce1f2c9678683bcce0c3ba9981f87d92b709d190e018bcbf047eccf63
-conflicts="python-xmldiff>=0"
+alternatives="xmldiff:xmldiff:/usr/bin/xmldiff3
+ xmlpatch:xmlpatch:/usr/bin/xmlpatch3"
post_patch() {
rm -f xmldiff/_diff_match_patch_py2.py
@@ -24,3 +25,8 @@ python3-xmldiff_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" (transitional dummy package)"
}
+
+post_install() {
+ mv $DESTDIR/usr/bin/xmldiff $DESTDIR/usr/bin/xmldiff3
+ mv $DESTDIR/usr/bin/xmlpatch $DESTDIR/usr/bin/xmlpatch3
+}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Python 3 restore alternatives
2020-10-14 0:21 [PR PATCH] Python 3 restore alternatives sgn
@ 2020-10-15 2:12 ` ahesford
2020-10-15 2:19 ` q66
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ahesford @ 2020-10-15 2:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 260 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/25583#issuecomment-708849667
Comment:
You can drop `python3-tempora` and `python3-Cheroot`, I'm updating them and have added the alternatives there. #25614
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Python 3 restore alternatives
2020-10-14 0:21 [PR PATCH] Python 3 restore alternatives sgn
2020-10-15 2:12 ` ahesford
@ 2020-10-15 2:19 ` q66
2020-10-15 2:42 ` ahesford
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: q66 @ 2020-10-15 2:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/25583#issuecomment-708851498
Comment:
what, what's the point of this? why ship alternatives if we've deprecated python 2 anyway?
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Python 3 restore alternatives
2020-10-14 0:21 [PR PATCH] Python 3 restore alternatives sgn
2020-10-15 2:12 ` ahesford
2020-10-15 2:19 ` q66
@ 2020-10-15 2:42 ` ahesford
2020-10-15 3:14 ` q66
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ahesford @ 2020-10-15 2:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 499 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/25583#issuecomment-708858960
Comment:
Because it causes needless conflicts for users who still have the py2 packages installed. Those packages still define alternatives with symlinks that conflict with the scripts in the py3 packages. It's either we carry forward the alternatives, or we add empty transitional packages for the py2 packages to eliminate the alternatives and, thus, the conflict.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Python 3 restore alternatives
2020-10-14 0:21 [PR PATCH] Python 3 restore alternatives sgn
` (2 preceding siblings ...)
2020-10-15 2:42 ` ahesford
@ 2020-10-15 3:14 ` q66
2020-10-15 3:22 ` ahesford
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: q66 @ 2020-10-15 3:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 378 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/25583#issuecomment-708868600
Comment:
either have the users remove the py2 packages (by making the py3 packages conflict) or make transitional packages, the alternatives system is terribly bug prone and carrying alternatives for things is both pointless and potentially dangerous
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Python 3 restore alternatives
2020-10-14 0:21 [PR PATCH] Python 3 restore alternatives sgn
` (3 preceding siblings ...)
2020-10-15 3:14 ` q66
@ 2020-10-15 3:22 ` ahesford
2020-10-15 3:54 ` q66
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ahesford @ 2020-10-15 3:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 447 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/25583#issuecomment-708871255
Comment:
Conflicts are the current behavior, but that seems suboptimal. I'm OK with transitional py2 packages but others may have an argument against that. Note that these alternatives already existed in the unified py2/py3 packages, they are just being restored in the standalone py3 packages that were split off.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Python 3 restore alternatives
2020-10-14 0:21 [PR PATCH] Python 3 restore alternatives sgn
` (4 preceding siblings ...)
2020-10-15 3:22 ` ahesford
@ 2020-10-15 3:54 ` q66
2020-10-15 6:39 ` Chocimier
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: q66 @ 2020-10-15 3:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 768 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/25583#issuecomment-708880463
Comment:
yes, i know they existed, and they were always a bad idea, so i see no reason to go back to them
we've always been doing transitional packages for removals, and for a good reason, leaving them behind just creates a huge mess (especially considering the repos are never cleaned, so old packages just linger); we've stopped when @Chocimier started loudly objecting against it, and IMO the situation now is worse than it was before, and noone else really ever objected as far as I can recall - I still think doing them at very least in pain-prone situations is better than not, considering xbps has no facilities for resolving this
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Python 3 restore alternatives
2020-10-14 0:21 [PR PATCH] Python 3 restore alternatives sgn
` (5 preceding siblings ...)
2020-10-15 3:54 ` q66
@ 2020-10-15 6:39 ` Chocimier
2020-10-15 14:24 ` sgn
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Chocimier @ 2020-10-15 6:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 719 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/25583#issuecomment-708934213
Comment:
I am not much again transitional packages, where packages they pull are viable, compatible replacements for removed ones.
I am strongly against removing packages by revbump installing empty package. This breaks users workflow without any clue what happened. This is hostile. Some @void-linux/pkg-committers seemed to agree.
That's true that xbps have no ability to make removal explicit, so let's add it. I am slowly working towards it since over year, thinking exactly about python2 drop back then.
"Xbps can't" shouldn't be eternal excuse for disrupting user's work.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Python 3 restore alternatives
2020-10-14 0:21 [PR PATCH] Python 3 restore alternatives sgn
` (6 preceding siblings ...)
2020-10-15 6:39 ` Chocimier
@ 2020-10-15 14:24 ` sgn
2020-10-15 16:28 ` q66
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2020-10-15 14:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 454 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/25583#issuecomment-709361459
Comment:
In my opinion, we should either be clear that python2 version is unsupported, users that want those python2 need to install them explicitly (via pip), so that's reason of `conflicts`.
However, it's disruptive and makes users' life harder (to upgrade), thus this PR.
This is a scripted-effort to solve the problem.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Python 3 restore alternatives
2020-10-14 0:21 [PR PATCH] Python 3 restore alternatives sgn
` (7 preceding siblings ...)
2020-10-15 14:24 ` sgn
@ 2020-10-15 16:28 ` q66
2020-10-15 16:44 ` sgn
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: q66 @ 2020-10-15 16:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 875 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/25583#issuecomment-709442169
Comment:
@Chocimier i don't disagree that this is a non-ideal situation, but we probably shouldn't be doing stuff that actually creates a bigger mess while xbps still doesn't have any solution for this
also, i don't think the argument holds for python2 packages either way; python2 is on its way out, and arguing with "disrupting users' workflows" is pointless since sooner or later these packages will create conflicts with other stuff in the system (well, they already are, which is the point of this PR in the first place)
@sgn if you want to make this smoother, just provide transitional packages to python3 variants, but i think keeping the conflicts is fine, it requires manual intervention from the user but also is relatively obvious
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Python 3 restore alternatives
2020-10-14 0:21 [PR PATCH] Python 3 restore alternatives sgn
` (8 preceding siblings ...)
2020-10-15 16:28 ` q66
@ 2020-10-15 16:44 ` sgn
2020-10-15 16:55 ` Chocimier
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2020-10-15 16:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 729 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/25583#issuecomment-709451263
Comment:
> @sgn if you want to make this smoother, just provide transitional packages to python3 variants,
I don't really like the transitional packages for this case, provides a fake update to remove things is not nice, and `python-foo` that depends on `python3-foo` makes even less sense.
> but i think keeping the conflicts is fine, it requires manual intervention from the user but also is relatively obvious
This was my line of thinking when I added the conflicts. I strongly prefer to keep the conflicts (since without `conflicts` tag, I see enough file conflict in other packages).
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Python 3 restore alternatives
2020-10-14 0:21 [PR PATCH] Python 3 restore alternatives sgn
` (9 preceding siblings ...)
2020-10-15 16:44 ` sgn
@ 2020-10-15 16:55 ` Chocimier
2020-10-18 14:42 ` sgn
2020-10-18 14:42 ` [PR PATCH] [Closed]: " sgn
12 siblings, 0 replies; 14+ messages in thread
From: Chocimier @ 2020-10-15 16:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 929 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/25583#issuecomment-709457577
Comment:
So for this PR I'm fine with `alternatives`, fine with `replaces`, fine with reintroducing `python-*` as transitional packages pulling `python3-*`, as most are primarly command line tools for which python version is secondary, quite fine with leaving conflicts as is.
But I'm not fine with reintroducing `python-*` as empty meta packages pulling nothing, because this on installations where only py2 version is present, system update will silently remove tools that was installed purposefully (rather than as dependency).
For future, i would propose not to remove packages unless absolutely necessary before xbps can tell to user that package will be uninstalled.
This is not very far. This requires signing repodata and some polish of https://github.com/void-linux/xbps/pull/162 .
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Python 3 restore alternatives
2020-10-14 0:21 [PR PATCH] Python 3 restore alternatives sgn
` (10 preceding siblings ...)
2020-10-15 16:55 ` Chocimier
@ 2020-10-18 14:42 ` sgn
2020-10-18 14:42 ` [PR PATCH] [Closed]: " sgn
12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2020-10-18 14:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/25583#issuecomment-711187326
Comment:
Look like there're people support conflicts. I'm closing this PR.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Closed]: Python 3 restore alternatives
2020-10-14 0:21 [PR PATCH] Python 3 restore alternatives sgn
` (11 preceding siblings ...)
2020-10-18 14:42 ` sgn
@ 2020-10-18 14:42 ` sgn
12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2020-10-18 14:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 163 bytes --]
There's a closed pull request on the void-packages repository
Python 3 restore alternatives
https://github.com/void-linux/void-packages/pull/25583
Description:
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2020-10-18 14:42 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-14 0:21 [PR PATCH] Python 3 restore alternatives sgn
2020-10-15 2:12 ` ahesford
2020-10-15 2:19 ` q66
2020-10-15 2:42 ` ahesford
2020-10-15 3:14 ` q66
2020-10-15 3:22 ` ahesford
2020-10-15 3:54 ` q66
2020-10-15 6:39 ` Chocimier
2020-10-15 14:24 ` sgn
2020-10-15 16:28 ` q66
2020-10-15 16:44 ` sgn
2020-10-15 16:55 ` Chocimier
2020-10-18 14:42 ` sgn
2020-10-18 14:42 ` [PR PATCH] [Closed]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).