* [PR PATCH] Split python{,3}-prompt_toolkit, update to python3-prompt_toolkit-3.0.5, update dependencies, remove python{,3}-prompt_toolkit2
@ 2020-07-24 1:52 ahesford
2020-07-24 1:55 ` [PR PATCH] [Updated] " ahesford
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: ahesford @ 2020-07-24 1:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 421 bytes --]
There is a new pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages prompt_toolkit
https://github.com/void-linux/void-packages/pull/23791
Split python{,3}-prompt_toolkit, update to python3-prompt_toolkit-3.0.5, update dependencies, remove python{,3}-prompt_toolkit2
A patch file from https://github.com/void-linux/void-packages/pull/23791.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prompt_toolkit-23791.patch --]
[-- Type: text/x-diff, Size: 17218 bytes --]
From e5899ce515b4379b3ae8f8949ed41ac35026e7e3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:25:17 -0400
Subject: [PATCH 1/8] python-prompt_toolkit1: update to 1.0.18; remove python3
subpackage
---
srcpkgs/python-prompt_toolkit1/template | 37 ++++++-------------------
srcpkgs/python-prompt_toolkit1/update | 2 ++
srcpkgs/python3-prompt_toolkit | 1 -
srcpkgs/python3-prompt_toolkit1 | 1 -
4 files changed, 10 insertions(+), 31 deletions(-)
create mode 100644 srcpkgs/python-prompt_toolkit1/update
delete mode 120000 srcpkgs/python3-prompt_toolkit
delete mode 120000 srcpkgs/python3-prompt_toolkit1
diff --git a/srcpkgs/python-prompt_toolkit1/template b/srcpkgs/python-prompt_toolkit1/template
index 7afe6179f33..0d3afc69a11 100644
--- a/srcpkgs/python-prompt_toolkit1/template
+++ b/srcpkgs/python-prompt_toolkit1/template
@@ -1,50 +1,29 @@
# Template file for 'python-prompt_toolkit1'
pkgname=python-prompt_toolkit1
reverts="2.0.9_1"
-version=1.0.15
-revision=4
+version=1.0.18
+revision=1
archs=noarch
wrksrc="prompt_toolkit-${version}"
-build_style=python-module
-pycompile_module="prompt_toolkit"
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
depends="python-six python-wcwidth"
short_desc="Python2 library for building powerful interactive command lines"
maintainer="xaltsc <xaltsc@protonmail.ch>"
license="BSD-3-Clause"
-homepage="https://github.com/jonathanslenders/python-prompt-toolkit"
+homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=858588f1983ca497f1cf4ffde01d978a3ea02b01c8a26a8bbc5cd2e66d816917
+checksum=dd4fca02c8069497ad931a2d09914c6b0d1b50151ce876bc15bde4c747090126
conflicts="python-prompt_toolkit2"
post_install() {
vlicense LICENSE
}
-python3-prompt_toolkit1_package() {
- archs=noarch
- pycompile_module="prompt_toolkit"
- depends="python3-six python3-wcwidth"
- short_desc="${short_desc/Python2/Python3}"
- conflicts="python3-prompt_toolkit2"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
-
python-prompt_toolkit_package() {
archs=noarch
reverts="2.0.9_1"
build_style=meta
- depends="python-prompt_toolkit1-${version}_${revision}"
- short_desc="${short_desc} (transition package)"
-}
-
-python3-prompt_toolkit_package() {
- archs=noarch
- reverts="2.0.9_1"
- build_style=meta
- depends="python3-prompt_toolkit1-${version}_${revision}"
- short_desc="${short_desc/Python2/Python3} (transition package)"
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc="${short_desc} (transitional dummy package)"
}
diff --git a/srcpkgs/python-prompt_toolkit1/update b/srcpkgs/python-prompt_toolkit1/update
new file mode 100644
index 00000000000..9b10459879a
--- /dev/null
+++ b/srcpkgs/python-prompt_toolkit1/update
@@ -0,0 +1,2 @@
+site="https://pypi.org/simple/prompt_toolkit/"
+pattern='prompt_toolkit-\K1\.[0-9.]+(?=.tar.gz)'
diff --git a/srcpkgs/python3-prompt_toolkit b/srcpkgs/python3-prompt_toolkit
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python3-prompt_toolkit
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
diff --git a/srcpkgs/python3-prompt_toolkit1 b/srcpkgs/python3-prompt_toolkit1
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python3-prompt_toolkit1
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
From b6d6c4ce0a0a564eb178b2f0d17ec586987d3bdf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:26:07 -0400
Subject: [PATCH 2/8] New package: python3-prompt_toolkit-3.0.5
---
srcpkgs/python3-prompt_toolkit/template | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/python3-prompt_toolkit/template
diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
new file mode 100644
index 00000000000..4cac7edb1a1
--- /dev/null
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-prompt_toolkit'
+pkgname=python3-prompt_toolkit
+version=3.0.5
+revision=1
+archs=noarch
+wrksrc="${pkgname#python3-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-wcwidth"
+checkdepends="${depends} python3-pytest"
+short_desc="Python3 library for building powerful interactive command lines"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
+distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
+checksum=563d1a4140b63ff9dd587bda9557cffb2fe73650205ab6f4383092fb882e7dc8
+conflicts="python-prompt_toolkit2"
+
+do_check() {
+ python3 -m pytest
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 0e64329d7f018efea12fd25a97e436c19040b56c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:30:28 -0400
Subject: [PATCH 3/8] python3-ipython: update to 7.16.1.
---
srcpkgs/python3-ipython/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 1948a3a6a97..e42a00f8326 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,23 +1,23 @@
# Template file for 'python3-ipython'
pkgname=python3-ipython
-version=7.13.0
+version=7.16.1
revision=1
archs=noarch
wrksrc="ipython-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-pickleshare python3-simplegeneric python3-traitlets
- python3-pexpect python3-prompt_toolkit2 python3-Pygments python3-jedi
+ python3-pexpect python3-prompt_toolkit python3-Pygments python3-jedi
python3-backcall"
checkdepends="$depends python3-pytest python3-nose python3-matplotlib
python3-requests python3-testpath python3-numpy python3-ipython_ipykernel
- python3-jupyter_nbformat python3-Pygments"
+ python3-jupyter_nbformat python3-Pygments python3-Pillow"
short_desc="Enhanced interactive Python3 shell"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="BSD-3-Clause"
homepage="https://ipython.org/"
distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=ca478e52ae1f88da0102360e57e528b92f3ae4316aabac80a2cd7f7ab2efb48a
+checksum=9f4fcb31d3b2c533333893b9172264e4821c1ac91839500f31bd43f2c59b3ccf
conflicts="python-ipython<=5.8.0_2"
do_check() {
From 2d8de75a197075b183b76fbf8bf98842e239e3fe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:33:43 -0400
Subject: [PATCH 4/8] pantalaimon: rebuild for new python3-prompt_toolkit
---
srcpkgs/pantalaimon/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pantalaimon/template b/srcpkgs/pantalaimon/template
index 9517255bd04..31a1763ab24 100644
--- a/srcpkgs/pantalaimon/template
+++ b/srcpkgs/pantalaimon/template
@@ -1,13 +1,13 @@
# Template file for 'pantalaimon'
pkgname=pantalaimon
version=0.6.5
-revision=1
+revision=2
archs=noarch
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-attrs python3-aiohttp python3-appdirs python3-click
python3-keyring python3-logbook python3-peewee python3-janus
- python3-cachetools python3-prompt_toolkit2 python3-matrix-nio
+ python3-cachetools python3-prompt_toolkit python3-matrix-nio
python3-dbus python3-gobject python3-pydbus python3-notify2"
checkdepends="${depends}"
short_desc="Proxy daemon for matrix.org clients supporting end-to-end encryption"
From 428ab6c11fa87aee200f133d27bdea6f67a90b09 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:37:33 -0400
Subject: [PATCH 5/8] papis: update to 0.10.
---
srcpkgs/papis/patches/update-vers1.patch | 39 ------------------------
srcpkgs/papis/patches/update-vers2.patch | 32 -------------------
srcpkgs/papis/template | 6 ++--
3 files changed, 3 insertions(+), 74 deletions(-)
delete mode 100644 srcpkgs/papis/patches/update-vers1.patch
delete mode 100644 srcpkgs/papis/patches/update-vers2.patch
diff --git a/srcpkgs/papis/patches/update-vers1.patch b/srcpkgs/papis/patches/update-vers1.patch
deleted file mode 100644
index afed20441cc..00000000000
--- a/srcpkgs/papis/patches/update-vers1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 73e740b17d47e3ccddc72b58221f21a431b49d46 Mon Sep 17 00:00:00 2001
-From: JP-Ellis <josh@jpellis.me>
-Date: Mon, 2 Dec 2019 11:33:52 +1100
-Subject: [PATCH] Remove upper limits on dependencies
-
-Upper limits can be re-instated if/when an incompatibility is discovered (and
-until papis can be updated to be compatible with the newer version).
-
-Signed-off-by: JP-Ellis <josh@jpellis.me>
----
- setup.py | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 38cfbe0c..7e7c3bf9 100644
---- setup.py
-+++ setup.py
-@@ -65,15 +65,17 @@
- "bibtexparser>=0.6.2",
- "click>=7.0.0",
- "habanero>=0.6.0",
-- "isbnlib>=3.9.1,<4.0.0",
-- "prompt_toolkit>=2.0.5,<3",
-+ "isbnlib>=3.9.1",
-+ "prompt_toolkit>=2.0.5",
- "tqdm>=4.1",
- "pygments>=2.2.0",
- "stevedore>=1.30",
- "python-doi>=0.1.1",
- # for python 3.4
-- "lxml<=4.3.5",
-- "python-slugify>=1.2.6,<4",
-+ "lxml<=4.3.5 ; python_version<='3.5'",
-+ "lxml>=4.3.5 ; python_version>'3.5'",
-+ "python-slugify>=1.2.6,<4 ; python_version<='3.4'",
-+ "python-slugify>=1.2.6 ; python_version>'3.4'",
- ],
- python_requires='>=3',
- classifiers=[
diff --git a/srcpkgs/papis/patches/update-vers2.patch b/srcpkgs/papis/patches/update-vers2.patch
deleted file mode 100644
index 7ccdb2f3eda..00000000000
--- a/srcpkgs/papis/patches/update-vers2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From bfe0ffae835dc5769198ae4aa5625ce44076eeb7 Mon Sep 17 00:00:00 2001
-From: JP-Ellis <josh@jpellis.me>
-Date: Mon, 2 Dec 2019 21:19:46 +1100
-Subject: [PATCH] Update supported Python version to 3.5, 3.6, 3.7 & 3.8
-
-It's probably safe to drop support for Python <= 3.4 as they are neither
-maintained nor receiving security fixes.
-
-Signed-off-by: JP-Ellis <josh@jpellis.me>
----
- .travis.yml | 3 +--
- appveyor.yml | 10 ++++------
- setup.py | 4 ++--
- 3 files changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index a94caae6..6f73695a 100644
---- setup.py
-+++ setup.py
-@@ -86,10 +86,10 @@
- 'Operating System :: MacOS',
- 'Operating System :: POSIX',
- 'Operating System :: Unix',
-- 'Programming Language :: Python :: 3.3',
-- 'Programming Language :: Python :: 3.4',
- 'Programming Language :: Python :: 3.5',
- 'Programming Language :: Python :: 3.6',
-+ 'Programming Language :: Python :: 3.7',
-+ 'Programming Language :: Python :: 3.8',
- 'Topic :: Utilities',
- ],
- extras_require=dict(
diff --git a/srcpkgs/papis/template b/srcpkgs/papis/template
index 3f432146c10..e3788af2a75 100644
--- a/srcpkgs/papis/template
+++ b/srcpkgs/papis/template
@@ -1,11 +1,11 @@
# Template file for 'papis'
pkgname=papis
-version=0.9
+version=0.10
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-requests python3-yaml python3-chardet python3-BeautifulSoup4
- python3-colorama python3-click python3-slugify python3-prompt_toolkit2
+ python3-colorama python3-click python3-slugify python3-prompt_toolkit
python3-tqdm python3-Pygments python3-stevedore python3-parsing
python3-filetype python3-bibtexparser python3-habanero python3-arxiv2bib
python3-isbnlib python3 python3-setuptools python3-lxml
@@ -15,7 +15,7 @@ maintainer="xaltsc <xaltsc@protonmail.ch>"
license="GPL-3.0-or-later"
homepage="https://github.com/papis/papis"
distfiles="https://github.com/papis/papis/archive/v${version}.tar.gz"
-checksum=c49e53f843a53ccaaeaa24efa777c444efcfd541098fefcfa198ab99888b15e5
+checksum=d658883af6f1ea93da9a855180063eadada339feb2c33c96f6e8ace50f3e49e9
pre_build() {
sed -i '/configparser/d' setup.py
From 267adbe821142f4a245a06ca5876b766402759b8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:40:20 -0400
Subject: [PATCH 6/8] pgcli: update to 3.0.0.
---
srcpkgs/pgcli/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/pgcli/template b/srcpkgs/pgcli/template
index 5e35dfae73b..08eebe2e296 100644
--- a/srcpkgs/pgcli/template
+++ b/srcpkgs/pgcli/template
@@ -1,12 +1,12 @@
# Template file for 'pgcli'
pkgname=pgcli
-version=2.2.0
-revision=2
+version=3.0.0
+revision=1
archs=noarch
build_style=python3-module
pycompile_module="pgcli"
hostmakedepends="python3-setuptools"
-depends="python3-pgspecial python3-click python3-Pygments python3-prompt_toolkit2
+depends="python3-pgspecial python3-click python3-Pygments python3-prompt_toolkit
python3-psycopg2 python3-sqlparse python3-configobj python3-humanize
python3-cli_helpers python3-setproctitle"
short_desc="PostgreSQL CLI with autocompletion and syntax highlighting"
@@ -14,7 +14,7 @@ maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
license="BSD-3-Clause"
homepage="https://www.pgcli.com"
distfiles="${PYPI_SITE}/p/pgcli/pgcli-${version}.tar.gz"
-checksum=54138a31e6736a34c63b84a6d134c9292c9a73543cc0f66e80a0aaf79259d39b
+checksum=4920225838e8004ae6d2ec42f566e0a8b99c4bd42bc2c876d0de8501da0a4082
do_check() {
# pgcli tests require a PostgreSQL server; skip them.
From ed804e916574096c9aca9d08a968adb3d6872921 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:43:35 -0400
Subject: [PATCH 7/8] python3-jupyter_console: rebuild for new
python3-prompt_toolkit
---
srcpkgs/python3-jupyter_console/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-jupyter_console/template b/srcpkgs/python3-jupyter_console/template
index d2639818678..4b404987cd8 100644
--- a/srcpkgs/python3-jupyter_console/template
+++ b/srcpkgs/python3-jupyter_console/template
@@ -1,13 +1,13 @@
# Template file for 'python3-jupyter_console'
pkgname=python3-jupyter_console
version=6.1.0
-revision=3
+revision=4
archs=noarch
wrksrc="jupyter_console-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-ipython python3-ipython_ipykernel python3-jupyter_client
- python3-prompt_toolkit2 python3-Pygments"
+ python3-prompt_toolkit python3-Pygments"
checkdepends="$depends python3-pytest"
short_desc="Jupyter terminal console (Python3)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
From ca127cb0acfc72934b55cf58f800d1df3974387a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:50:24 -0400
Subject: [PATCH 8/8] python-prompt_toolkit2: remove package
---
srcpkgs/python-prompt_toolkit2/template | 43 -------------------------
srcpkgs/python3-prompt_toolkit2 | 1 -
2 files changed, 44 deletions(-)
delete mode 100644 srcpkgs/python-prompt_toolkit2/template
delete mode 120000 srcpkgs/python3-prompt_toolkit2
diff --git a/srcpkgs/python-prompt_toolkit2/template b/srcpkgs/python-prompt_toolkit2/template
deleted file mode 100644
index d7f2fd11e14..00000000000
--- a/srcpkgs/python-prompt_toolkit2/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-prompt_toolkit2'
-pkgname=python-prompt_toolkit2
-version=2.0.9
-revision=4
-archs=noarch
-wrksrc="prompt_toolkit-${version}"
-build_style=python-module
-pycompile_module="prompt_toolkit"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six python-wcwidth"
-checkdepends="python-pytest python-six python-wcwidth python3-pytest
- python3-six python3-wcwidth"
-short_desc="Python2 library for building powerful interactive command lines"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/jonathanslenders/python-prompt-toolkit"
-distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=2519ad1d8038fd5fc8e770362237ad0364d16a7650fb5724af6997ed5515e3c1
-conflicts="python-prompt_toolkit"
-
-do_check() {
- PY2PATH="${PWD}/build-2.7/lib"
- PY3PATH="${PWD}/build-${py3_ver}/lib"
-
- PYTHONPATH="${PY2PATH}" python2 -m pytest
- PYTHONPATH="${PY3PATH}" python3 -m pytest
-}
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-prompt_toolkit2_package() {
- archs=noarch
- pycompile_module="prompt_toolkit"
- depends="python3-six python3-wcwidth"
- short_desc="${short_desc/Python2/Python3}"
- conflicts="python3-prompt_toolki1"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-prompt_toolkit2 b/srcpkgs/python3-prompt_toolkit2
deleted file mode 120000
index 19eb86261ee..00000000000
--- a/srcpkgs/python3-prompt_toolkit2
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit2
\ No newline at end of file
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] Split python{,3}-prompt_toolkit, update to python3-prompt_toolkit-3.0.5, update dependencies, remove python{,3}-prompt_toolkit2
2020-07-24 1:52 [PR PATCH] Split python{,3}-prompt_toolkit, update to python3-prompt_toolkit-3.0.5, update dependencies, remove python{,3}-prompt_toolkit2 ahesford
@ 2020-07-24 1:55 ` ahesford
2020-07-24 2:04 ` ahesford
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: ahesford @ 2020-07-24 1:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 426 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages prompt_toolkit
https://github.com/void-linux/void-packages/pull/23791
Split python{,3}-prompt_toolkit, update to python3-prompt_toolkit-3.0.5, update dependencies, remove python{,3}-prompt_toolkit2
A patch file from https://github.com/void-linux/void-packages/pull/23791.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prompt_toolkit-23791.patch --]
[-- Type: text/x-diff, Size: 17218 bytes --]
From e5899ce515b4379b3ae8f8949ed41ac35026e7e3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:25:17 -0400
Subject: [PATCH 1/8] python-prompt_toolkit1: update to 1.0.18; remove python3
subpackage
---
srcpkgs/python-prompt_toolkit1/template | 37 ++++++-------------------
srcpkgs/python-prompt_toolkit1/update | 2 ++
srcpkgs/python3-prompt_toolkit | 1 -
srcpkgs/python3-prompt_toolkit1 | 1 -
4 files changed, 10 insertions(+), 31 deletions(-)
create mode 100644 srcpkgs/python-prompt_toolkit1/update
delete mode 120000 srcpkgs/python3-prompt_toolkit
delete mode 120000 srcpkgs/python3-prompt_toolkit1
diff --git a/srcpkgs/python-prompt_toolkit1/template b/srcpkgs/python-prompt_toolkit1/template
index 7afe6179f33..0d3afc69a11 100644
--- a/srcpkgs/python-prompt_toolkit1/template
+++ b/srcpkgs/python-prompt_toolkit1/template
@@ -1,50 +1,29 @@
# Template file for 'python-prompt_toolkit1'
pkgname=python-prompt_toolkit1
reverts="2.0.9_1"
-version=1.0.15
-revision=4
+version=1.0.18
+revision=1
archs=noarch
wrksrc="prompt_toolkit-${version}"
-build_style=python-module
-pycompile_module="prompt_toolkit"
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
depends="python-six python-wcwidth"
short_desc="Python2 library for building powerful interactive command lines"
maintainer="xaltsc <xaltsc@protonmail.ch>"
license="BSD-3-Clause"
-homepage="https://github.com/jonathanslenders/python-prompt-toolkit"
+homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=858588f1983ca497f1cf4ffde01d978a3ea02b01c8a26a8bbc5cd2e66d816917
+checksum=dd4fca02c8069497ad931a2d09914c6b0d1b50151ce876bc15bde4c747090126
conflicts="python-prompt_toolkit2"
post_install() {
vlicense LICENSE
}
-python3-prompt_toolkit1_package() {
- archs=noarch
- pycompile_module="prompt_toolkit"
- depends="python3-six python3-wcwidth"
- short_desc="${short_desc/Python2/Python3}"
- conflicts="python3-prompt_toolkit2"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
-
python-prompt_toolkit_package() {
archs=noarch
reverts="2.0.9_1"
build_style=meta
- depends="python-prompt_toolkit1-${version}_${revision}"
- short_desc="${short_desc} (transition package)"
-}
-
-python3-prompt_toolkit_package() {
- archs=noarch
- reverts="2.0.9_1"
- build_style=meta
- depends="python3-prompt_toolkit1-${version}_${revision}"
- short_desc="${short_desc/Python2/Python3} (transition package)"
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc="${short_desc} (transitional dummy package)"
}
diff --git a/srcpkgs/python-prompt_toolkit1/update b/srcpkgs/python-prompt_toolkit1/update
new file mode 100644
index 00000000000..9b10459879a
--- /dev/null
+++ b/srcpkgs/python-prompt_toolkit1/update
@@ -0,0 +1,2 @@
+site="https://pypi.org/simple/prompt_toolkit/"
+pattern='prompt_toolkit-\K1\.[0-9.]+(?=.tar.gz)'
diff --git a/srcpkgs/python3-prompt_toolkit b/srcpkgs/python3-prompt_toolkit
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python3-prompt_toolkit
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
diff --git a/srcpkgs/python3-prompt_toolkit1 b/srcpkgs/python3-prompt_toolkit1
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python3-prompt_toolkit1
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
From b6d6c4ce0a0a564eb178b2f0d17ec586987d3bdf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:26:07 -0400
Subject: [PATCH 2/8] New package: python3-prompt_toolkit-3.0.5
---
srcpkgs/python3-prompt_toolkit/template | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/python3-prompt_toolkit/template
diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
new file mode 100644
index 00000000000..4cac7edb1a1
--- /dev/null
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-prompt_toolkit'
+pkgname=python3-prompt_toolkit
+version=3.0.5
+revision=1
+archs=noarch
+wrksrc="${pkgname#python3-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-wcwidth"
+checkdepends="${depends} python3-pytest"
+short_desc="Python3 library for building powerful interactive command lines"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
+distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
+checksum=563d1a4140b63ff9dd587bda9557cffb2fe73650205ab6f4383092fb882e7dc8
+conflicts="python-prompt_toolkit2"
+
+do_check() {
+ python3 -m pytest
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 0e64329d7f018efea12fd25a97e436c19040b56c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:30:28 -0400
Subject: [PATCH 3/8] python3-ipython: update to 7.16.1.
---
srcpkgs/python3-ipython/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 1948a3a6a97..e42a00f8326 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,23 +1,23 @@
# Template file for 'python3-ipython'
pkgname=python3-ipython
-version=7.13.0
+version=7.16.1
revision=1
archs=noarch
wrksrc="ipython-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-pickleshare python3-simplegeneric python3-traitlets
- python3-pexpect python3-prompt_toolkit2 python3-Pygments python3-jedi
+ python3-pexpect python3-prompt_toolkit python3-Pygments python3-jedi
python3-backcall"
checkdepends="$depends python3-pytest python3-nose python3-matplotlib
python3-requests python3-testpath python3-numpy python3-ipython_ipykernel
- python3-jupyter_nbformat python3-Pygments"
+ python3-jupyter_nbformat python3-Pygments python3-Pillow"
short_desc="Enhanced interactive Python3 shell"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="BSD-3-Clause"
homepage="https://ipython.org/"
distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=ca478e52ae1f88da0102360e57e528b92f3ae4316aabac80a2cd7f7ab2efb48a
+checksum=9f4fcb31d3b2c533333893b9172264e4821c1ac91839500f31bd43f2c59b3ccf
conflicts="python-ipython<=5.8.0_2"
do_check() {
From 2d8de75a197075b183b76fbf8bf98842e239e3fe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:33:43 -0400
Subject: [PATCH 4/8] pantalaimon: rebuild for new python3-prompt_toolkit
---
srcpkgs/pantalaimon/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pantalaimon/template b/srcpkgs/pantalaimon/template
index 9517255bd04..31a1763ab24 100644
--- a/srcpkgs/pantalaimon/template
+++ b/srcpkgs/pantalaimon/template
@@ -1,13 +1,13 @@
# Template file for 'pantalaimon'
pkgname=pantalaimon
version=0.6.5
-revision=1
+revision=2
archs=noarch
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-attrs python3-aiohttp python3-appdirs python3-click
python3-keyring python3-logbook python3-peewee python3-janus
- python3-cachetools python3-prompt_toolkit2 python3-matrix-nio
+ python3-cachetools python3-prompt_toolkit python3-matrix-nio
python3-dbus python3-gobject python3-pydbus python3-notify2"
checkdepends="${depends}"
short_desc="Proxy daemon for matrix.org clients supporting end-to-end encryption"
From 428ab6c11fa87aee200f133d27bdea6f67a90b09 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:37:33 -0400
Subject: [PATCH 5/8] papis: update to 0.10.
---
srcpkgs/papis/patches/update-vers1.patch | 39 ------------------------
srcpkgs/papis/patches/update-vers2.patch | 32 -------------------
srcpkgs/papis/template | 6 ++--
3 files changed, 3 insertions(+), 74 deletions(-)
delete mode 100644 srcpkgs/papis/patches/update-vers1.patch
delete mode 100644 srcpkgs/papis/patches/update-vers2.patch
diff --git a/srcpkgs/papis/patches/update-vers1.patch b/srcpkgs/papis/patches/update-vers1.patch
deleted file mode 100644
index afed20441cc..00000000000
--- a/srcpkgs/papis/patches/update-vers1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 73e740b17d47e3ccddc72b58221f21a431b49d46 Mon Sep 17 00:00:00 2001
-From: JP-Ellis <josh@jpellis.me>
-Date: Mon, 2 Dec 2019 11:33:52 +1100
-Subject: [PATCH] Remove upper limits on dependencies
-
-Upper limits can be re-instated if/when an incompatibility is discovered (and
-until papis can be updated to be compatible with the newer version).
-
-Signed-off-by: JP-Ellis <josh@jpellis.me>
----
- setup.py | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 38cfbe0c..7e7c3bf9 100644
---- setup.py
-+++ setup.py
-@@ -65,15 +65,17 @@
- "bibtexparser>=0.6.2",
- "click>=7.0.0",
- "habanero>=0.6.0",
-- "isbnlib>=3.9.1,<4.0.0",
-- "prompt_toolkit>=2.0.5,<3",
-+ "isbnlib>=3.9.1",
-+ "prompt_toolkit>=2.0.5",
- "tqdm>=4.1",
- "pygments>=2.2.0",
- "stevedore>=1.30",
- "python-doi>=0.1.1",
- # for python 3.4
-- "lxml<=4.3.5",
-- "python-slugify>=1.2.6,<4",
-+ "lxml<=4.3.5 ; python_version<='3.5'",
-+ "lxml>=4.3.5 ; python_version>'3.5'",
-+ "python-slugify>=1.2.6,<4 ; python_version<='3.4'",
-+ "python-slugify>=1.2.6 ; python_version>'3.4'",
- ],
- python_requires='>=3',
- classifiers=[
diff --git a/srcpkgs/papis/patches/update-vers2.patch b/srcpkgs/papis/patches/update-vers2.patch
deleted file mode 100644
index 7ccdb2f3eda..00000000000
--- a/srcpkgs/papis/patches/update-vers2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From bfe0ffae835dc5769198ae4aa5625ce44076eeb7 Mon Sep 17 00:00:00 2001
-From: JP-Ellis <josh@jpellis.me>
-Date: Mon, 2 Dec 2019 21:19:46 +1100
-Subject: [PATCH] Update supported Python version to 3.5, 3.6, 3.7 & 3.8
-
-It's probably safe to drop support for Python <= 3.4 as they are neither
-maintained nor receiving security fixes.
-
-Signed-off-by: JP-Ellis <josh@jpellis.me>
----
- .travis.yml | 3 +--
- appveyor.yml | 10 ++++------
- setup.py | 4 ++--
- 3 files changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index a94caae6..6f73695a 100644
---- setup.py
-+++ setup.py
-@@ -86,10 +86,10 @@
- 'Operating System :: MacOS',
- 'Operating System :: POSIX',
- 'Operating System :: Unix',
-- 'Programming Language :: Python :: 3.3',
-- 'Programming Language :: Python :: 3.4',
- 'Programming Language :: Python :: 3.5',
- 'Programming Language :: Python :: 3.6',
-+ 'Programming Language :: Python :: 3.7',
-+ 'Programming Language :: Python :: 3.8',
- 'Topic :: Utilities',
- ],
- extras_require=dict(
diff --git a/srcpkgs/papis/template b/srcpkgs/papis/template
index 3f432146c10..e3788af2a75 100644
--- a/srcpkgs/papis/template
+++ b/srcpkgs/papis/template
@@ -1,11 +1,11 @@
# Template file for 'papis'
pkgname=papis
-version=0.9
+version=0.10
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-requests python3-yaml python3-chardet python3-BeautifulSoup4
- python3-colorama python3-click python3-slugify python3-prompt_toolkit2
+ python3-colorama python3-click python3-slugify python3-prompt_toolkit
python3-tqdm python3-Pygments python3-stevedore python3-parsing
python3-filetype python3-bibtexparser python3-habanero python3-arxiv2bib
python3-isbnlib python3 python3-setuptools python3-lxml
@@ -15,7 +15,7 @@ maintainer="xaltsc <xaltsc@protonmail.ch>"
license="GPL-3.0-or-later"
homepage="https://github.com/papis/papis"
distfiles="https://github.com/papis/papis/archive/v${version}.tar.gz"
-checksum=c49e53f843a53ccaaeaa24efa777c444efcfd541098fefcfa198ab99888b15e5
+checksum=d658883af6f1ea93da9a855180063eadada339feb2c33c96f6e8ace50f3e49e9
pre_build() {
sed -i '/configparser/d' setup.py
From 267adbe821142f4a245a06ca5876b766402759b8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:40:20 -0400
Subject: [PATCH 6/8] pgcli: update to 3.0.0.
---
srcpkgs/pgcli/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/pgcli/template b/srcpkgs/pgcli/template
index 5e35dfae73b..08eebe2e296 100644
--- a/srcpkgs/pgcli/template
+++ b/srcpkgs/pgcli/template
@@ -1,12 +1,12 @@
# Template file for 'pgcli'
pkgname=pgcli
-version=2.2.0
-revision=2
+version=3.0.0
+revision=1
archs=noarch
build_style=python3-module
pycompile_module="pgcli"
hostmakedepends="python3-setuptools"
-depends="python3-pgspecial python3-click python3-Pygments python3-prompt_toolkit2
+depends="python3-pgspecial python3-click python3-Pygments python3-prompt_toolkit
python3-psycopg2 python3-sqlparse python3-configobj python3-humanize
python3-cli_helpers python3-setproctitle"
short_desc="PostgreSQL CLI with autocompletion and syntax highlighting"
@@ -14,7 +14,7 @@ maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
license="BSD-3-Clause"
homepage="https://www.pgcli.com"
distfiles="${PYPI_SITE}/p/pgcli/pgcli-${version}.tar.gz"
-checksum=54138a31e6736a34c63b84a6d134c9292c9a73543cc0f66e80a0aaf79259d39b
+checksum=4920225838e8004ae6d2ec42f566e0a8b99c4bd42bc2c876d0de8501da0a4082
do_check() {
# pgcli tests require a PostgreSQL server; skip them.
From ed804e916574096c9aca9d08a968adb3d6872921 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:43:35 -0400
Subject: [PATCH 7/8] python3-jupyter_console: rebuild for new
python3-prompt_toolkit
---
srcpkgs/python3-jupyter_console/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-jupyter_console/template b/srcpkgs/python3-jupyter_console/template
index d2639818678..4b404987cd8 100644
--- a/srcpkgs/python3-jupyter_console/template
+++ b/srcpkgs/python3-jupyter_console/template
@@ -1,13 +1,13 @@
# Template file for 'python3-jupyter_console'
pkgname=python3-jupyter_console
version=6.1.0
-revision=3
+revision=4
archs=noarch
wrksrc="jupyter_console-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-ipython python3-ipython_ipykernel python3-jupyter_client
- python3-prompt_toolkit2 python3-Pygments"
+ python3-prompt_toolkit python3-Pygments"
checkdepends="$depends python3-pytest"
short_desc="Jupyter terminal console (Python3)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
From ca127cb0acfc72934b55cf58f800d1df3974387a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:50:24 -0400
Subject: [PATCH 8/8] python-prompt_toolkit2: remove package
---
srcpkgs/python-prompt_toolkit2/template | 43 -------------------------
srcpkgs/python3-prompt_toolkit2 | 1 -
2 files changed, 44 deletions(-)
delete mode 100644 srcpkgs/python-prompt_toolkit2/template
delete mode 120000 srcpkgs/python3-prompt_toolkit2
diff --git a/srcpkgs/python-prompt_toolkit2/template b/srcpkgs/python-prompt_toolkit2/template
deleted file mode 100644
index d7f2fd11e14..00000000000
--- a/srcpkgs/python-prompt_toolkit2/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-prompt_toolkit2'
-pkgname=python-prompt_toolkit2
-version=2.0.9
-revision=4
-archs=noarch
-wrksrc="prompt_toolkit-${version}"
-build_style=python-module
-pycompile_module="prompt_toolkit"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six python-wcwidth"
-checkdepends="python-pytest python-six python-wcwidth python3-pytest
- python3-six python3-wcwidth"
-short_desc="Python2 library for building powerful interactive command lines"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/jonathanslenders/python-prompt-toolkit"
-distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=2519ad1d8038fd5fc8e770362237ad0364d16a7650fb5724af6997ed5515e3c1
-conflicts="python-prompt_toolkit"
-
-do_check() {
- PY2PATH="${PWD}/build-2.7/lib"
- PY3PATH="${PWD}/build-${py3_ver}/lib"
-
- PYTHONPATH="${PY2PATH}" python2 -m pytest
- PYTHONPATH="${PY3PATH}" python3 -m pytest
-}
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-prompt_toolkit2_package() {
- archs=noarch
- pycompile_module="prompt_toolkit"
- depends="python3-six python3-wcwidth"
- short_desc="${short_desc/Python2/Python3}"
- conflicts="python3-prompt_toolki1"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-prompt_toolkit2 b/srcpkgs/python3-prompt_toolkit2
deleted file mode 120000
index 19eb86261ee..00000000000
--- a/srcpkgs/python3-prompt_toolkit2
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit2
\ No newline at end of file
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] Split python{,3}-prompt_toolkit, update to python3-prompt_toolkit-3.0.5, update dependencies, remove python{,3}-prompt_toolkit2
2020-07-24 1:52 [PR PATCH] Split python{,3}-prompt_toolkit, update to python3-prompt_toolkit-3.0.5, update dependencies, remove python{,3}-prompt_toolkit2 ahesford
2020-07-24 1:55 ` [PR PATCH] [Updated] " ahesford
@ 2020-07-24 2:04 ` ahesford
2020-07-24 2:41 ` ahesford
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: ahesford @ 2020-07-24 2:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 426 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages prompt_toolkit
https://github.com/void-linux/void-packages/pull/23791
Split python{,3}-prompt_toolkit, update to python3-prompt_toolkit-3.0.5, update dependencies, remove python{,3}-prompt_toolkit2
A patch file from https://github.com/void-linux/void-packages/pull/23791.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prompt_toolkit-23791.patch --]
[-- Type: text/x-diff, Size: 17207 bytes --]
From 8950a5b4bc9af1381c5cbd1261a657968501b492 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:25:17 -0400
Subject: [PATCH 1/8] python-prompt_toolkit1: update to 1.0.18; remove python3
subpackage
---
srcpkgs/python-prompt_toolkit1/template | 37 ++++++-------------------
srcpkgs/python-prompt_toolkit1/update | 2 ++
srcpkgs/python3-prompt_toolkit | 1 -
srcpkgs/python3-prompt_toolkit1 | 1 -
4 files changed, 10 insertions(+), 31 deletions(-)
create mode 100644 srcpkgs/python-prompt_toolkit1/update
delete mode 120000 srcpkgs/python3-prompt_toolkit
delete mode 120000 srcpkgs/python3-prompt_toolkit1
diff --git a/srcpkgs/python-prompt_toolkit1/template b/srcpkgs/python-prompt_toolkit1/template
index 7afe6179f33..d92f5641e11 100644
--- a/srcpkgs/python-prompt_toolkit1/template
+++ b/srcpkgs/python-prompt_toolkit1/template
@@ -1,50 +1,29 @@
# Template file for 'python-prompt_toolkit1'
pkgname=python-prompt_toolkit1
reverts="2.0.9_1"
-version=1.0.15
-revision=4
+version=1.0.18
+revision=1
archs=noarch
wrksrc="prompt_toolkit-${version}"
-build_style=python-module
-pycompile_module="prompt_toolkit"
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
depends="python-six python-wcwidth"
short_desc="Python2 library for building powerful interactive command lines"
maintainer="xaltsc <xaltsc@protonmail.ch>"
license="BSD-3-Clause"
-homepage="https://github.com/jonathanslenders/python-prompt-toolkit"
+homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=858588f1983ca497f1cf4ffde01d978a3ea02b01c8a26a8bbc5cd2e66d816917
+checksum=dd4fca02c8069497ad931a2d09914c6b0d1b50151ce876bc15bde4c747090126
conflicts="python-prompt_toolkit2"
post_install() {
vlicense LICENSE
}
-python3-prompt_toolkit1_package() {
- archs=noarch
- pycompile_module="prompt_toolkit"
- depends="python3-six python3-wcwidth"
- short_desc="${short_desc/Python2/Python3}"
- conflicts="python3-prompt_toolkit2"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
-
python-prompt_toolkit_package() {
archs=noarch
reverts="2.0.9_1"
build_style=meta
- depends="python-prompt_toolkit1-${version}_${revision}"
- short_desc="${short_desc} (transition package)"
-}
-
-python3-prompt_toolkit_package() {
- archs=noarch
- reverts="2.0.9_1"
- build_style=meta
- depends="python3-prompt_toolkit1-${version}_${revision}"
- short_desc="${short_desc/Python2/Python3} (transition package)"
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" (transitional dummy package)"
}
diff --git a/srcpkgs/python-prompt_toolkit1/update b/srcpkgs/python-prompt_toolkit1/update
new file mode 100644
index 00000000000..9b10459879a
--- /dev/null
+++ b/srcpkgs/python-prompt_toolkit1/update
@@ -0,0 +1,2 @@
+site="https://pypi.org/simple/prompt_toolkit/"
+pattern='prompt_toolkit-\K1\.[0-9.]+(?=.tar.gz)'
diff --git a/srcpkgs/python3-prompt_toolkit b/srcpkgs/python3-prompt_toolkit
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python3-prompt_toolkit
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
diff --git a/srcpkgs/python3-prompt_toolkit1 b/srcpkgs/python3-prompt_toolkit1
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python3-prompt_toolkit1
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
From 765746c9f9bfa1e87fedd4e00578d6b050a107fe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:26:07 -0400
Subject: [PATCH 2/8] New package: python3-prompt_toolkit-3.0.5
---
srcpkgs/python3-prompt_toolkit/template | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/python3-prompt_toolkit/template
diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
new file mode 100644
index 00000000000..4cac7edb1a1
--- /dev/null
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-prompt_toolkit'
+pkgname=python3-prompt_toolkit
+version=3.0.5
+revision=1
+archs=noarch
+wrksrc="${pkgname#python3-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-wcwidth"
+checkdepends="${depends} python3-pytest"
+short_desc="Python3 library for building powerful interactive command lines"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
+distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
+checksum=563d1a4140b63ff9dd587bda9557cffb2fe73650205ab6f4383092fb882e7dc8
+conflicts="python-prompt_toolkit2"
+
+do_check() {
+ python3 -m pytest
+}
+
+post_install() {
+ vlicense LICENSE
+}
From fdc4744f7f9cb2f14375a8d2f3b59bd77cb5604f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:30:28 -0400
Subject: [PATCH 3/8] python3-ipython: update to 7.16.1.
---
srcpkgs/python3-ipython/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 1948a3a6a97..e42a00f8326 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,23 +1,23 @@
# Template file for 'python3-ipython'
pkgname=python3-ipython
-version=7.13.0
+version=7.16.1
revision=1
archs=noarch
wrksrc="ipython-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-pickleshare python3-simplegeneric python3-traitlets
- python3-pexpect python3-prompt_toolkit2 python3-Pygments python3-jedi
+ python3-pexpect python3-prompt_toolkit python3-Pygments python3-jedi
python3-backcall"
checkdepends="$depends python3-pytest python3-nose python3-matplotlib
python3-requests python3-testpath python3-numpy python3-ipython_ipykernel
- python3-jupyter_nbformat python3-Pygments"
+ python3-jupyter_nbformat python3-Pygments python3-Pillow"
short_desc="Enhanced interactive Python3 shell"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="BSD-3-Clause"
homepage="https://ipython.org/"
distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=ca478e52ae1f88da0102360e57e528b92f3ae4316aabac80a2cd7f7ab2efb48a
+checksum=9f4fcb31d3b2c533333893b9172264e4821c1ac91839500f31bd43f2c59b3ccf
conflicts="python-ipython<=5.8.0_2"
do_check() {
From 0791fccbabcff6b82ec9ef215428b1d0aee18924 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:33:43 -0400
Subject: [PATCH 4/8] pantalaimon: rebuild for new python3-prompt_toolkit
---
srcpkgs/pantalaimon/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pantalaimon/template b/srcpkgs/pantalaimon/template
index 9517255bd04..31a1763ab24 100644
--- a/srcpkgs/pantalaimon/template
+++ b/srcpkgs/pantalaimon/template
@@ -1,13 +1,13 @@
# Template file for 'pantalaimon'
pkgname=pantalaimon
version=0.6.5
-revision=1
+revision=2
archs=noarch
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-attrs python3-aiohttp python3-appdirs python3-click
python3-keyring python3-logbook python3-peewee python3-janus
- python3-cachetools python3-prompt_toolkit2 python3-matrix-nio
+ python3-cachetools python3-prompt_toolkit python3-matrix-nio
python3-dbus python3-gobject python3-pydbus python3-notify2"
checkdepends="${depends}"
short_desc="Proxy daemon for matrix.org clients supporting end-to-end encryption"
From 2a24edb5c634c2603b7bab770ef55d0714d7b279 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:37:33 -0400
Subject: [PATCH 5/8] papis: update to 0.10.
---
srcpkgs/papis/patches/update-vers1.patch | 39 ------------------------
srcpkgs/papis/patches/update-vers2.patch | 32 -------------------
srcpkgs/papis/template | 6 ++--
3 files changed, 3 insertions(+), 74 deletions(-)
delete mode 100644 srcpkgs/papis/patches/update-vers1.patch
delete mode 100644 srcpkgs/papis/patches/update-vers2.patch
diff --git a/srcpkgs/papis/patches/update-vers1.patch b/srcpkgs/papis/patches/update-vers1.patch
deleted file mode 100644
index afed20441cc..00000000000
--- a/srcpkgs/papis/patches/update-vers1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 73e740b17d47e3ccddc72b58221f21a431b49d46 Mon Sep 17 00:00:00 2001
-From: JP-Ellis <josh@jpellis.me>
-Date: Mon, 2 Dec 2019 11:33:52 +1100
-Subject: [PATCH] Remove upper limits on dependencies
-
-Upper limits can be re-instated if/when an incompatibility is discovered (and
-until papis can be updated to be compatible with the newer version).
-
-Signed-off-by: JP-Ellis <josh@jpellis.me>
----
- setup.py | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 38cfbe0c..7e7c3bf9 100644
---- setup.py
-+++ setup.py
-@@ -65,15 +65,17 @@
- "bibtexparser>=0.6.2",
- "click>=7.0.0",
- "habanero>=0.6.0",
-- "isbnlib>=3.9.1,<4.0.0",
-- "prompt_toolkit>=2.0.5,<3",
-+ "isbnlib>=3.9.1",
-+ "prompt_toolkit>=2.0.5",
- "tqdm>=4.1",
- "pygments>=2.2.0",
- "stevedore>=1.30",
- "python-doi>=0.1.1",
- # for python 3.4
-- "lxml<=4.3.5",
-- "python-slugify>=1.2.6,<4",
-+ "lxml<=4.3.5 ; python_version<='3.5'",
-+ "lxml>=4.3.5 ; python_version>'3.5'",
-+ "python-slugify>=1.2.6,<4 ; python_version<='3.4'",
-+ "python-slugify>=1.2.6 ; python_version>'3.4'",
- ],
- python_requires='>=3',
- classifiers=[
diff --git a/srcpkgs/papis/patches/update-vers2.patch b/srcpkgs/papis/patches/update-vers2.patch
deleted file mode 100644
index 7ccdb2f3eda..00000000000
--- a/srcpkgs/papis/patches/update-vers2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From bfe0ffae835dc5769198ae4aa5625ce44076eeb7 Mon Sep 17 00:00:00 2001
-From: JP-Ellis <josh@jpellis.me>
-Date: Mon, 2 Dec 2019 21:19:46 +1100
-Subject: [PATCH] Update supported Python version to 3.5, 3.6, 3.7 & 3.8
-
-It's probably safe to drop support for Python <= 3.4 as they are neither
-maintained nor receiving security fixes.
-
-Signed-off-by: JP-Ellis <josh@jpellis.me>
----
- .travis.yml | 3 +--
- appveyor.yml | 10 ++++------
- setup.py | 4 ++--
- 3 files changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index a94caae6..6f73695a 100644
---- setup.py
-+++ setup.py
-@@ -86,10 +86,10 @@
- 'Operating System :: MacOS',
- 'Operating System :: POSIX',
- 'Operating System :: Unix',
-- 'Programming Language :: Python :: 3.3',
-- 'Programming Language :: Python :: 3.4',
- 'Programming Language :: Python :: 3.5',
- 'Programming Language :: Python :: 3.6',
-+ 'Programming Language :: Python :: 3.7',
-+ 'Programming Language :: Python :: 3.8',
- 'Topic :: Utilities',
- ],
- extras_require=dict(
diff --git a/srcpkgs/papis/template b/srcpkgs/papis/template
index 3f432146c10..e3788af2a75 100644
--- a/srcpkgs/papis/template
+++ b/srcpkgs/papis/template
@@ -1,11 +1,11 @@
# Template file for 'papis'
pkgname=papis
-version=0.9
+version=0.10
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-requests python3-yaml python3-chardet python3-BeautifulSoup4
- python3-colorama python3-click python3-slugify python3-prompt_toolkit2
+ python3-colorama python3-click python3-slugify python3-prompt_toolkit
python3-tqdm python3-Pygments python3-stevedore python3-parsing
python3-filetype python3-bibtexparser python3-habanero python3-arxiv2bib
python3-isbnlib python3 python3-setuptools python3-lxml
@@ -15,7 +15,7 @@ maintainer="xaltsc <xaltsc@protonmail.ch>"
license="GPL-3.0-or-later"
homepage="https://github.com/papis/papis"
distfiles="https://github.com/papis/papis/archive/v${version}.tar.gz"
-checksum=c49e53f843a53ccaaeaa24efa777c444efcfd541098fefcfa198ab99888b15e5
+checksum=d658883af6f1ea93da9a855180063eadada339feb2c33c96f6e8ace50f3e49e9
pre_build() {
sed -i '/configparser/d' setup.py
From 32ae3f8338864afd9f877ca2ac99b059dc1830f1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:40:20 -0400
Subject: [PATCH 6/8] pgcli: update to 3.0.0.
---
srcpkgs/pgcli/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/pgcli/template b/srcpkgs/pgcli/template
index 5e35dfae73b..51835304d71 100644
--- a/srcpkgs/pgcli/template
+++ b/srcpkgs/pgcli/template
@@ -1,12 +1,11 @@
# Template file for 'pgcli'
pkgname=pgcli
-version=2.2.0
-revision=2
+version=3.0.0
+revision=1
archs=noarch
build_style=python3-module
-pycompile_module="pgcli"
hostmakedepends="python3-setuptools"
-depends="python3-pgspecial python3-click python3-Pygments python3-prompt_toolkit2
+depends="python3-pgspecial python3-click python3-Pygments python3-prompt_toolkit
python3-psycopg2 python3-sqlparse python3-configobj python3-humanize
python3-cli_helpers python3-setproctitle"
short_desc="PostgreSQL CLI with autocompletion and syntax highlighting"
@@ -14,7 +13,7 @@ maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
license="BSD-3-Clause"
homepage="https://www.pgcli.com"
distfiles="${PYPI_SITE}/p/pgcli/pgcli-${version}.tar.gz"
-checksum=54138a31e6736a34c63b84a6d134c9292c9a73543cc0f66e80a0aaf79259d39b
+checksum=4920225838e8004ae6d2ec42f566e0a8b99c4bd42bc2c876d0de8501da0a4082
do_check() {
# pgcli tests require a PostgreSQL server; skip them.
From 2b86d063d2969554a4442288c86c0dc3a556c4c3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:43:35 -0400
Subject: [PATCH 7/8] python3-jupyter_console: rebuild for new
python3-prompt_toolkit
---
srcpkgs/python3-jupyter_console/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-jupyter_console/template b/srcpkgs/python3-jupyter_console/template
index d2639818678..4b404987cd8 100644
--- a/srcpkgs/python3-jupyter_console/template
+++ b/srcpkgs/python3-jupyter_console/template
@@ -1,13 +1,13 @@
# Template file for 'python3-jupyter_console'
pkgname=python3-jupyter_console
version=6.1.0
-revision=3
+revision=4
archs=noarch
wrksrc="jupyter_console-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-ipython python3-ipython_ipykernel python3-jupyter_client
- python3-prompt_toolkit2 python3-Pygments"
+ python3-prompt_toolkit python3-Pygments"
checkdepends="$depends python3-pytest"
short_desc="Jupyter terminal console (Python3)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
From e61b051fb4cd44c4ea8121c7c1b35df8cc4a4f66 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:50:24 -0400
Subject: [PATCH 8/8] python-prompt_toolkit2: remove package
---
srcpkgs/python-prompt_toolkit2/template | 43 -------------------------
srcpkgs/python3-prompt_toolkit2 | 1 -
2 files changed, 44 deletions(-)
delete mode 100644 srcpkgs/python-prompt_toolkit2/template
delete mode 120000 srcpkgs/python3-prompt_toolkit2
diff --git a/srcpkgs/python-prompt_toolkit2/template b/srcpkgs/python-prompt_toolkit2/template
deleted file mode 100644
index d7f2fd11e14..00000000000
--- a/srcpkgs/python-prompt_toolkit2/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-prompt_toolkit2'
-pkgname=python-prompt_toolkit2
-version=2.0.9
-revision=4
-archs=noarch
-wrksrc="prompt_toolkit-${version}"
-build_style=python-module
-pycompile_module="prompt_toolkit"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six python-wcwidth"
-checkdepends="python-pytest python-six python-wcwidth python3-pytest
- python3-six python3-wcwidth"
-short_desc="Python2 library for building powerful interactive command lines"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/jonathanslenders/python-prompt-toolkit"
-distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=2519ad1d8038fd5fc8e770362237ad0364d16a7650fb5724af6997ed5515e3c1
-conflicts="python-prompt_toolkit"
-
-do_check() {
- PY2PATH="${PWD}/build-2.7/lib"
- PY3PATH="${PWD}/build-${py3_ver}/lib"
-
- PYTHONPATH="${PY2PATH}" python2 -m pytest
- PYTHONPATH="${PY3PATH}" python3 -m pytest
-}
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-prompt_toolkit2_package() {
- archs=noarch
- pycompile_module="prompt_toolkit"
- depends="python3-six python3-wcwidth"
- short_desc="${short_desc/Python2/Python3}"
- conflicts="python3-prompt_toolki1"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-prompt_toolkit2 b/srcpkgs/python3-prompt_toolkit2
deleted file mode 120000
index 19eb86261ee..00000000000
--- a/srcpkgs/python3-prompt_toolkit2
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit2
\ No newline at end of file
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] Split python{,3}-prompt_toolkit, update to python3-prompt_toolkit-3.0.5, update dependencies, remove python{,3}-prompt_toolkit2
2020-07-24 1:52 [PR PATCH] Split python{,3}-prompt_toolkit, update to python3-prompt_toolkit-3.0.5, update dependencies, remove python{,3}-prompt_toolkit2 ahesford
2020-07-24 1:55 ` [PR PATCH] [Updated] " ahesford
2020-07-24 2:04 ` ahesford
@ 2020-07-24 2:41 ` ahesford
2020-07-24 2:51 ` ahesford
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: ahesford @ 2020-07-24 2:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 426 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages prompt_toolkit
https://github.com/void-linux/void-packages/pull/23791
Split python{,3}-prompt_toolkit, update to python3-prompt_toolkit-3.0.5, update dependencies, remove python{,3}-prompt_toolkit2
A patch file from https://github.com/void-linux/void-packages/pull/23791.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prompt_toolkit-23791.patch --]
[-- Type: text/x-diff, Size: 17946 bytes --]
From ec823ead84f9098df2b1ed418d26dbe238695bc4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:25:17 -0400
Subject: [PATCH 1/8] python-prompt_toolkit1: update to 1.0.18; remove python3
subpackage
---
srcpkgs/python-prompt_toolkit1/template | 38 ++++++-------------------
srcpkgs/python-prompt_toolkit1/update | 2 ++
srcpkgs/python3-prompt_toolkit | 1 -
srcpkgs/python3-prompt_toolkit1 | 1 -
4 files changed, 10 insertions(+), 32 deletions(-)
create mode 100644 srcpkgs/python-prompt_toolkit1/update
delete mode 120000 srcpkgs/python3-prompt_toolkit
delete mode 120000 srcpkgs/python3-prompt_toolkit1
diff --git a/srcpkgs/python-prompt_toolkit1/template b/srcpkgs/python-prompt_toolkit1/template
index 7afe6179f33..c8bc45bb013 100644
--- a/srcpkgs/python-prompt_toolkit1/template
+++ b/srcpkgs/python-prompt_toolkit1/template
@@ -1,50 +1,28 @@
# Template file for 'python-prompt_toolkit1'
pkgname=python-prompt_toolkit1
reverts="2.0.9_1"
-version=1.0.15
-revision=4
+version=1.0.18
+revision=1
archs=noarch
wrksrc="prompt_toolkit-${version}"
-build_style=python-module
-pycompile_module="prompt_toolkit"
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
depends="python-six python-wcwidth"
short_desc="Python2 library for building powerful interactive command lines"
maintainer="xaltsc <xaltsc@protonmail.ch>"
license="BSD-3-Clause"
-homepage="https://github.com/jonathanslenders/python-prompt-toolkit"
+homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=858588f1983ca497f1cf4ffde01d978a3ea02b01c8a26a8bbc5cd2e66d816917
-conflicts="python-prompt_toolkit2"
+checksum=dd4fca02c8069497ad931a2d09914c6b0d1b50151ce876bc15bde4c747090126
post_install() {
vlicense LICENSE
}
-python3-prompt_toolkit1_package() {
- archs=noarch
- pycompile_module="prompt_toolkit"
- depends="python3-six python3-wcwidth"
- short_desc="${short_desc/Python2/Python3}"
- conflicts="python3-prompt_toolkit2"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
-
python-prompt_toolkit_package() {
archs=noarch
reverts="2.0.9_1"
build_style=meta
- depends="python-prompt_toolkit1-${version}_${revision}"
- short_desc="${short_desc} (transition package)"
-}
-
-python3-prompt_toolkit_package() {
- archs=noarch
- reverts="2.0.9_1"
- build_style=meta
- depends="python3-prompt_toolkit1-${version}_${revision}"
- short_desc="${short_desc/Python2/Python3} (transition package)"
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" (transitional dummy package)"
}
diff --git a/srcpkgs/python-prompt_toolkit1/update b/srcpkgs/python-prompt_toolkit1/update
new file mode 100644
index 00000000000..9b10459879a
--- /dev/null
+++ b/srcpkgs/python-prompt_toolkit1/update
@@ -0,0 +1,2 @@
+site="https://pypi.org/simple/prompt_toolkit/"
+pattern='prompt_toolkit-\K1\.[0-9.]+(?=.tar.gz)'
diff --git a/srcpkgs/python3-prompt_toolkit b/srcpkgs/python3-prompt_toolkit
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python3-prompt_toolkit
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
diff --git a/srcpkgs/python3-prompt_toolkit1 b/srcpkgs/python3-prompt_toolkit1
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python3-prompt_toolkit1
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
From f9f8bcac64179448c68802473a6e3b8d2f93c3c2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 22:35:01 -0400
Subject: [PATCH 2/8] python-prompt_toolkit2: remove package
---
srcpkgs/python-prompt_toolkit2/INSTALL.msg | 2 +
.../python3-prompt_toolkit2.INSTALL.msg | 2 +
srcpkgs/python-prompt_toolkit2/template | 37 ++-----------------
3 files changed, 8 insertions(+), 33 deletions(-)
create mode 100644 srcpkgs/python-prompt_toolkit2/INSTALL.msg
create mode 100644 srcpkgs/python-prompt_toolkit2/python3-prompt_toolkit2.INSTALL.msg
diff --git a/srcpkgs/python-prompt_toolkit2/INSTALL.msg b/srcpkgs/python-prompt_toolkit2/INSTALL.msg
new file mode 100644
index 00000000000..a9fa64cb158
--- /dev/null
+++ b/srcpkgs/python-prompt_toolkit2/INSTALL.msg
@@ -0,0 +1,2 @@
+python-prompt_toolkit2 is no longer provided by Void Linux, and will be fully
+removed from the repos on 2021/01/23
diff --git a/srcpkgs/python-prompt_toolkit2/python3-prompt_toolkit2.INSTALL.msg b/srcpkgs/python-prompt_toolkit2/python3-prompt_toolkit2.INSTALL.msg
new file mode 100644
index 00000000000..c836027cd34
--- /dev/null
+++ b/srcpkgs/python-prompt_toolkit2/python3-prompt_toolkit2.INSTALL.msg
@@ -0,0 +1,2 @@
+python3-prompt_toolkit2 is no longer provided by Void Linux, and will be fully
+removed from the repos on 2021/01/23
diff --git a/srcpkgs/python-prompt_toolkit2/template b/srcpkgs/python-prompt_toolkit2/template
index d7f2fd11e14..e0f00f41668 100644
--- a/srcpkgs/python-prompt_toolkit2/template
+++ b/srcpkgs/python-prompt_toolkit2/template
@@ -1,43 +1,14 @@
# Template file for 'python-prompt_toolkit2'
pkgname=python-prompt_toolkit2
version=2.0.9
-revision=4
+revision=5
archs=noarch
-wrksrc="prompt_toolkit-${version}"
-build_style=python-module
-pycompile_module="prompt_toolkit"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six python-wcwidth"
-checkdepends="python-pytest python-six python-wcwidth python3-pytest
- python3-six python3-wcwidth"
-short_desc="Python2 library for building powerful interactive command lines"
+build_style=meta
+short_desc="Python2 library for building command lines (removed package)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
+license="metapackage"
homepage="https://github.com/jonathanslenders/python-prompt-toolkit"
-distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=2519ad1d8038fd5fc8e770362237ad0364d16a7650fb5724af6997ed5515e3c1
-conflicts="python-prompt_toolkit"
-
-do_check() {
- PY2PATH="${PWD}/build-2.7/lib"
- PY3PATH="${PWD}/build-${py3_ver}/lib"
-
- PYTHONPATH="${PY2PATH}" python2 -m pytest
- PYTHONPATH="${PY3PATH}" python3 -m pytest
-}
-
-post_install() {
- vlicense LICENSE
-}
python3-prompt_toolkit2_package() {
- archs=noarch
- pycompile_module="prompt_toolkit"
- depends="python3-six python3-wcwidth"
short_desc="${short_desc/Python2/Python3}"
- conflicts="python3-prompt_toolki1"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE
- }
}
From 3182f1bd1d82b0bb5d6c5383a06582a2ce3ab880 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:26:07 -0400
Subject: [PATCH 3/8] New package: python3-prompt_toolkit-3.0.5
---
srcpkgs/python3-prompt_toolkit/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 srcpkgs/python3-prompt_toolkit/template
diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
new file mode 100644
index 00000000000..1cbb8519c2b
--- /dev/null
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-prompt_toolkit'
+pkgname=python3-prompt_toolkit
+version=3.0.5
+revision=1
+archs=noarch
+wrksrc="${pkgname#python3-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-wcwidth"
+checkdepends="${depends} python3-pytest"
+short_desc="Python3 library for building powerful interactive command lines"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
+distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
+checksum=563d1a4140b63ff9dd587bda9557cffb2fe73650205ab6f4383092fb882e7dc8
+
+do_check() {
+ python3 -m pytest
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 032d49ea7e9c2b4f011f5631b10fab3436cd039e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:30:28 -0400
Subject: [PATCH 4/8] python3-ipython: update to 7.16.1.
---
srcpkgs/python3-ipython/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 1948a3a6a97..e42a00f8326 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,23 +1,23 @@
# Template file for 'python3-ipython'
pkgname=python3-ipython
-version=7.13.0
+version=7.16.1
revision=1
archs=noarch
wrksrc="ipython-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-pickleshare python3-simplegeneric python3-traitlets
- python3-pexpect python3-prompt_toolkit2 python3-Pygments python3-jedi
+ python3-pexpect python3-prompt_toolkit python3-Pygments python3-jedi
python3-backcall"
checkdepends="$depends python3-pytest python3-nose python3-matplotlib
python3-requests python3-testpath python3-numpy python3-ipython_ipykernel
- python3-jupyter_nbformat python3-Pygments"
+ python3-jupyter_nbformat python3-Pygments python3-Pillow"
short_desc="Enhanced interactive Python3 shell"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="BSD-3-Clause"
homepage="https://ipython.org/"
distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=ca478e52ae1f88da0102360e57e528b92f3ae4316aabac80a2cd7f7ab2efb48a
+checksum=9f4fcb31d3b2c533333893b9172264e4821c1ac91839500f31bd43f2c59b3ccf
conflicts="python-ipython<=5.8.0_2"
do_check() {
From ac161583ddf21c8acf68bd8c831d3f4e4de097d4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:33:43 -0400
Subject: [PATCH 5/8] pantalaimon: rebuild for new python3-prompt_toolkit
---
srcpkgs/pantalaimon/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pantalaimon/template b/srcpkgs/pantalaimon/template
index 9517255bd04..31a1763ab24 100644
--- a/srcpkgs/pantalaimon/template
+++ b/srcpkgs/pantalaimon/template
@@ -1,13 +1,13 @@
# Template file for 'pantalaimon'
pkgname=pantalaimon
version=0.6.5
-revision=1
+revision=2
archs=noarch
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-attrs python3-aiohttp python3-appdirs python3-click
python3-keyring python3-logbook python3-peewee python3-janus
- python3-cachetools python3-prompt_toolkit2 python3-matrix-nio
+ python3-cachetools python3-prompt_toolkit python3-matrix-nio
python3-dbus python3-gobject python3-pydbus python3-notify2"
checkdepends="${depends}"
short_desc="Proxy daemon for matrix.org clients supporting end-to-end encryption"
From 6090c6b2583714320cf443b8c99e18390b2f4deb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:37:33 -0400
Subject: [PATCH 6/8] papis: update to 0.10.
---
srcpkgs/papis/patches/update-vers1.patch | 39 ------------------------
srcpkgs/papis/patches/update-vers2.patch | 32 -------------------
srcpkgs/papis/template | 6 ++--
3 files changed, 3 insertions(+), 74 deletions(-)
delete mode 100644 srcpkgs/papis/patches/update-vers1.patch
delete mode 100644 srcpkgs/papis/patches/update-vers2.patch
diff --git a/srcpkgs/papis/patches/update-vers1.patch b/srcpkgs/papis/patches/update-vers1.patch
deleted file mode 100644
index afed20441cc..00000000000
--- a/srcpkgs/papis/patches/update-vers1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 73e740b17d47e3ccddc72b58221f21a431b49d46 Mon Sep 17 00:00:00 2001
-From: JP-Ellis <josh@jpellis.me>
-Date: Mon, 2 Dec 2019 11:33:52 +1100
-Subject: [PATCH] Remove upper limits on dependencies
-
-Upper limits can be re-instated if/when an incompatibility is discovered (and
-until papis can be updated to be compatible with the newer version).
-
-Signed-off-by: JP-Ellis <josh@jpellis.me>
----
- setup.py | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 38cfbe0c..7e7c3bf9 100644
---- setup.py
-+++ setup.py
-@@ -65,15 +65,17 @@
- "bibtexparser>=0.6.2",
- "click>=7.0.0",
- "habanero>=0.6.0",
-- "isbnlib>=3.9.1,<4.0.0",
-- "prompt_toolkit>=2.0.5,<3",
-+ "isbnlib>=3.9.1",
-+ "prompt_toolkit>=2.0.5",
- "tqdm>=4.1",
- "pygments>=2.2.0",
- "stevedore>=1.30",
- "python-doi>=0.1.1",
- # for python 3.4
-- "lxml<=4.3.5",
-- "python-slugify>=1.2.6,<4",
-+ "lxml<=4.3.5 ; python_version<='3.5'",
-+ "lxml>=4.3.5 ; python_version>'3.5'",
-+ "python-slugify>=1.2.6,<4 ; python_version<='3.4'",
-+ "python-slugify>=1.2.6 ; python_version>'3.4'",
- ],
- python_requires='>=3',
- classifiers=[
diff --git a/srcpkgs/papis/patches/update-vers2.patch b/srcpkgs/papis/patches/update-vers2.patch
deleted file mode 100644
index 7ccdb2f3eda..00000000000
--- a/srcpkgs/papis/patches/update-vers2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From bfe0ffae835dc5769198ae4aa5625ce44076eeb7 Mon Sep 17 00:00:00 2001
-From: JP-Ellis <josh@jpellis.me>
-Date: Mon, 2 Dec 2019 21:19:46 +1100
-Subject: [PATCH] Update supported Python version to 3.5, 3.6, 3.7 & 3.8
-
-It's probably safe to drop support for Python <= 3.4 as they are neither
-maintained nor receiving security fixes.
-
-Signed-off-by: JP-Ellis <josh@jpellis.me>
----
- .travis.yml | 3 +--
- appveyor.yml | 10 ++++------
- setup.py | 4 ++--
- 3 files changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index a94caae6..6f73695a 100644
---- setup.py
-+++ setup.py
-@@ -86,10 +86,10 @@
- 'Operating System :: MacOS',
- 'Operating System :: POSIX',
- 'Operating System :: Unix',
-- 'Programming Language :: Python :: 3.3',
-- 'Programming Language :: Python :: 3.4',
- 'Programming Language :: Python :: 3.5',
- 'Programming Language :: Python :: 3.6',
-+ 'Programming Language :: Python :: 3.7',
-+ 'Programming Language :: Python :: 3.8',
- 'Topic :: Utilities',
- ],
- extras_require=dict(
diff --git a/srcpkgs/papis/template b/srcpkgs/papis/template
index 3f432146c10..e3788af2a75 100644
--- a/srcpkgs/papis/template
+++ b/srcpkgs/papis/template
@@ -1,11 +1,11 @@
# Template file for 'papis'
pkgname=papis
-version=0.9
+version=0.10
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-requests python3-yaml python3-chardet python3-BeautifulSoup4
- python3-colorama python3-click python3-slugify python3-prompt_toolkit2
+ python3-colorama python3-click python3-slugify python3-prompt_toolkit
python3-tqdm python3-Pygments python3-stevedore python3-parsing
python3-filetype python3-bibtexparser python3-habanero python3-arxiv2bib
python3-isbnlib python3 python3-setuptools python3-lxml
@@ -15,7 +15,7 @@ maintainer="xaltsc <xaltsc@protonmail.ch>"
license="GPL-3.0-or-later"
homepage="https://github.com/papis/papis"
distfiles="https://github.com/papis/papis/archive/v${version}.tar.gz"
-checksum=c49e53f843a53ccaaeaa24efa777c444efcfd541098fefcfa198ab99888b15e5
+checksum=d658883af6f1ea93da9a855180063eadada339feb2c33c96f6e8ace50f3e49e9
pre_build() {
sed -i '/configparser/d' setup.py
From e2c1a03c866a3d7aed3d700bda733e7dc305eae3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:40:20 -0400
Subject: [PATCH 7/8] pgcli: update to 3.0.0.
---
srcpkgs/pgcli/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/pgcli/template b/srcpkgs/pgcli/template
index 5e35dfae73b..51835304d71 100644
--- a/srcpkgs/pgcli/template
+++ b/srcpkgs/pgcli/template
@@ -1,12 +1,11 @@
# Template file for 'pgcli'
pkgname=pgcli
-version=2.2.0
-revision=2
+version=3.0.0
+revision=1
archs=noarch
build_style=python3-module
-pycompile_module="pgcli"
hostmakedepends="python3-setuptools"
-depends="python3-pgspecial python3-click python3-Pygments python3-prompt_toolkit2
+depends="python3-pgspecial python3-click python3-Pygments python3-prompt_toolkit
python3-psycopg2 python3-sqlparse python3-configobj python3-humanize
python3-cli_helpers python3-setproctitle"
short_desc="PostgreSQL CLI with autocompletion and syntax highlighting"
@@ -14,7 +13,7 @@ maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
license="BSD-3-Clause"
homepage="https://www.pgcli.com"
distfiles="${PYPI_SITE}/p/pgcli/pgcli-${version}.tar.gz"
-checksum=54138a31e6736a34c63b84a6d134c9292c9a73543cc0f66e80a0aaf79259d39b
+checksum=4920225838e8004ae6d2ec42f566e0a8b99c4bd42bc2c876d0de8501da0a4082
do_check() {
# pgcli tests require a PostgreSQL server; skip them.
From e29bd899efc177cfeff2596899fd8eb0aa64fb05 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:43:35 -0400
Subject: [PATCH 8/8] python3-jupyter_console: rebuild for new
python3-prompt_toolkit
---
srcpkgs/python3-jupyter_console/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-jupyter_console/template b/srcpkgs/python3-jupyter_console/template
index d2639818678..4b404987cd8 100644
--- a/srcpkgs/python3-jupyter_console/template
+++ b/srcpkgs/python3-jupyter_console/template
@@ -1,13 +1,13 @@
# Template file for 'python3-jupyter_console'
pkgname=python3-jupyter_console
version=6.1.0
-revision=3
+revision=4
archs=noarch
wrksrc="jupyter_console-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-ipython python3-ipython_ipykernel python3-jupyter_client
- python3-prompt_toolkit2 python3-Pygments"
+ python3-prompt_toolkit python3-Pygments"
checkdepends="$depends python3-pytest"
short_desc="Jupyter terminal console (Python3)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] Split python{,3}-prompt_toolkit, update to python3-prompt_toolkit-3.0.5, update dependencies, remove python{,3}-prompt_toolkit2
2020-07-24 1:52 [PR PATCH] Split python{,3}-prompt_toolkit, update to python3-prompt_toolkit-3.0.5, update dependencies, remove python{,3}-prompt_toolkit2 ahesford
` (2 preceding siblings ...)
2020-07-24 2:41 ` ahesford
@ 2020-07-24 2:51 ` ahesford
2020-07-24 3:15 ` ahesford
2020-07-24 3:20 ` [PR PATCH] [Closed]: " ahesford
5 siblings, 0 replies; 7+ messages in thread
From: ahesford @ 2020-07-24 2:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 426 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages prompt_toolkit
https://github.com/void-linux/void-packages/pull/23791
Split python{,3}-prompt_toolkit, update to python3-prompt_toolkit-3.0.5, update dependencies, remove python{,3}-prompt_toolkit2
A patch file from https://github.com/void-linux/void-packages/pull/23791.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prompt_toolkit-23791.patch --]
[-- Type: text/x-diff, Size: 18038 bytes --]
From 7294d82ac5e9f63aa4cdafc8cc896ecb0fc78dbf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:25:17 -0400
Subject: [PATCH 1/8] python-prompt_toolkit1: update to 1.0.18; remove python3
subpackage
---
srcpkgs/python-prompt_toolkit1/template | 39 ++++++-------------------
srcpkgs/python-prompt_toolkit1/update | 2 ++
srcpkgs/python3-prompt_toolkit | 1 -
srcpkgs/python3-prompt_toolkit1 | 1 -
4 files changed, 11 insertions(+), 32 deletions(-)
create mode 100644 srcpkgs/python-prompt_toolkit1/update
delete mode 120000 srcpkgs/python3-prompt_toolkit
delete mode 120000 srcpkgs/python3-prompt_toolkit1
diff --git a/srcpkgs/python-prompt_toolkit1/template b/srcpkgs/python-prompt_toolkit1/template
index 7afe6179f33..ae45db5fa3d 100644
--- a/srcpkgs/python-prompt_toolkit1/template
+++ b/srcpkgs/python-prompt_toolkit1/template
@@ -1,50 +1,29 @@
# Template file for 'python-prompt_toolkit1'
pkgname=python-prompt_toolkit1
reverts="2.0.9_1"
-version=1.0.15
-revision=4
+version=1.0.18
+revision=1
archs=noarch
wrksrc="prompt_toolkit-${version}"
-build_style=python-module
-pycompile_module="prompt_toolkit"
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
depends="python-six python-wcwidth"
short_desc="Python2 library for building powerful interactive command lines"
maintainer="xaltsc <xaltsc@protonmail.ch>"
license="BSD-3-Clause"
-homepage="https://github.com/jonathanslenders/python-prompt-toolkit"
+homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=858588f1983ca497f1cf4ffde01d978a3ea02b01c8a26a8bbc5cd2e66d816917
-conflicts="python-prompt_toolkit2"
+checksum=dd4fca02c8069497ad931a2d09914c6b0d1b50151ce876bc15bde4c747090126
+conflicts="python-prompt_toolkit2<=2.0.9_4"
post_install() {
vlicense LICENSE
}
-python3-prompt_toolkit1_package() {
- archs=noarch
- pycompile_module="prompt_toolkit"
- depends="python3-six python3-wcwidth"
- short_desc="${short_desc/Python2/Python3}"
- conflicts="python3-prompt_toolkit2"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
-
python-prompt_toolkit_package() {
archs=noarch
reverts="2.0.9_1"
build_style=meta
- depends="python-prompt_toolkit1-${version}_${revision}"
- short_desc="${short_desc} (transition package)"
-}
-
-python3-prompt_toolkit_package() {
- archs=noarch
- reverts="2.0.9_1"
- build_style=meta
- depends="python3-prompt_toolkit1-${version}_${revision}"
- short_desc="${short_desc/Python2/Python3} (transition package)"
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" (transitional dummy package)"
}
diff --git a/srcpkgs/python-prompt_toolkit1/update b/srcpkgs/python-prompt_toolkit1/update
new file mode 100644
index 00000000000..9b10459879a
--- /dev/null
+++ b/srcpkgs/python-prompt_toolkit1/update
@@ -0,0 +1,2 @@
+site="https://pypi.org/simple/prompt_toolkit/"
+pattern='prompt_toolkit-\K1\.[0-9.]+(?=.tar.gz)'
diff --git a/srcpkgs/python3-prompt_toolkit b/srcpkgs/python3-prompt_toolkit
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python3-prompt_toolkit
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
diff --git a/srcpkgs/python3-prompt_toolkit1 b/srcpkgs/python3-prompt_toolkit1
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python3-prompt_toolkit1
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
From 413eeefb278d52eeb4d6c9ce4b9ee07ea04082d2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:26:07 -0400
Subject: [PATCH 2/8] New package: python3-prompt_toolkit-3.0.5
---
srcpkgs/python3-prompt_toolkit/template | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/python3-prompt_toolkit/template
diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
new file mode 100644
index 00000000000..8289af6e419
--- /dev/null
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-prompt_toolkit'
+pkgname=python3-prompt_toolkit
+version=3.0.5
+revision=1
+archs=noarch
+wrksrc="${pkgname#python3-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-wcwidth"
+checkdepends="${depends} python3-pytest"
+short_desc="Python3 library for building powerful interactive command lines"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
+distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
+checksum=563d1a4140b63ff9dd587bda9557cffb2fe73650205ab6f4383092fb882e7dc8
+conflicts="python3-prompt_toolkit2<=2.0.9_4"
+
+do_check() {
+ python3 -m pytest
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 50e797981d78331db93bce1a0eceb14d6444b417 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 22:35:01 -0400
Subject: [PATCH 3/8] python-prompt_toolkit2: remove package
---
srcpkgs/python-prompt_toolkit2/INSTALL.msg | 2 +
.../python3-prompt_toolkit2.INSTALL.msg | 2 +
srcpkgs/python-prompt_toolkit2/template | 37 ++-----------------
3 files changed, 8 insertions(+), 33 deletions(-)
create mode 100644 srcpkgs/python-prompt_toolkit2/INSTALL.msg
create mode 100644 srcpkgs/python-prompt_toolkit2/python3-prompt_toolkit2.INSTALL.msg
diff --git a/srcpkgs/python-prompt_toolkit2/INSTALL.msg b/srcpkgs/python-prompt_toolkit2/INSTALL.msg
new file mode 100644
index 00000000000..a9fa64cb158
--- /dev/null
+++ b/srcpkgs/python-prompt_toolkit2/INSTALL.msg
@@ -0,0 +1,2 @@
+python-prompt_toolkit2 is no longer provided by Void Linux, and will be fully
+removed from the repos on 2021/01/23
diff --git a/srcpkgs/python-prompt_toolkit2/python3-prompt_toolkit2.INSTALL.msg b/srcpkgs/python-prompt_toolkit2/python3-prompt_toolkit2.INSTALL.msg
new file mode 100644
index 00000000000..c836027cd34
--- /dev/null
+++ b/srcpkgs/python-prompt_toolkit2/python3-prompt_toolkit2.INSTALL.msg
@@ -0,0 +1,2 @@
+python3-prompt_toolkit2 is no longer provided by Void Linux, and will be fully
+removed from the repos on 2021/01/23
diff --git a/srcpkgs/python-prompt_toolkit2/template b/srcpkgs/python-prompt_toolkit2/template
index d7f2fd11e14..e0f00f41668 100644
--- a/srcpkgs/python-prompt_toolkit2/template
+++ b/srcpkgs/python-prompt_toolkit2/template
@@ -1,43 +1,14 @@
# Template file for 'python-prompt_toolkit2'
pkgname=python-prompt_toolkit2
version=2.0.9
-revision=4
+revision=5
archs=noarch
-wrksrc="prompt_toolkit-${version}"
-build_style=python-module
-pycompile_module="prompt_toolkit"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six python-wcwidth"
-checkdepends="python-pytest python-six python-wcwidth python3-pytest
- python3-six python3-wcwidth"
-short_desc="Python2 library for building powerful interactive command lines"
+build_style=meta
+short_desc="Python2 library for building command lines (removed package)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
+license="metapackage"
homepage="https://github.com/jonathanslenders/python-prompt-toolkit"
-distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=2519ad1d8038fd5fc8e770362237ad0364d16a7650fb5724af6997ed5515e3c1
-conflicts="python-prompt_toolkit"
-
-do_check() {
- PY2PATH="${PWD}/build-2.7/lib"
- PY3PATH="${PWD}/build-${py3_ver}/lib"
-
- PYTHONPATH="${PY2PATH}" python2 -m pytest
- PYTHONPATH="${PY3PATH}" python3 -m pytest
-}
-
-post_install() {
- vlicense LICENSE
-}
python3-prompt_toolkit2_package() {
- archs=noarch
- pycompile_module="prompt_toolkit"
- depends="python3-six python3-wcwidth"
short_desc="${short_desc/Python2/Python3}"
- conflicts="python3-prompt_toolki1"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE
- }
}
From fdf0553c321d16ac637c8d07d7005a15d24480d7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:30:28 -0400
Subject: [PATCH 4/8] python3-ipython: update to 7.16.1.
---
srcpkgs/python3-ipython/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 1948a3a6a97..e42a00f8326 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,23 +1,23 @@
# Template file for 'python3-ipython'
pkgname=python3-ipython
-version=7.13.0
+version=7.16.1
revision=1
archs=noarch
wrksrc="ipython-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-pickleshare python3-simplegeneric python3-traitlets
- python3-pexpect python3-prompt_toolkit2 python3-Pygments python3-jedi
+ python3-pexpect python3-prompt_toolkit python3-Pygments python3-jedi
python3-backcall"
checkdepends="$depends python3-pytest python3-nose python3-matplotlib
python3-requests python3-testpath python3-numpy python3-ipython_ipykernel
- python3-jupyter_nbformat python3-Pygments"
+ python3-jupyter_nbformat python3-Pygments python3-Pillow"
short_desc="Enhanced interactive Python3 shell"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="BSD-3-Clause"
homepage="https://ipython.org/"
distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=ca478e52ae1f88da0102360e57e528b92f3ae4316aabac80a2cd7f7ab2efb48a
+checksum=9f4fcb31d3b2c533333893b9172264e4821c1ac91839500f31bd43f2c59b3ccf
conflicts="python-ipython<=5.8.0_2"
do_check() {
From 51efe0d76873eb6c81e88a100b400190565d6577 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:33:43 -0400
Subject: [PATCH 5/8] pantalaimon: rebuild for new python3-prompt_toolkit
---
srcpkgs/pantalaimon/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pantalaimon/template b/srcpkgs/pantalaimon/template
index 9517255bd04..31a1763ab24 100644
--- a/srcpkgs/pantalaimon/template
+++ b/srcpkgs/pantalaimon/template
@@ -1,13 +1,13 @@
# Template file for 'pantalaimon'
pkgname=pantalaimon
version=0.6.5
-revision=1
+revision=2
archs=noarch
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-attrs python3-aiohttp python3-appdirs python3-click
python3-keyring python3-logbook python3-peewee python3-janus
- python3-cachetools python3-prompt_toolkit2 python3-matrix-nio
+ python3-cachetools python3-prompt_toolkit python3-matrix-nio
python3-dbus python3-gobject python3-pydbus python3-notify2"
checkdepends="${depends}"
short_desc="Proxy daemon for matrix.org clients supporting end-to-end encryption"
From 90cf8350571d8de8a9ec83dd8fd0b0ee6db0263a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:37:33 -0400
Subject: [PATCH 6/8] papis: update to 0.10.
---
srcpkgs/papis/patches/update-vers1.patch | 39 ------------------------
srcpkgs/papis/patches/update-vers2.patch | 32 -------------------
srcpkgs/papis/template | 6 ++--
3 files changed, 3 insertions(+), 74 deletions(-)
delete mode 100644 srcpkgs/papis/patches/update-vers1.patch
delete mode 100644 srcpkgs/papis/patches/update-vers2.patch
diff --git a/srcpkgs/papis/patches/update-vers1.patch b/srcpkgs/papis/patches/update-vers1.patch
deleted file mode 100644
index afed20441cc..00000000000
--- a/srcpkgs/papis/patches/update-vers1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 73e740b17d47e3ccddc72b58221f21a431b49d46 Mon Sep 17 00:00:00 2001
-From: JP-Ellis <josh@jpellis.me>
-Date: Mon, 2 Dec 2019 11:33:52 +1100
-Subject: [PATCH] Remove upper limits on dependencies
-
-Upper limits can be re-instated if/when an incompatibility is discovered (and
-until papis can be updated to be compatible with the newer version).
-
-Signed-off-by: JP-Ellis <josh@jpellis.me>
----
- setup.py | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 38cfbe0c..7e7c3bf9 100644
---- setup.py
-+++ setup.py
-@@ -65,15 +65,17 @@
- "bibtexparser>=0.6.2",
- "click>=7.0.0",
- "habanero>=0.6.0",
-- "isbnlib>=3.9.1,<4.0.0",
-- "prompt_toolkit>=2.0.5,<3",
-+ "isbnlib>=3.9.1",
-+ "prompt_toolkit>=2.0.5",
- "tqdm>=4.1",
- "pygments>=2.2.0",
- "stevedore>=1.30",
- "python-doi>=0.1.1",
- # for python 3.4
-- "lxml<=4.3.5",
-- "python-slugify>=1.2.6,<4",
-+ "lxml<=4.3.5 ; python_version<='3.5'",
-+ "lxml>=4.3.5 ; python_version>'3.5'",
-+ "python-slugify>=1.2.6,<4 ; python_version<='3.4'",
-+ "python-slugify>=1.2.6 ; python_version>'3.4'",
- ],
- python_requires='>=3',
- classifiers=[
diff --git a/srcpkgs/papis/patches/update-vers2.patch b/srcpkgs/papis/patches/update-vers2.patch
deleted file mode 100644
index 7ccdb2f3eda..00000000000
--- a/srcpkgs/papis/patches/update-vers2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From bfe0ffae835dc5769198ae4aa5625ce44076eeb7 Mon Sep 17 00:00:00 2001
-From: JP-Ellis <josh@jpellis.me>
-Date: Mon, 2 Dec 2019 21:19:46 +1100
-Subject: [PATCH] Update supported Python version to 3.5, 3.6, 3.7 & 3.8
-
-It's probably safe to drop support for Python <= 3.4 as they are neither
-maintained nor receiving security fixes.
-
-Signed-off-by: JP-Ellis <josh@jpellis.me>
----
- .travis.yml | 3 +--
- appveyor.yml | 10 ++++------
- setup.py | 4 ++--
- 3 files changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index a94caae6..6f73695a 100644
---- setup.py
-+++ setup.py
-@@ -86,10 +86,10 @@
- 'Operating System :: MacOS',
- 'Operating System :: POSIX',
- 'Operating System :: Unix',
-- 'Programming Language :: Python :: 3.3',
-- 'Programming Language :: Python :: 3.4',
- 'Programming Language :: Python :: 3.5',
- 'Programming Language :: Python :: 3.6',
-+ 'Programming Language :: Python :: 3.7',
-+ 'Programming Language :: Python :: 3.8',
- 'Topic :: Utilities',
- ],
- extras_require=dict(
diff --git a/srcpkgs/papis/template b/srcpkgs/papis/template
index 3f432146c10..e3788af2a75 100644
--- a/srcpkgs/papis/template
+++ b/srcpkgs/papis/template
@@ -1,11 +1,11 @@
# Template file for 'papis'
pkgname=papis
-version=0.9
+version=0.10
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-requests python3-yaml python3-chardet python3-BeautifulSoup4
- python3-colorama python3-click python3-slugify python3-prompt_toolkit2
+ python3-colorama python3-click python3-slugify python3-prompt_toolkit
python3-tqdm python3-Pygments python3-stevedore python3-parsing
python3-filetype python3-bibtexparser python3-habanero python3-arxiv2bib
python3-isbnlib python3 python3-setuptools python3-lxml
@@ -15,7 +15,7 @@ maintainer="xaltsc <xaltsc@protonmail.ch>"
license="GPL-3.0-or-later"
homepage="https://github.com/papis/papis"
distfiles="https://github.com/papis/papis/archive/v${version}.tar.gz"
-checksum=c49e53f843a53ccaaeaa24efa777c444efcfd541098fefcfa198ab99888b15e5
+checksum=d658883af6f1ea93da9a855180063eadada339feb2c33c96f6e8ace50f3e49e9
pre_build() {
sed -i '/configparser/d' setup.py
From a8aad862e439f2240ef788061c943c04b52d19d9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:40:20 -0400
Subject: [PATCH 7/8] pgcli: update to 3.0.0.
---
srcpkgs/pgcli/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/pgcli/template b/srcpkgs/pgcli/template
index 5e35dfae73b..51835304d71 100644
--- a/srcpkgs/pgcli/template
+++ b/srcpkgs/pgcli/template
@@ -1,12 +1,11 @@
# Template file for 'pgcli'
pkgname=pgcli
-version=2.2.0
-revision=2
+version=3.0.0
+revision=1
archs=noarch
build_style=python3-module
-pycompile_module="pgcli"
hostmakedepends="python3-setuptools"
-depends="python3-pgspecial python3-click python3-Pygments python3-prompt_toolkit2
+depends="python3-pgspecial python3-click python3-Pygments python3-prompt_toolkit
python3-psycopg2 python3-sqlparse python3-configobj python3-humanize
python3-cli_helpers python3-setproctitle"
short_desc="PostgreSQL CLI with autocompletion and syntax highlighting"
@@ -14,7 +13,7 @@ maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
license="BSD-3-Clause"
homepage="https://www.pgcli.com"
distfiles="${PYPI_SITE}/p/pgcli/pgcli-${version}.tar.gz"
-checksum=54138a31e6736a34c63b84a6d134c9292c9a73543cc0f66e80a0aaf79259d39b
+checksum=4920225838e8004ae6d2ec42f566e0a8b99c4bd42bc2c876d0de8501da0a4082
do_check() {
# pgcli tests require a PostgreSQL server; skip them.
From 9894ae7a65998fca05abe28022cfd6b398c9bc54 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:43:35 -0400
Subject: [PATCH 8/8] python3-jupyter_console: rebuild for new
python3-prompt_toolkit
---
srcpkgs/python3-jupyter_console/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-jupyter_console/template b/srcpkgs/python3-jupyter_console/template
index d2639818678..4b404987cd8 100644
--- a/srcpkgs/python3-jupyter_console/template
+++ b/srcpkgs/python3-jupyter_console/template
@@ -1,13 +1,13 @@
# Template file for 'python3-jupyter_console'
pkgname=python3-jupyter_console
version=6.1.0
-revision=3
+revision=4
archs=noarch
wrksrc="jupyter_console-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-ipython python3-ipython_ipykernel python3-jupyter_client
- python3-prompt_toolkit2 python3-Pygments"
+ python3-prompt_toolkit python3-Pygments"
checkdepends="$depends python3-pytest"
short_desc="Jupyter terminal console (Python3)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] Split python{,3}-prompt_toolkit, update to python3-prompt_toolkit-3.0.5, update dependencies, remove python{,3}-prompt_toolkit2
2020-07-24 1:52 [PR PATCH] Split python{,3}-prompt_toolkit, update to python3-prompt_toolkit-3.0.5, update dependencies, remove python{,3}-prompt_toolkit2 ahesford
` (3 preceding siblings ...)
2020-07-24 2:51 ` ahesford
@ 2020-07-24 3:15 ` ahesford
2020-07-24 3:20 ` [PR PATCH] [Closed]: " ahesford
5 siblings, 0 replies; 7+ messages in thread
From: ahesford @ 2020-07-24 3:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 426 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages prompt_toolkit
https://github.com/void-linux/void-packages/pull/23791
Split python{,3}-prompt_toolkit, update to python3-prompt_toolkit-3.0.5, update dependencies, remove python{,3}-prompt_toolkit2
A patch file from https://github.com/void-linux/void-packages/pull/23791.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prompt_toolkit-23791.patch --]
[-- Type: text/x-diff, Size: 18394 bytes --]
From 910282b6c1a1d0c170678fd848a7d7d534ff9ccc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:25:17 -0400
Subject: [PATCH 1/8] python-prompt_toolkit1: update to 1.0.18; remove python3
subpackage
---
.../python3-prompt_toolkit1.INSTALL.msg | 2 +
srcpkgs/python-prompt_toolkit1/template | 40 ++++++-------------
srcpkgs/python-prompt_toolkit1/update | 2 +
srcpkgs/python3-prompt_toolkit | 1 -
4 files changed, 16 insertions(+), 29 deletions(-)
create mode 100644 srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg
create mode 100644 srcpkgs/python-prompt_toolkit1/update
delete mode 120000 srcpkgs/python3-prompt_toolkit
diff --git a/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg b/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg
new file mode 100644
index 00000000000..83ded3f3da3
--- /dev/null
+++ b/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg
@@ -0,0 +1,2 @@
+python3-prompt_toolkit1 is no longer provided by Void Linux, and will be fully
+removed from the repos on 2021/01/23
diff --git a/srcpkgs/python-prompt_toolkit1/template b/srcpkgs/python-prompt_toolkit1/template
index 7afe6179f33..70516738c27 100644
--- a/srcpkgs/python-prompt_toolkit1/template
+++ b/srcpkgs/python-prompt_toolkit1/template
@@ -1,50 +1,34 @@
# Template file for 'python-prompt_toolkit1'
pkgname=python-prompt_toolkit1
reverts="2.0.9_1"
-version=1.0.15
-revision=4
+version=1.0.18
+revision=1
archs=noarch
wrksrc="prompt_toolkit-${version}"
-build_style=python-module
-pycompile_module="prompt_toolkit"
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
depends="python-six python-wcwidth"
short_desc="Python2 library for building powerful interactive command lines"
maintainer="xaltsc <xaltsc@protonmail.ch>"
license="BSD-3-Clause"
-homepage="https://github.com/jonathanslenders/python-prompt-toolkit"
+homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=858588f1983ca497f1cf4ffde01d978a3ea02b01c8a26a8bbc5cd2e66d816917
-conflicts="python-prompt_toolkit2"
+checksum=dd4fca02c8069497ad931a2d09914c6b0d1b50151ce876bc15bde4c747090126
+conflicts="python-prompt_toolkit2<=2.0.9_4"
post_install() {
vlicense LICENSE
}
python3-prompt_toolkit1_package() {
- archs=noarch
- pycompile_module="prompt_toolkit"
- depends="python3-six python3-wcwidth"
- short_desc="${short_desc/Python2/Python3}"
- conflicts="python3-prompt_toolkit2"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
-
-python-prompt_toolkit_package() {
- archs=noarch
- reverts="2.0.9_1"
build_style=meta
- depends="python-prompt_toolkit1-${version}_${revision}"
- short_desc="${short_desc} (transition package)"
+ short_desc="Python3 library for building command lines (removed package)"
+ license="metapackage"
}
-python3-prompt_toolkit_package() {
- archs=noarch
+python-prompt_toolkit_package() {
reverts="2.0.9_1"
build_style=meta
- depends="python3-prompt_toolkit1-${version}_${revision}"
- short_desc="${short_desc/Python2/Python3} (transition package)"
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" (transitional dummy package)"
}
diff --git a/srcpkgs/python-prompt_toolkit1/update b/srcpkgs/python-prompt_toolkit1/update
new file mode 100644
index 00000000000..9b10459879a
--- /dev/null
+++ b/srcpkgs/python-prompt_toolkit1/update
@@ -0,0 +1,2 @@
+site="https://pypi.org/simple/prompt_toolkit/"
+pattern='prompt_toolkit-\K1\.[0-9.]+(?=.tar.gz)'
diff --git a/srcpkgs/python3-prompt_toolkit b/srcpkgs/python3-prompt_toolkit
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python3-prompt_toolkit
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
From ecac00d78b9ce65d0a67fc8a34489d4adcd94c46 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:26:07 -0400
Subject: [PATCH 2/8] New package: python3-prompt_toolkit-3.0.5
---
srcpkgs/python3-prompt_toolkit/template | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/python3-prompt_toolkit/template
diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
new file mode 100644
index 00000000000..8289af6e419
--- /dev/null
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-prompt_toolkit'
+pkgname=python3-prompt_toolkit
+version=3.0.5
+revision=1
+archs=noarch
+wrksrc="${pkgname#python3-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-wcwidth"
+checkdepends="${depends} python3-pytest"
+short_desc="Python3 library for building powerful interactive command lines"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
+distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
+checksum=563d1a4140b63ff9dd587bda9557cffb2fe73650205ab6f4383092fb882e7dc8
+conflicts="python3-prompt_toolkit2<=2.0.9_4"
+
+do_check() {
+ python3 -m pytest
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 066c96e5ac7cf0419d60dcc089620db1335039fc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 22:35:01 -0400
Subject: [PATCH 3/8] python-prompt_toolkit2: remove package
---
srcpkgs/python-prompt_toolkit2/INSTALL.msg | 2 +
.../python3-prompt_toolkit2.INSTALL.msg | 2 +
srcpkgs/python-prompt_toolkit2/template | 37 ++-----------------
3 files changed, 8 insertions(+), 33 deletions(-)
create mode 100644 srcpkgs/python-prompt_toolkit2/INSTALL.msg
create mode 100644 srcpkgs/python-prompt_toolkit2/python3-prompt_toolkit2.INSTALL.msg
diff --git a/srcpkgs/python-prompt_toolkit2/INSTALL.msg b/srcpkgs/python-prompt_toolkit2/INSTALL.msg
new file mode 100644
index 00000000000..a9fa64cb158
--- /dev/null
+++ b/srcpkgs/python-prompt_toolkit2/INSTALL.msg
@@ -0,0 +1,2 @@
+python-prompt_toolkit2 is no longer provided by Void Linux, and will be fully
+removed from the repos on 2021/01/23
diff --git a/srcpkgs/python-prompt_toolkit2/python3-prompt_toolkit2.INSTALL.msg b/srcpkgs/python-prompt_toolkit2/python3-prompt_toolkit2.INSTALL.msg
new file mode 100644
index 00000000000..c836027cd34
--- /dev/null
+++ b/srcpkgs/python-prompt_toolkit2/python3-prompt_toolkit2.INSTALL.msg
@@ -0,0 +1,2 @@
+python3-prompt_toolkit2 is no longer provided by Void Linux, and will be fully
+removed from the repos on 2021/01/23
diff --git a/srcpkgs/python-prompt_toolkit2/template b/srcpkgs/python-prompt_toolkit2/template
index d7f2fd11e14..e0f00f41668 100644
--- a/srcpkgs/python-prompt_toolkit2/template
+++ b/srcpkgs/python-prompt_toolkit2/template
@@ -1,43 +1,14 @@
# Template file for 'python-prompt_toolkit2'
pkgname=python-prompt_toolkit2
version=2.0.9
-revision=4
+revision=5
archs=noarch
-wrksrc="prompt_toolkit-${version}"
-build_style=python-module
-pycompile_module="prompt_toolkit"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six python-wcwidth"
-checkdepends="python-pytest python-six python-wcwidth python3-pytest
- python3-six python3-wcwidth"
-short_desc="Python2 library for building powerful interactive command lines"
+build_style=meta
+short_desc="Python2 library for building command lines (removed package)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
+license="metapackage"
homepage="https://github.com/jonathanslenders/python-prompt-toolkit"
-distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=2519ad1d8038fd5fc8e770362237ad0364d16a7650fb5724af6997ed5515e3c1
-conflicts="python-prompt_toolkit"
-
-do_check() {
- PY2PATH="${PWD}/build-2.7/lib"
- PY3PATH="${PWD}/build-${py3_ver}/lib"
-
- PYTHONPATH="${PY2PATH}" python2 -m pytest
- PYTHONPATH="${PY3PATH}" python3 -m pytest
-}
-
-post_install() {
- vlicense LICENSE
-}
python3-prompt_toolkit2_package() {
- archs=noarch
- pycompile_module="prompt_toolkit"
- depends="python3-six python3-wcwidth"
short_desc="${short_desc/Python2/Python3}"
- conflicts="python3-prompt_toolki1"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE
- }
}
From b47b24d8feeb98c80eaea8b1bd24d44b316ebe05 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:30:28 -0400
Subject: [PATCH 4/8] python3-ipython: update to 7.16.1.
---
srcpkgs/python3-ipython/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 1948a3a6a97..e42a00f8326 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,23 +1,23 @@
# Template file for 'python3-ipython'
pkgname=python3-ipython
-version=7.13.0
+version=7.16.1
revision=1
archs=noarch
wrksrc="ipython-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-pickleshare python3-simplegeneric python3-traitlets
- python3-pexpect python3-prompt_toolkit2 python3-Pygments python3-jedi
+ python3-pexpect python3-prompt_toolkit python3-Pygments python3-jedi
python3-backcall"
checkdepends="$depends python3-pytest python3-nose python3-matplotlib
python3-requests python3-testpath python3-numpy python3-ipython_ipykernel
- python3-jupyter_nbformat python3-Pygments"
+ python3-jupyter_nbformat python3-Pygments python3-Pillow"
short_desc="Enhanced interactive Python3 shell"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="BSD-3-Clause"
homepage="https://ipython.org/"
distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=ca478e52ae1f88da0102360e57e528b92f3ae4316aabac80a2cd7f7ab2efb48a
+checksum=9f4fcb31d3b2c533333893b9172264e4821c1ac91839500f31bd43f2c59b3ccf
conflicts="python-ipython<=5.8.0_2"
do_check() {
From f3fedffffacc385b97c79a850a5edda34e05109c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:33:43 -0400
Subject: [PATCH 5/8] pantalaimon: rebuild for new python3-prompt_toolkit
---
srcpkgs/pantalaimon/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pantalaimon/template b/srcpkgs/pantalaimon/template
index 9517255bd04..31a1763ab24 100644
--- a/srcpkgs/pantalaimon/template
+++ b/srcpkgs/pantalaimon/template
@@ -1,13 +1,13 @@
# Template file for 'pantalaimon'
pkgname=pantalaimon
version=0.6.5
-revision=1
+revision=2
archs=noarch
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-attrs python3-aiohttp python3-appdirs python3-click
python3-keyring python3-logbook python3-peewee python3-janus
- python3-cachetools python3-prompt_toolkit2 python3-matrix-nio
+ python3-cachetools python3-prompt_toolkit python3-matrix-nio
python3-dbus python3-gobject python3-pydbus python3-notify2"
checkdepends="${depends}"
short_desc="Proxy daemon for matrix.org clients supporting end-to-end encryption"
From 28b5ccbc65a4307365684fbfeed9020105a38c66 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:37:33 -0400
Subject: [PATCH 6/8] papis: update to 0.10.
---
srcpkgs/papis/patches/update-vers1.patch | 39 ------------------------
srcpkgs/papis/patches/update-vers2.patch | 32 -------------------
srcpkgs/papis/template | 6 ++--
3 files changed, 3 insertions(+), 74 deletions(-)
delete mode 100644 srcpkgs/papis/patches/update-vers1.patch
delete mode 100644 srcpkgs/papis/patches/update-vers2.patch
diff --git a/srcpkgs/papis/patches/update-vers1.patch b/srcpkgs/papis/patches/update-vers1.patch
deleted file mode 100644
index afed20441cc..00000000000
--- a/srcpkgs/papis/patches/update-vers1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 73e740b17d47e3ccddc72b58221f21a431b49d46 Mon Sep 17 00:00:00 2001
-From: JP-Ellis <josh@jpellis.me>
-Date: Mon, 2 Dec 2019 11:33:52 +1100
-Subject: [PATCH] Remove upper limits on dependencies
-
-Upper limits can be re-instated if/when an incompatibility is discovered (and
-until papis can be updated to be compatible with the newer version).
-
-Signed-off-by: JP-Ellis <josh@jpellis.me>
----
- setup.py | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 38cfbe0c..7e7c3bf9 100644
---- setup.py
-+++ setup.py
-@@ -65,15 +65,17 @@
- "bibtexparser>=0.6.2",
- "click>=7.0.0",
- "habanero>=0.6.0",
-- "isbnlib>=3.9.1,<4.0.0",
-- "prompt_toolkit>=2.0.5,<3",
-+ "isbnlib>=3.9.1",
-+ "prompt_toolkit>=2.0.5",
- "tqdm>=4.1",
- "pygments>=2.2.0",
- "stevedore>=1.30",
- "python-doi>=0.1.1",
- # for python 3.4
-- "lxml<=4.3.5",
-- "python-slugify>=1.2.6,<4",
-+ "lxml<=4.3.5 ; python_version<='3.5'",
-+ "lxml>=4.3.5 ; python_version>'3.5'",
-+ "python-slugify>=1.2.6,<4 ; python_version<='3.4'",
-+ "python-slugify>=1.2.6 ; python_version>'3.4'",
- ],
- python_requires='>=3',
- classifiers=[
diff --git a/srcpkgs/papis/patches/update-vers2.patch b/srcpkgs/papis/patches/update-vers2.patch
deleted file mode 100644
index 7ccdb2f3eda..00000000000
--- a/srcpkgs/papis/patches/update-vers2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From bfe0ffae835dc5769198ae4aa5625ce44076eeb7 Mon Sep 17 00:00:00 2001
-From: JP-Ellis <josh@jpellis.me>
-Date: Mon, 2 Dec 2019 21:19:46 +1100
-Subject: [PATCH] Update supported Python version to 3.5, 3.6, 3.7 & 3.8
-
-It's probably safe to drop support for Python <= 3.4 as they are neither
-maintained nor receiving security fixes.
-
-Signed-off-by: JP-Ellis <josh@jpellis.me>
----
- .travis.yml | 3 +--
- appveyor.yml | 10 ++++------
- setup.py | 4 ++--
- 3 files changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index a94caae6..6f73695a 100644
---- setup.py
-+++ setup.py
-@@ -86,10 +86,10 @@
- 'Operating System :: MacOS',
- 'Operating System :: POSIX',
- 'Operating System :: Unix',
-- 'Programming Language :: Python :: 3.3',
-- 'Programming Language :: Python :: 3.4',
- 'Programming Language :: Python :: 3.5',
- 'Programming Language :: Python :: 3.6',
-+ 'Programming Language :: Python :: 3.7',
-+ 'Programming Language :: Python :: 3.8',
- 'Topic :: Utilities',
- ],
- extras_require=dict(
diff --git a/srcpkgs/papis/template b/srcpkgs/papis/template
index 3f432146c10..e3788af2a75 100644
--- a/srcpkgs/papis/template
+++ b/srcpkgs/papis/template
@@ -1,11 +1,11 @@
# Template file for 'papis'
pkgname=papis
-version=0.9
+version=0.10
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-requests python3-yaml python3-chardet python3-BeautifulSoup4
- python3-colorama python3-click python3-slugify python3-prompt_toolkit2
+ python3-colorama python3-click python3-slugify python3-prompt_toolkit
python3-tqdm python3-Pygments python3-stevedore python3-parsing
python3-filetype python3-bibtexparser python3-habanero python3-arxiv2bib
python3-isbnlib python3 python3-setuptools python3-lxml
@@ -15,7 +15,7 @@ maintainer="xaltsc <xaltsc@protonmail.ch>"
license="GPL-3.0-or-later"
homepage="https://github.com/papis/papis"
distfiles="https://github.com/papis/papis/archive/v${version}.tar.gz"
-checksum=c49e53f843a53ccaaeaa24efa777c444efcfd541098fefcfa198ab99888b15e5
+checksum=d658883af6f1ea93da9a855180063eadada339feb2c33c96f6e8ace50f3e49e9
pre_build() {
sed -i '/configparser/d' setup.py
From 34a36d46542688d4690bd1ca6036d3cae138396a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:40:20 -0400
Subject: [PATCH 7/8] pgcli: update to 3.0.0.
---
srcpkgs/pgcli/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/pgcli/template b/srcpkgs/pgcli/template
index 5e35dfae73b..51835304d71 100644
--- a/srcpkgs/pgcli/template
+++ b/srcpkgs/pgcli/template
@@ -1,12 +1,11 @@
# Template file for 'pgcli'
pkgname=pgcli
-version=2.2.0
-revision=2
+version=3.0.0
+revision=1
archs=noarch
build_style=python3-module
-pycompile_module="pgcli"
hostmakedepends="python3-setuptools"
-depends="python3-pgspecial python3-click python3-Pygments python3-prompt_toolkit2
+depends="python3-pgspecial python3-click python3-Pygments python3-prompt_toolkit
python3-psycopg2 python3-sqlparse python3-configobj python3-humanize
python3-cli_helpers python3-setproctitle"
short_desc="PostgreSQL CLI with autocompletion and syntax highlighting"
@@ -14,7 +13,7 @@ maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
license="BSD-3-Clause"
homepage="https://www.pgcli.com"
distfiles="${PYPI_SITE}/p/pgcli/pgcli-${version}.tar.gz"
-checksum=54138a31e6736a34c63b84a6d134c9292c9a73543cc0f66e80a0aaf79259d39b
+checksum=4920225838e8004ae6d2ec42f566e0a8b99c4bd42bc2c876d0de8501da0a4082
do_check() {
# pgcli tests require a PostgreSQL server; skip them.
From 8668906018f1fd766150e14e4982d62d997f84cf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 23 Jul 2020 21:43:35 -0400
Subject: [PATCH 8/8] python3-jupyter_console: rebuild for new
python3-prompt_toolkit
---
srcpkgs/python3-jupyter_console/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-jupyter_console/template b/srcpkgs/python3-jupyter_console/template
index d2639818678..4b404987cd8 100644
--- a/srcpkgs/python3-jupyter_console/template
+++ b/srcpkgs/python3-jupyter_console/template
@@ -1,13 +1,13 @@
# Template file for 'python3-jupyter_console'
pkgname=python3-jupyter_console
version=6.1.0
-revision=3
+revision=4
archs=noarch
wrksrc="jupyter_console-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-ipython python3-ipython_ipykernel python3-jupyter_client
- python3-prompt_toolkit2 python3-Pygments"
+ python3-prompt_toolkit python3-Pygments"
checkdepends="$depends python3-pytest"
short_desc="Jupyter terminal console (Python3)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Closed]: Split python{,3}-prompt_toolkit, update to python3-prompt_toolkit-3.0.5, update dependencies, remove python{,3}-prompt_toolkit2
2020-07-24 1:52 [PR PATCH] Split python{,3}-prompt_toolkit, update to python3-prompt_toolkit-3.0.5, update dependencies, remove python{,3}-prompt_toolkit2 ahesford
` (4 preceding siblings ...)
2020-07-24 3:15 ` ahesford
@ 2020-07-24 3:20 ` ahesford
5 siblings, 0 replies; 7+ messages in thread
From: ahesford @ 2020-07-24 3:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 261 bytes --]
There's a closed pull request on the void-packages repository
Split python{,3}-prompt_toolkit, update to python3-prompt_toolkit-3.0.5, update dependencies, remove python{,3}-prompt_toolkit2
https://github.com/void-linux/void-packages/pull/23791
Description:
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-07-24 3:20 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-24 1:52 [PR PATCH] Split python{,3}-prompt_toolkit, update to python3-prompt_toolkit-3.0.5, update dependencies, remove python{,3}-prompt_toolkit2 ahesford
2020-07-24 1:55 ` [PR PATCH] [Updated] " ahesford
2020-07-24 2:04 ` ahesford
2020-07-24 2:41 ` ahesford
2020-07-24 2:51 ` ahesford
2020-07-24 3:15 ` ahesford
2020-07-24 3:20 ` [PR PATCH] [Closed]: " ahesford
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).