Skip to content

Commit 40712e8

Browse files
committed
experiment with upgrading click
removing "less" in the build step
1 parent 4f6cd6f commit 40712e8

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ jobs:
2828
with:
2929
python-version: ${{ matrix.python-version }}
3030

31+
- name: Install less pager
32+
run: sudo apt-get install less more
33+
3134
- name: Start MySQL
3235
run: |
3336
sudo /etc/init.d/mysql start
@@ -46,6 +49,10 @@ jobs:
4649
PYTEST_PASSWORD: root
4750
PYTEST_HOST: 127.0.0.1
4851
TERM: xterm
52+
# PAGER: cat
53+
# EDITOR: touch
54+
# LESS: -RXF
55+
PYTHONUNBUFFERED: 1
4956
run: |
5057
uv run tox -e py${{ matrix.python-version }}
5158

mycli/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1012,7 +1012,7 @@ def newlinewrapper(text):
10121012
def configure_pager(self):
10131013
# Provide sane defaults for less if they are empty.
10141014
if not os.environ.get("LESS"):
1015-
os.environ["LESS"] = "-RXF"
1015+
os.environ["LESS"] = ""
10161016

10171017
cnf = self.read_my_cnf_files(self.cnf_files, ["pager", "skip-pager"])
10181018
cnf_pager = cnf["pager"] or self.config["main"]["pager"]

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ authors = [{ name = "Mycli Core Team", email = "mycli-dev@googlegroups.com" }]
99
urls = { homepage = "http://mycli.net" }
1010

1111
dependencies = [
12-
"click >= 7.0,<8.1.8",
12+
"click >= 7.0",
1313
"cryptography >= 1.0.0",
1414
"Pygments>=1.6",
1515
"prompt_toolkit>=3.0.6,<4.0.0",

tox.ini

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ passenv = PYTEST_HOST
99
PYTEST_PASSWORD
1010
PYTEST_PORT
1111
PYTEST_CHARSET
12+
PYTHONUNBUFFERED
13+
TERM
14+
PAGER
15+
LESS_IS_MORE
16+
LESS
17+
EDITOR
1218
commands = uv pip install -e .[dev,ssh]
1319
coverage run -m pytest -v test
1420
coverage report -m

0 commit comments

Comments
 (0)