From 16365c003572fbb3858347e315d4238fbbbd9ad0 Mon Sep 17 00:00:00 2001 From: Vaughn Kottler Date: Fri, 21 Jun 2024 23:09:27 -0700 Subject: [PATCH] 1.3.5 - Fix breakage from upstream change --- .github/workflows/python-package.yml | 7 ++++++- README.md | 4 ++-- config | 2 +- conntextual/__init__.py | 4 ++-- conntextual/curses/base.py | 7 ++++--- conntextual/curses/tui.py | 2 +- conntextual/ui/footer.py | 4 +++- local/variables/package.yaml | 2 +- pyproject.toml | 2 +- tasks/default.yaml | 1 + 10 files changed, 22 insertions(+), 13 deletions(-) create mode 100644 tasks/default.yaml diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index dcc052e..6a6d23b 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -10,6 +10,7 @@ on: env: TWINE_PASSWORD: ${{secrets.TWINE_PASSWORD}} GITHUB_API_TOKEN: ${{secrets.API_TOKEN}} + CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}} jobs: build: @@ -55,6 +56,10 @@ jobs: PY_TEST_EXTRA_ARGS: --cov-report=xml - uses: codecov/codecov-action@v3.1.5 + with: + fail_ci_if_error: true + verbose: true + token: ${{secrets.CODECOV_TOKEN}} - run: mk pypi-upload-ci env: @@ -67,7 +72,7 @@ jobs: - run: | mk python-release owner=vkottler \ - repo=conntextual version=1.3.4 + repo=conntextual version=1.3.5 if: | matrix.python-version == '3.11' && matrix.system == 'ubuntu-latest' diff --git a/README.md b/README.md index 598cddf..f74e546 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,11 @@ ===================================== generator=datazen version=3.1.4 - hash=1c09a2d5cb8a5fe2b20a06aef6ff1564 + hash=0e2fbdb8a8dcbb003fd2be2072402f40 ===================================== --> -# conntextual ([1.3.4](https://pypi.org/project/conntextual/)) +# conntextual ([1.3.5](https://pypi.org/project/conntextual/)) [![python](https://img.shields.io/pypi/pyversions/conntextual.svg)](https://pypi.org/project/conntextual/) ![Build Status](https://github.com/vkottler/conntextual/workflows/Python%20Package/badge.svg) diff --git a/config b/config index edfca7a..be94f0e 160000 --- a/config +++ b/config @@ -1 +1 @@ -Subproject commit edfca7a4325ccff853b27986639cd8ca8ef5dbe2 +Subproject commit be94f0eaf88b995471bc16a818ab0ba75c357454 diff --git a/conntextual/__init__.py b/conntextual/__init__.py index b1d6d09..56dafe9 100644 --- a/conntextual/__init__.py +++ b/conntextual/__init__.py @@ -1,7 +1,7 @@ # ===================================== # generator=datazen # version=3.1.4 -# hash=e87046a2e98422d8d716879f2dbe946f +# hash=8de09ebb47d5fadff586a7eb4d536e01 # ===================================== """ @@ -10,4 +10,4 @@ DESCRIPTION = "A network-application TUI using textual." PKG_NAME = "conntextual" -VERSION = "1.3.4" +VERSION = "1.3.5" diff --git a/conntextual/curses/base.py b/conntextual/curses/base.py index a56dfd4..5c657c0 100644 --- a/conntextual/curses/base.py +++ b/conntextual/curses/base.py @@ -77,10 +77,11 @@ async def dispatch(self) -> bool: # Update state. self.draw() - window.noutrefresh() - curses.doupdate() - return True + # Not sure what's going on with coverage. + window.noutrefresh() # pragma: nocover + curses.doupdate() # pragma: nocover + return True # pragma: nocover @property def cursor(self) -> Cursor: diff --git a/conntextual/curses/tui.py b/conntextual/curses/tui.py index 164a63a..1b5b015 100644 --- a/conntextual/curses/tui.py +++ b/conntextual/curses/tui.py @@ -37,7 +37,7 @@ def draw(self) -> None: for env_name, env in ENVIRONMENTS.items(): window.addstr(f"========== {env_name} ==========") window.clrtoeol() - if not self.cursor.inc_y(): + if not self.cursor.inc_y(): # pragma: nocover break for name in env.env.names: diff --git a/conntextual/ui/footer.py b/conntextual/ui/footer.py index a14bd61..a3eb7c8 100644 --- a/conntextual/ui/footer.py +++ b/conntextual/ui/footer.py @@ -8,6 +8,7 @@ # third-party from rich.console import RenderableType from rich.text import Text +from textual.renderables.blank import Blank from textual.widgets import Footer @@ -25,7 +26,8 @@ def render(self) -> RenderableType: if self.current_tab: result = Text.assemble( - result, + # Really dumb. + result if not isinstance(result, Blank) else "", "| ", Text(f"tab: {self.current_tab}", style="yellow bold"), ) diff --git a/local/variables/package.yaml b/local/variables/package.yaml index 97559a5..8c57f6e 100644 --- a/local/variables/package.yaml +++ b/local/variables/package.yaml @@ -1,5 +1,5 @@ --- major: 1 minor: 3 -patch: 4 +patch: 5 entry: conntextual diff --git a/pyproject.toml b/pyproject.toml index 6cf0114..599b7c7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta:__legacy__" [project] name = "conntextual" -version = "1.3.4" +version = "1.3.5" description = "A network-application TUI using textual." readme = "README.md" requires-python = ">=3.11" diff --git a/tasks/default.yaml b/tasks/default.yaml new file mode 100644 index 0000000..ed97d53 --- /dev/null +++ b/tasks/default.yaml @@ -0,0 +1 @@ +---