diff options
| -rw-r--r-- | databases/py-mycli/Makefile | 5 | ||||
| -rw-r--r-- | databases/py-mycli/distinfo | 6 | ||||
| -rw-r--r-- | databases/py-mycli/files/patch-mycli-packages-completion_engine.py | 14 | ||||
| -rw-r--r-- | databases/py-mycli/files/patch-mycli-packages-parseutils.py | 13 | ||||
| -rw-r--r-- | databases/py-mycli/files/patch-setup.py | 13 |
5 files changed, 5 insertions, 46 deletions
diff --git a/databases/py-mycli/Makefile b/databases/py-mycli/Makefile index 0869cd9d0ae8..4c8172dc62e5 100644 --- a/databases/py-mycli/Makefile +++ b/databases/py-mycli/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= mycli -PORTVERSION= 1.8.1 -PORTREVISION= 2 +PORTVERSION= 1.9.0 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click \ ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj \ ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.0:devel/py-prompt_toolkit \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto \ + ${PYTHON_PKGNAMEPREFIX}pycryptodome>=0:security/py-pycryptodome \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments \ ${PYTHON_PKGNAMEPREFIX}pymysql>=0.6.2:databases/py-pymysql \ ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.2:databases/py-sqlparse diff --git a/databases/py-mycli/distinfo b/databases/py-mycli/distinfo index c8ac896f90fb..7255340da4b3 100644 --- a/databases/py-mycli/distinfo +++ b/databases/py-mycli/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1477748738 -SHA256 (mycli-1.8.1.tar.gz) = 5514ec779a211acb2d2776561b17f5bdb2583e333cc05e1b219865985faa799c -SIZE (mycli-1.8.1.tar.gz) = 57858 +TIMESTAMP = 1489943856 +SHA256 (mycli-1.9.0.tar.gz) = 70ccf669db7949fe0f97695c82665e0fb737356f2e1d7f227f4eeda29f3311b2 +SIZE (mycli-1.9.0.tar.gz) = 55893 diff --git a/databases/py-mycli/files/patch-mycli-packages-completion_engine.py b/databases/py-mycli/files/patch-mycli-packages-completion_engine.py deleted file mode 100644 index 19ac03cda285..000000000000 --- a/databases/py-mycli/files/patch-mycli-packages-completion_engine.py +++ /dev/null @@ -1,14 +0,0 @@ -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',): diff --git a/databases/py-mycli/files/patch-mycli-packages-parseutils.py b/databases/py-mycli/files/patch-mycli-packages-parseutils.py deleted file mode 100644 index 901e39e9a998..000000000000 --- a/databases/py-mycli/files/patch-mycli-packages-parseutils.py +++ /dev/null @@ -1,13 +0,0 @@ -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', diff --git a/databases/py-mycli/files/patch-setup.py b/databases/py-mycli/files/patch-setup.py deleted file mode 100644 index 0b3f8925af65..000000000000 --- a/databases/py-mycli/files/patch-setup.py +++ /dev/null @@ -1,13 +0,0 @@ -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', - ] - |