Date: Sat, 19 Nov 2016 17:07:43 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426459 - in head/databases/py-mycli: . files Message-ID: <201611191707.uAJH7hG9072105@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sat Nov 19 17:07:43 2016 New Revision: 426459 URL: https://svnweb.freebsd.org/changeset/ports/426459 Log: - Import upstream patch for sqlparse 0.2.2 - Bump PORTREVISION for package change Obtained from: https://github.com/dbcli/mycli/commit/63a6339e451dfe537f1b7cf43758409abea52342 Added: head/databases/py-mycli/files/ head/databases/py-mycli/files/patch-mycli-packages-completion_engine.py (contents, props changed) head/databases/py-mycli/files/patch-mycli-packages-parseutils.py (contents, props changed) head/databases/py-mycli/files/patch-setup.py (contents, props changed) Modified: head/databases/py-mycli/Makefile Modified: head/databases/py-mycli/Makefile ============================================================================== --- head/databases/py-mycli/Makefile Sat Nov 19 17:07:38 2016 (r426458) +++ head/databases/py-mycli/Makefile Sat Nov 19 17:07:43 2016 (r426459) @@ -3,6 +3,7 @@ PORTNAME= mycli PORTVERSION= 1.8.1 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -19,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}clic ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments \ ${PYTHON_PKGNAMEPREFIX}pymysql>=0.6.2:databases/py-pymysql \ - ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.0:databases/py-sqlparse + ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.2:databases/py-sqlparse NO_ARCH= yes USE_PYTHON= autoplist distutils Added: head/databases/py-mycli/files/patch-mycli-packages-completion_engine.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/py-mycli/files/patch-mycli-packages-completion_engine.py Sat Nov 19 17:07:43 2016 (r426459) @@ -0,0 +1,14 @@ +Obtained from: https://github.com/dbcli/mycli/commit/63a6339e451dfe537f1b7cf43758409abea52342 + +--- mycli/packages/completion_engine.py.orig 2016-09-18 04:19:04 UTC ++++ mycli/packages/completion_engine.py +@@ -197,6 +197,9 @@ def suggest_based_on_last_token(token, t + return [{'type': 'column', 'tables': extract_tables(full_text)}] + elif token_v in ('set', 'by', 'distinct'): + return [{'type': 'column', 'tables': extract_tables(full_text)}] ++ elif token_v == 'as': ++ # Don't suggest anything for an alias ++ return [] + elif token_v in ('show'): + return [{'type': 'show'}] + elif token_v in ('to',): Added: head/databases/py-mycli/files/patch-mycli-packages-parseutils.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/py-mycli/files/patch-mycli-packages-parseutils.py Sat Nov 19 17:07:43 2016 (r426459) @@ -0,0 +1,13 @@ +Obtained from: https://github.com/dbcli/mycli/commit/63a6339e451dfe537f1b7cf43758409abea52342 + +--- mycli/packages/parseutils.py.orig 2015-10-16 13:27:27 UTC ++++ mycli/packages/parseutils.py +@@ -64,7 +64,7 @@ def last_word(text, include='alphanum_un + # This code is borrowed from sqlparse example script. + # <url> + def is_subselect(parsed): +- if not parsed.is_group(): ++ if not parsed.is_group: + return False + for item in parsed.tokens: + if item.ttype is DML and item.value.upper() in ('SELECT', 'INSERT', Added: head/databases/py-mycli/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/py-mycli/files/patch-setup.py Sat Nov 19 17:07:43 2016 (r426459) @@ -0,0 +1,13 @@ +Obtained from: https://github.com/dbcli/mycli/commit/63a6339e451dfe537f1b7cf43758409abea52342 + +--- setup.py.orig 2016-09-20 16:46:21 UTC ++++ setup.py +@@ -16,7 +16,7 @@ install_requirements = [ + 'Pygments >= 2.0', # Pygments has to be Capitalcased. WTF? + 'prompt_toolkit>=1.0.0,<1.1.0', + 'PyMySQL >= 0.6.2', +- 'sqlparse>=0.2.0,<0.2.2', ++ 'sqlparse>=0.2.2,<0.3.0', + 'configobj >= 5.0.6', + ] +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611191707.uAJH7hG9072105>