aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorAndy Postnikov <apostnikov@gmail.com>2019-08-15 16:43:24 +0300
committerAndy Postnikov <apostnikov@gmail.com>2019-08-15 17:13:17 +0300
commite311f559e4354b780f494de042c901f0672bf936 (patch)
tree5522cf7f30d4dce829743e3bc28a4517ae6284e9 /testing
parent5524d0802e01fb342f5903cf764bc02a3cf001e0 (diff)
downloadaports-e311f559e4354b780f494de042c901f0672bf936.tar.bz2
aports-e311f559e4354b780f494de042c901f0672bf936.tar.xz
testing/mycli: upgrade to 1.20.0
Diffstat (limited to 'testing')
-rw-r--r--testing/mycli/APKBUILD10
-rw-r--r--testing/mycli/fix-sqlparse.patch36
2 files changed, 4 insertions, 42 deletions
diff --git a/testing/mycli/APKBUILD b/testing/mycli/APKBUILD
index 0c12cbaffb..425b547142 100644
--- a/testing/mycli/APKBUILD
+++ b/testing/mycli/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Thomas Boerger <thomas@webhippie.de>
# Maintainer: Thomas Boerger <thomas@webhippie.de>
pkgname=mycli
-pkgver=1.19.0
-pkgrel=2
+pkgver=1.20.0
+pkgrel=0
pkgdesc="MySQL CLI with autocompletion and syntax highlighting"
url="https://www.mycli.net"
arch="noarch"
@@ -11,7 +11,7 @@ options="!check" # builders /dev/tty not accessible
depends="python3
py3-click
py3-pygments
- py3-prompt_toolkit>2.0.0
+ py3-prompt_toolkit>2.0.5
py3-pymysql
py3-sqlparse<0.4.0
py3-configobj
@@ -20,7 +20,6 @@ depends="python3
makedepends="python3-dev py3-setuptools"
checkdepends="pytest py3-mock"
source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${pkgname:0:1}/$pkgname/$pkgname-$pkgver.tar.gz
- fix-sqlparse.patch
"
builddir="$srcdir/$pkgname-$pkgver"
@@ -39,5 +38,4 @@ package() {
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
-sha512sums="6a8477f0bc360708d018e1e44867b7f832cddb5bb1054cecb5fd78e83602c410bdeaca2d1788ee4e53cc5e8d55570792d6bf4cdaad02904a596864595e0738c2 mycli-1.19.0.tar.gz
-01f7b8352bb9a36b2a6fb61879479fbcc6c3e26754a68d42531a4aa526f662b360d2d1ab5913646f9540f303115d2914875e37e19fa101fdf8f3b5e7cf388d5d fix-sqlparse.patch"
+sha512sums="fbed2eed34fd8df0105c4c9975545f613d1318195f810e723d4f8cf0144d3c52c55b7acb512d76d41ba908a7b17d638451eb71d06c94065a58f0e95bf7caf905 mycli-1.20.0.tar.gz"
diff --git a/testing/mycli/fix-sqlparse.patch b/testing/mycli/fix-sqlparse.patch
deleted file mode 100644
index 0ad9eb4145..0000000000
--- a/testing/mycli/fix-sqlparse.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3acecd9d69e87333c1887dc2e797fa20300b9a44 Mon Sep 17 00:00:00 2001
-From: Dick Marinus <dick@mrns.nl>
-Date: Sat, 18 May 2019 21:15:32 +0200
-Subject: [PATCH] fix unit tests, hard depend on 0.3.0
-
----
- mycli/packages/completion_engine.py | 2 +-
- setup.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mycli/packages/completion_engine.py b/mycli/packages/completion_engine.py
-index 2426f30c..c63a3428 100644
---- a/mycli/packages/completion_engine.py
-+++ b/mycli/packages/completion_engine.py
-@@ -84,7 +84,7 @@ def suggest_type(full_text, text_before_cursor):
- # Be careful here because trivial whitespace is parsed as a statement,
- # but the statement won't have a first token
- tok1 = statement.token_first()
-- if tok1 and tok1.value in ['\\', 'source']:
-+ if tok1 and (tok1.value == 'source' or tok1.value.startswith('\\')):
- return suggest_special(text_before_cursor)
-
- last_token = statement and statement.token_prev(len(statement.tokens))[1] or ''
-diff --git a/setup.py b/setup.py
-index 67ad0c85..3081f19c 100755
---- a/setup.py
-+++ b/setup.py
-@@ -21,7 +21,7 @@
- 'Pygments >= 1.6',
- 'prompt_toolkit>=2.0.6',
- 'PyMySQL >= 0.9.2',
-- 'sqlparse>=0.2.2,<0.3.0',
-+ 'sqlparse>=0.3.0,<0.4.0',
- 'configobj >= 5.0.5',
- 'cryptography >= 1.0.0',
- 'cli_helpers[styles] >= 1.0.1',