mycli 2.7.0__tar.gz → 2.8.0__tar.gz

{mycli-2.7.0 → mycli-2.8.0}/.github/workflows/publish.yml

@@ -262,4 +262,4 @@ jobs:
         name: python-packages
         path: dist/
     - name: Publish to PyPI
-      uses: pypa/gh-action-pypi-publish@ba38be9e461d3875417946c167d0b5f3d385a247 # v1.14.1
+      uses: pypa/gh-action-pypi-publish@dc37677b2e1c63e2034f94d8a5b11f265b73ba33 # v1.14.2

{mycli-2.7.0 → mycli-2.8.0}/MANIFEST.in

@@ -1,4 +1,5 @@
 include LICENSE.txt *.md *.rst doc/screenshots/*
+recursive-include mycli/resources/completions *
 recursive-include test *.cnf
 recursive-include test *.feature
 recursive-include test *.py

{mycli-2.7.0/mycli.egg-info → mycli-2.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mycli
-Version: 2.7.0
+Version: 2.8.0
 Summary: CLI for MySQL Database. With auto-completion and syntax highlighting.
 Author: Mycli Core Team
 License-Expression: BSD-3-Clause
@@ -9,6 +9,21 @@ Project-URL: Documentation, https://mycli.net/docs
 Project-URL: Source, https://github.com/dbcli/mycli
 Project-URL: Issues, https://github.com/dbcli/mycli/issues
 Project-URL: Changelog, https://github.com/dbcli/mycli/blob/main/changelog.md
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Science/Research
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: SQL
+Classifier: Topic :: Database
+Classifier: Topic :: Database :: Front-Ends
+Classifier: Topic :: Software Development
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt

{mycli-2.7.0 → mycli-2.8.0}/changelog.md

@@ -1,3 +1,19 @@
+2.8.0 (2026/07/31)
+==============
+
+Features
+---------
+* Render tab literals as four spaces in the REPL.
+* Let cursor shape respond to vi modes: _eg_ bar for insert mode.
+* Add zsh completions which can complete DSN aliases.
+
+
+Internal
+---------
+* Add Trove classifiers for PyPi.
+* Don't let behave tests refer to real home-directory resources.
+
+
 2.7.0 (2026/07/25)
 ==============
 

{mycli-2.7.0 → mycli-2.8.0}/mycli/main_modes/repl.py

@@ -23,6 +23,7 @@ import prompt_toolkit
 from prompt_toolkit.application.current import get_app
 from prompt_toolkit.auto_suggest import AutoSuggestFromHistory, ThreadedAutoSuggest
 from prompt_toolkit.completion import DynamicCompleter
+from prompt_toolkit.cursor_shapes import CursorShape, ModalCursorShapeConfig
 from prompt_toolkit.enums import DEFAULT_BUFFER, EditingMode
 from prompt_toolkit.filters import Condition, has_focus, is_done
 from prompt_toolkit.formatted_text import (
@@ -33,7 +34,11 @@ from prompt_toolkit.formatted_text import (
     to_plain_text,
 )
 from prompt_toolkit.key_binding import KeyBindings
-from prompt_toolkit.layout.processors import ConditionalProcessor, HighlightMatchingBracketProcessor
+from prompt_toolkit.layout.processors import (
+    ConditionalProcessor,
+    HighlightMatchingBracketProcessor,
+    TabsProcessor,
+)
 from prompt_toolkit.lexers import PygmentsLexer
 from prompt_toolkit.output import ColorDepth
 from prompt_toolkit.shortcuts import CompleteStyle, PromptSession
@@ -583,7 +588,9 @@ def _build_prompt_session(
                 ConditionalProcessor(
                     processor=HighlightMatchingBracketProcessor(chars='[](){}'),
                     filter=has_focus(DEFAULT_BUFFER) & ~is_done,
-                )
+                ),
+                # renders tab as four spaces rather than ^I control character
+                TabsProcessor(char1=' ', char2=' '),
             ],
             tempfile_suffix='.sql',
             completer=DynamicCompleter(lambda: mycli.completer),
@@ -599,6 +606,7 @@ def _build_prompt_session(
             enable_system_prompt=True,
             enable_suspend=True,
             editing_mode=editing_mode,
+            cursor=ModalCursorShapeConfig() if editing_mode == EditingMode.VI else CursorShape.BLOCK,
             search_ignore_case=True,
         )
 

mycli-2.8.0/mycli/resources/completions/zsh/_mycli

@@ -0,0 +1,66 @@
+#compdef mycli
+
+_mycli_dsn_aliases() {
+    local -a dsn_aliases
+
+    dsn_aliases=("${(@f)$(env MYCLI_LLM_OFF=1 command mycli --list-dsn 2>/dev/null)}")
+    if (( $#dsn_aliases )); then
+        compadd -V unsorted -a dsn_aliases
+    fi
+}
+
+_mycli_completion() {
+    local -a completions
+    local -a completions_with_descriptions
+    local -a response
+    (( ! $+commands[mycli] )) && return 1
+
+    case "${words[CURRENT]}" in
+        --dsn=*)
+            compset -P '--dsn='
+            _mycli_dsn_aliases
+            return
+            ;;
+        -d*)
+            compset -P '-d'
+            _mycli_dsn_aliases
+            return
+            ;;
+    esac
+
+    response=("${(@f)$(env MYCLI_LLM_OFF=1 COMP_WORDS="${words[*]}" COMP_CWORD=$((CURRENT-1)) _MYCLI_COMPLETE=zsh_complete command mycli)}")
+
+    for type key descr in ${response}; do
+        if [[ "$type" == "plain" ]]; then
+            if [[ "$descr" == "_" ]]; then
+                completions+=("$key")
+            else
+                completions_with_descriptions+=("$key":"$descr")
+            fi
+        elif [[ "$type" == "dir" ]]; then
+            _path_files -/
+        elif [[ "$type" == "file" ]]; then
+            _path_files -f
+        fi
+    done
+
+    if [ -n "$completions_with_descriptions" ]; then
+        _describe -V unsorted completions_with_descriptions -U
+    fi
+
+    if [ -n "$completions" ]; then
+        compadd -U -V unsorted -a completions
+    fi
+
+    if (( CURRENT == 2 )) && [[ "${words[CURRENT]}" != -* ]]; then
+        _mycli_dsn_aliases
+    elif [[ "${words[CURRENT - 1]}" == '-d' || "${words[CURRENT - 1]}" == '--dsn' ]]; then
+        _mycli_dsn_aliases
+    fi
+}
+
+if [[ $zsh_eval_context[-1] == loadautofunc ]]; then
+    _mycli_completion "$@"
+else
+    compdef _mycli_completion mycli
+fi

{mycli-2.7.0 → mycli-2.8.0/mycli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mycli
-Version: 2.7.0
+Version: 2.8.0
 Summary: CLI for MySQL Database. With auto-completion and syntax highlighting.
 Author: Mycli Core Team
 License-Expression: BSD-3-Clause
@@ -9,6 +9,21 @@ Project-URL: Documentation, https://mycli.net/docs
 Project-URL: Source, https://github.com/dbcli/mycli
 Project-URL: Issues, https://github.com/dbcli/mycli/issues
 Project-URL: Changelog, https://github.com/dbcli/mycli/blob/main/changelog.md
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Science/Research
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: SQL
+Classifier: Topic :: Database
+Classifier: Topic :: Database :: Front-Ends
+Classifier: Topic :: Software Development
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt

{mycli-2.7.0 → mycli-2.8.0}/mycli.egg-info/SOURCES.txt

@@ -92,6 +92,7 @@ mycli/packages/special/main.py
 mycli/packages/special/utils.py
 mycli/packages/tabular_output/__init__.py
 mycli/packages/tabular_output/sql_format.py
+mycli/resources/completions/zsh/_mycli
 test/__init__.py
 test/myclirc
 test/mylogin.cnf
@@ -174,4 +175,5 @@ test/pytests/test_sqlresult.py
 test/pytests/test_ssh_tunnel.py
 test/pytests/test_string_utils.py
 test/pytests/test_tabular_output.py
-test/pytests/test_vault.py
+test/pytests/test_vault.py
+test/pytests/test_zsh_completion.py

{mycli-2.7.0 → mycli-2.8.0}/mycli.egg-info/scm_file_list.json

@@ -46,6 +46,7 @@
     "test/pytests/test_key_bindings.py",
     "test/pytests/test_clibuffer.py",
     "test/pytests/test_special_iocommands.py",
+    "test/pytests/test_zsh_completion.py",
     "test/pytests/test_completion_refresher.py",
     "test/pytests/test_favoritequeries.py",
     "test/pytests/test_sql_utils.py",
@@ -168,6 +169,7 @@
     "mycli/packages/special/dsn_aliases.py",
     "mycli/packages/special/delimitercommand.py",
     "mycli/packages/special/favoritequeries.py",
-    "mycli/packages/special/utils.py"
+    "mycli/packages/special/utils.py",
+    "mycli/resources/completions/zsh/_mycli"
   ]
 }

mycli-2.8.0/mycli.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "2.8.0",
+  "distance": 0,
+  "node": "gc24ab82b2a895108cdb0a60b64ebce956037d163",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-07-31"
+}

{mycli-2.7.0 → mycli-2.8.0}/pyproject.toml

@@ -6,6 +6,23 @@ readme = "README.md"
 requires-python = ">=3.10"
 license = "BSD-3-Clause"
 authors = [{ name = "Mycli Core Team" }]
+classifiers = [
+    'Environment :: Console',
+    'Intended Audience :: Developers',
+    'Intended Audience :: Science/Research',
+    'Operating System :: OS Independent',
+    'Programming Language :: Python',
+    'Programming Language :: Python :: 3',
+    'Programming Language :: Python :: 3.10',
+    'Programming Language :: Python :: 3.11',
+    'Programming Language :: Python :: 3.12',
+    'Programming Language :: Python :: 3.13',
+    'Programming Language :: Python :: 3.14',
+    'Programming Language :: SQL',
+    'Topic :: Database',
+    'Topic :: Database :: Front-Ends',
+    'Topic :: Software Development',
+]
 
 dependencies = [
     "click ~= 8.4.2",

{mycli-2.7.0 → mycli-2.8.0}/test/features/environment.py

@@ -12,16 +12,12 @@ import pexpect
 from mycli.constants import DEFAULT_HOST, DEFAULT_PORT, DEFAULT_USER
 from steps.wrappers import run_cli, wait_prompt
 
-test_log_file = os.path.join(os.environ["HOME"], ".mycli.test.log")
-
+fd, TEST_LOG_FILE = tempfile.mkstemp(prefix='mycli-behave-', suffix='.test.log')
+os.close(fd)
 
 SELF_CONNECTING_FEATURES = ("test/features/connection.feature",)
 
 
-MYLOGIN_CNF_PATH = os.path.expanduser("~/.mylogin.cnf")
-MYLOGIN_CNF_BACKUP_PATH = f"{MYLOGIN_CNF_PATH}.backup"
-
-
 def get_db_name_from_context(context):
     return context.config.userdata.get("my_test_db", None) or "mycli_behave_tests"
 
@@ -111,19 +107,16 @@ def before_scenario(context, arg):
     # Skip flaky editor test in CI
     if os.getenv('GITHUB_ACTION') and 'skip_ci' in arg.tags:
         arg.skip('Skipped in CI')
-    with open(test_log_file, "w") as f:
+    with open(TEST_LOG_FILE, "w") as f:
         f.write("")
     if arg.location.filename not in SELF_CONNECTING_FEATURES:
         run_cli(context)
         wait_prompt(context)
 
-    if os.path.exists(MYLOGIN_CNF_PATH):
-        shutil.move(MYLOGIN_CNF_PATH, MYLOGIN_CNF_BACKUP_PATH)
-
 
 def after_scenario(context, _):
     """Cleans up after each test complete."""
-    with open(test_log_file) as f:
+    with open(TEST_LOG_FILE) as f:
         for line in f:
             if "error" in line.lower():
                 raise RuntimeError(f"Error in log file: {line}")
@@ -139,13 +132,6 @@ def after_scenario(context, _):
         context.cli.sendcontrol("d")
         context.cli.expect_exact(pexpect.EOF, timeout=5)
 
-    if os.path.exists(MYLOGIN_CNF_BACKUP_PATH):
-        shutil.move(MYLOGIN_CNF_BACKUP_PATH, MYLOGIN_CNF_PATH)
-    elif os.path.exists(MYLOGIN_CNF_PATH):
-        # This file was moved in `before_scenario`.
-        # If it exists now, it has been created during a test
-        os.remove(MYLOGIN_CNF_PATH)
-
 
 # TODO: uncomment to debug a failure
 # def after_step(context, step):

mycli-2.8.0/test/pytests/test_zsh_completion.py

@@ -0,0 +1,118 @@
+from __future__ import annotations
+
+import os
+from pathlib import Path
+import shutil
+import stat
+import subprocess
+
+import pytest
+
+ZSH = shutil.which('zsh')
+COMPLETION_SCRIPT = Path(__file__).parents[2] / 'mycli' / 'resources' / 'completions' / 'zsh' / '_mycli'
+
+
+@pytest.mark.skipif(ZSH is None, reason='zsh is not installed')
+def test_zsh_completion_lists_dsn_aliases_in_supported_contexts(tmp_path: Path) -> None:
+    assert ZSH is not None
+    executable = tmp_path / 'mycli'
+    executable.write_text(
+        '''#!/bin/sh
+if [ "${_MYCLI_COMPLETE:-}" = 'zsh_complete' ]; then
+    printf 'click\\n' >> "$MYCLI_LOG"
+    exit 0
+fi
+if [ "$1" = '--list-dsn' ]; then
+    printf 'list-dsn\\n' >> "$MYCLI_LOG"
+    printf 'prod\\nstaging\\n'
+fi
+''',
+        encoding='utf-8',
+    )
+    executable.chmod(executable.stat().st_mode | stat.S_IXUSR)
+    log_path = tmp_path / 'calls.log'
+    environment = {
+        **os.environ,
+        'COMPLETION_SCRIPT': str(COMPLETION_SCRIPT),
+        'MYCLI_LOG': str(log_path),
+        'PATH': f'{tmp_path}{os.pathsep}{os.environ["PATH"]}',
+    }
+
+    result = subprocess.run(
+        [ZSH, '-fc', ZSH_COMPLETION_HARNESS],
+        check=True,
+        capture_output=True,
+        text=True,
+        env=environment,
+    )
+
+    assert result.stdout.splitlines() == [
+        'prod,staging||0',
+        'prod||0',
+        'prod,staging||0',
+        'prod,staging||0',
+        '-dprod|-P -d|0',
+        '--dsn=prod|-P --dsn=|0',
+        '||0',
+        '||0',
+    ]
+    assert log_path.read_text(encoding='utf-8').splitlines().count('list-dsn') == 6
+
+
+ZSH_COMPLETION_HARNESS = r'''
+compdef() { :; }
+_describe() { :; }
+_path_files() { :; }
+
+typeset -a captured compset_calls
+typeset PREFIX IPREFIX used_unambiguous
+compadd() {
+    local array_name=''
+    local candidate
+
+    while (( $# )); do
+        case "$1" in
+            -U)
+                used_unambiguous=1
+                ;;
+            -a)
+                array_name="$2"
+                shift
+                ;;
+        esac
+        shift
+    done
+
+    for candidate in "${(@P)array_name}"; do
+        [[ "$candidate" == "$PREFIX"* ]] && captured+=("$IPREFIX$candidate")
+    done
+}
+compset() {
+    compset_calls+=("$*")
+    IPREFIX="$2"
+    PREFIX="${PREFIX#$IPREFIX}"
+}
+
+source "$COMPLETION_SCRIPT"
+
+run_completion() {
+    captured=()
+    compset_calls=()
+    words=("$@")
+    CURRENT=$#
+    PREFIX="${words[CURRENT]}"
+    IPREFIX=''
+    used_unambiguous=0
+    _mycli_completion
+    print -r -- "${(j:,:)captured}|${(j:,:)compset_calls}|$used_unambiguous"
+}
+
+run_completion mycli ''
+run_completion mycli pro
+run_completion mycli -d ''
+run_completion mycli --dsn ''
+run_completion mycli -dpro
+run_completion mycli --dsn=pro
+run_completion mycli --host ''
+run_completion mycli --host
+'''

mycli-2.7.0/mycli.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "2.7.0",
-  "distance": 0,
-  "node": "g8f283a66e024160fc94f7d61dc2463497df14da7",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-07-25"
-}