Merge pull request #504 from dbcli/broneill/dependBump

Update dependencies

Author: pensivebrian

build.py

@@ -14,8 +14,8 @@
 # different from the user's PATH. When building our linux packages on various distros, we want to
 # be build machine agnostic, so we redirect python calls to the python we bundle in. Usage of
 # these variables can be seen in our build_scripts folder.
-PIP = os.getenv('CUSTOM_PIP', 'pip')
-PYTHON = os.getenv('CUSTOM_PYTHON', 'python')
+
+PYTHON = os.getenv('CUSTOM_PYTHON', sys.executable)
 
 
 def print_heading(heading, f=None):
@@ -52,7 +52,7 @@ def build():
 
     # install general requirements.
     utility.exec_command(
-        '{0} install -r requirements-dev.txt'.format(PIP),
+        '{0} -m pip install -r requirements-dev.txt'.format(PYTHON),
         utility.ROOT_DIR)
 
     # convert windows line endings to unix for mssql-cli bash script
@@ -138,8 +138,8 @@ def validate_package():
     mssqlcli_wheel_name = [pkge for pkge in mssqlcli_wheel_dir
                            if current_platform in pkge and 'dev-latest' not in pkge]
     utility.exec_command(
-        '{0} install --no-cache-dir --no-index ./dist/{1}'.format(
-            PIP,
+        '{0} -m pip install --no-cache-dir --no-index ./dist/{1}'.format(
+            PYTHON,
             mssqlcli_wheel_name[0]),
         root_dir, continue_on_error=False
     )

mssqlcli/packages/parseutils/ctes.py

@@ -18,7 +18,7 @@ def isolate_query_ctes(full_text, text_before_cursor):
     """Simplify a query by converting CTEs into table metadata objects
     """
 
-    if not full_text:
+    if not full_text or not full_text.strip():
         return full_text, text_before_cursor, tuple()
 
     ctes, _ = extract_ctes(full_text)

mssqlcli/packages/sqlcompletion.py

@@ -153,7 +153,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 = stmt.parsed.token_first()
-        if tok1 and tok1.value == '\\':
+        if tok1 and tok1.value.startswith('\\'):
             text = stmt.text_before_cursor + stmt.word_before_cursor
             return suggest_special(text)
 
@@ -388,7 +388,7 @@ def suggest_based_on_last_token(token, stmt):
     if token_v == 'set':
         return (Column(table_refs=stmt.get_tables(),
                        local_tables=stmt.local_tables),)
-    if token_v in ('select', 'where', 'having', 'by', 'distinct'):
+    if token_v in ('select', 'where', 'having', 'order by', 'distinct'):
         # Check for a table alias or schema qualification
         parent = stmt.identifier.get_parent_name() \
             if (stmt.identifier and stmt.identifier.get_parent_name()) else []

requirements-dev.txt

@@ -1,26 +1,25 @@
 applicationinsights >= 0.11.1
-argparse >= 1.2.1
 enum34 >= 1.1.6
 future >= 0.16.0
 setuptools >= 36.0.1
 wheel >= 0.29.0
-coverage >= 4.3.4, < 5.0
+coverage >= 5.2.1
 twine >= 1.11.0
 bumpversion >= 0.5.3 
 tox >= 2.7.0
 flake8 >= 3.3.0
 pytest >= 4.6.5
-pytest-cov >= 2.5.1
+pytest-cov >= 2.11.1
 pytest-timeout >= 1.3.3
 pylint >= 1.9.5
 docutils >= 0.13.1
 azure-storage == 0.36.0
 click >= 4.1, < 7.1
 Pygments >= 2.0
-prompt_toolkit>= 2.0.0 , < 2.1.0
-sqlparse >=0.2.2,<0.3.0
+prompt_toolkit >= 2.0.6 , < 4.0.0
+sqlparse >= 0.3.0,<0.5
 configobj >= 5.0.6
 humanize >= 0.5.1
-cli_helpers >= 0.2.3, < 1.0.0
+cli_helpers[styles] >= 2.0.0
 mock>=1.0.1
 polib>=1.1.0

setup.py

@@ -28,13 +28,12 @@ def get_timestamped_version(ver):
 
 install_requirements = [
     'click >= 4.1,<7.1',
-    'argparse >= 1.2.1',
     'Pygments >= 2.0',  # Pygments has to be Capitalcased.
-    'prompt_toolkit >= 2.0.0 , < 2.1.0',
-    'sqlparse >=0.2.2,<0.3.0',
+    'prompt_toolkit>=2.0.6,<4.0.0',
+    'sqlparse >=0.3.0,<0.5',
     'configobj >= 5.0.6',
     'humanize >= 0.5.1',
-    'cli_helpers >= 0.2.3, < 1.0.0',
+    'cli_helpers[styles] >= 2.0.0',
     'applicationinsights>=0.11.1',
     'future>=0.16.0',
     'wheel>=0.29.0',
@@ -60,6 +59,7 @@ def get_timestamped_version(ver):
     long_description_content_type='text/markdown',
     install_requires=install_requirements,
     include_package_data=True,
+    python_requires=">=3.6",
     scripts=[
         'mssql-cli.bat',
         'mssql-cli'
@@ -69,13 +69,11 @@ def get_timestamped_version(ver):
         'License :: OSI Approved :: BSD License',
         'Operating System :: Unix',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 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',
+        'Programming Language :: Python :: 3.9',
         'Programming Language :: SQL',
         'Topic :: Database',
         'Topic :: Database :: Front-Ends',

tests/test_main.py

@@ -95,7 +95,7 @@ def test_format_output_expanded_live_connection(self):
                 'Name | Night',
                 '(3 rows affected)'
                 ]
-            assert list(result) == expected
+            assert '\n'.join(result) == '\n'.join(expected)
         finally:
             shutdown(mssqlcli.mssqlcliclient_main)
 
@@ -138,7 +138,7 @@ def test_format_output_auto_expand():
             'head2 | def',
             'test status'
         ]
-        assert list(expanded_results) == expanded
+        assert '\n'.join(expanded_results) == '\n'.join(expanded)
 
     @staticmethod
     def test_missing_rc_dir():

tests/test_query_baseline/baseline_col_wide.txt

@@ -1,6 +1,6 @@
-+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| (No column name)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
-|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X, |
-+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| (No column name)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X... |
++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 (1 row affected)

tests/test_sqlcompletion.py

@@ -271,7 +271,7 @@ def test_distinct_and_order_by_suggestions_with_aliases():
             (
                 'SELECT * FROM tbl x JOIN tbl1 y ORDER BY ',
                 'SELECT * FROM tbl x JOIN tbl1 y ORDER BY ',
-                'BY',
+                'ORDER BY',
             )
         ]
         for arg in test_args:
@@ -849,7 +849,7 @@ def test_create_db_with_template():
 
     @staticmethod
     def test_specials_included_for_initial_completion():
-        initial_texts = ('', '    ', '\t \t',)
+        initial_texts = ('', '    ', '\t \t', '\n')
         for initial_text in initial_texts:
             suggestions = suggest_type(initial_text, initial_text)
             assert set(suggestions) == set([Keyword(), Special()])

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py37,py38
+envlist = py36,py37,py38,py39
 # We will build the sdist ourselves as we need to detect
 # what platform we are on and install the generated wheel
 # locally.