Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
amjith authored Mar 24, 2024
2 parents 2dbff0a + 8c005f7 commit 80af92b
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
8 changes: 8 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
Upcoming
========


Bug Fixes:
----------
* Don't install tests.


Internal:
---------
* paramiko is newer than 2.11.0 now, remove version pinning `cryptography`.


1.27.0 (2023/08/11)
===================

Expand All @@ -21,6 +28,7 @@ Bug Fixes:
* Remove vi-mode bindings for prettify/unprettify.
* Honor `\G` when executing from commandline with `-e`.
* Correctly report the version of TiDB.
* Revised `botton` spelling mistakes with `bottom` in `mycli/clitoolbar.py`


1.26.1 (2022/09/01)
Expand Down
9 changes: 4 additions & 5 deletions mycli/AUTHORS
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
Project Lead:
-------------
* Thomas Roten


Core Developers:
----------------

* Thomas Roten
* Irina Truong
* Matheus Rosa
* Darik Gamble
Expand Down Expand Up @@ -95,6 +91,9 @@ Contributors:
* Kevin Schmeichel
* Mel Dafert
* Thomas Copper
* Alfred Wingate
* Zhanze Wang


Created by:
-----------
Expand Down
5 changes: 2 additions & 3 deletions mycli/clitoolbar.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
def create_toolbar_tokens_func(mycli, show_fish_help):
"""Return a function that generates the toolbar tokens."""
def get_toolbar_tokens():
result = []
result.append(('class:bottom-toolbar', ' '))
result = [('class:bottom-toolbar', ' ')]

if mycli.multi_line:
delimiter = special.get_current_delimiter()
Expand All @@ -26,7 +25,7 @@ def get_toolbar_tokens():
'[F3] Multiline: OFF '))
if mycli.prompt_app.editing_mode == EditingMode.VI:
result.append((
'class:botton-toolbar.on',
'class:bottom-toolbar.on',
'Vi-mode ({})'.format(_get_vi_mode())
))

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def run_tests(self):
author_email='[email protected]',
version=version,
url='http://mycli.net',
packages=find_packages(),
packages=find_packages(exclude=['test*']),
package_data={'mycli': ['myclirc', 'AUTHORS', 'SPONSORS']},
description=description,
long_description=description,
Expand Down

0 comments on commit 80af92b

Please sign in to comment.