urwid 3.0.0__tar.gz → 3.0.2__tar.gz

{urwid-3.0.0 → urwid-3.0.2}/.github/workflows/documentation.yml

@@ -16,7 +16,6 @@ on:
       - "docs/**"
       - "README.rst"
       - "urwid/**"
-      - "setup.py"
       - "pyproject.toml"
       - ".github/workflows/documentation.yml"
 

{urwid-3.0.0 → urwid-3.0.2}/.github/workflows/pythonpackage.yml

@@ -12,7 +12,6 @@ on:
     paths:
       - "urwid/**"
       - "source/**"
-      - "setup.py"
       - "pyproject.toml"
       - "MANIFEST.in"
       - "README.rst"
@@ -116,10 +115,6 @@ jobs:
         # , "macos-latest"
         # enable macOS only if OS specific branch will be added
         python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
-        exclude:
-          # Not supported by external requirements
-          - os: "windows-latest"
-            python-version: "3.13"
 
     steps:
       - uses: actions/checkout@v4

{urwid-3.0.0 → urwid-3.0.2}/.pre-commit-config.yaml

@@ -26,13 +26,13 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.11.6
+    rev: v0.11.8
     hooks:
       - id: ruff
         args: [ --fix, --exit-non-zero-on-fix ]
 
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.37.0
+    rev: v1.37.1
     hooks:
       - id: yamllint
 

{urwid-3.0.0 → urwid-3.0.2}/PKG-INFO

@@ -1,8 +1,7 @@
 Metadata-Version: 2.4
 Name: urwid
-Version: 3.0.0
+Version: 3.0.2
 Summary: A full-featured console (xterm et al.) user interface library
-Home-page: https://urwid.org/
 Author-email: Ian Ward <ian@excess.org>
 License: LGPL-2.1-only
 Project-URL: Homepage, https://urwid.org/
@@ -31,7 +30,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >3.7
+Requires-Python: >=3.9.0
 Description-Content-Type: text/x-rst
 License-File: COPYING
 Requires-Dist: wcwidth
@@ -42,8 +41,8 @@ Requires-Dist: PyGObject; extra == "glib"
 Provides-Extra: tornado
 Requires-Dist: tornado>=5.0; extra == "tornado"
 Provides-Extra: trio
-Requires-Dist: trio>=0.22.0; extra == "trio"
-Requires-Dist: exceptiongroup; extra == "trio"
+Requires-Dist: trio>=0.24.0; extra == "trio"
+Requires-Dist: exceptiongroup; python_version < "3.11" and extra == "trio"
 Provides-Extra: twisted
 Requires-Dist: twisted; extra == "twisted"
 Provides-Extra: zmq
@@ -52,9 +51,7 @@ Provides-Extra: serial
 Requires-Dist: pyserial; extra == "serial"
 Provides-Extra: lcd
 Requires-Dist: pyserial; extra == "lcd"
-Dynamic: home-page
 Dynamic: license-file
-Dynamic: requires-python
 
 Urwid
 =====

{urwid-3.0.0 → urwid-3.0.2}/docs/changelog.rst

@@ -2,6 +2,28 @@
 Changelog
 ---------
 
+Urwid 3.0.2
+===========
+
+2025-05-07
+
+Bug fixes 🕷
+++++++++++++
+* Bugfix: Corner case: Scrollbar render for only 1 row height by @penguinolog in https://github.com/urwid/urwid/pull/1021
+
+Urwid 3.0.1
+===========
+
+2025-05-07
+
+Bug fixes 🕷
+++++++++++++
+* Packaging: drop setup.py and adjust requirements by @penguinolog in https://github.com/urwid/urwid/pull/1018
+  Not updated `setup.py` lead to wrong metadata and mark of release 3.0.0 as Python 3.7 compatible.
+  Since urwid is distribluted in the pre-packaged format (wheel),
+  missing `setup.py` will not affect old toolchain users except special cases (manually enforced sdist usage).
+* Python 3.14 compatibility: adjust `AsyncioEventLoop` by @penguinolog in https://github.com/urwid/urwid/pull/1019
+
 Urwid 3.0.0
 ===========
 

{urwid-3.0.0 → urwid-3.0.2}/pyproject.toml

@@ -45,10 +45,10 @@ dependencies = {file = ["requirements.txt"]}
 classifiers = {file = ["classifiers.txt"]}
 
 [project.optional-dependencies]
-curses = ["windows-curses;sys_platform=='win32'"]
+curses = ["windows-curses; sys_platform == 'win32'"]
 glib = ["PyGObject"]
 tornado = ["tornado>=5.0"]
-trio = ["trio>=0.22.0", "exceptiongroup"]
+trio = ["trio>=0.24.0", "exceptiongroup; python_version < '3.11'"]
 twisted = ["twisted"]
 zmq = ["zmq"]
 # for lcd_display

{urwid-3.0.0 → urwid-3.0.2}/tests/test_event_loops.py

@@ -213,7 +213,17 @@ class SelectEventLoopTest(unittest.TestCase, EventLoopTestMixin):
 @unittest.skipIf(IS_WINDOWS, "Windows is temporary not supported by AsyncioEventLoop.")
 class AsyncioEventLoopTest(unittest.TestCase, EventLoopTestMixin):
     def setUp(self):
-        self.evl = urwid.AsyncioEventLoop()
+        if sys.version_info[:2] < (3, 11):
+            self.loop = asyncio.get_event_loop_policy().get_event_loop()
+            self.evl_runner = None
+        else:
+            self.evl_runner = asyncio.Runner(loop_factory=asyncio.SelectorEventLoop)
+            self.loop = self.evl_runner.get_loop()
+        self.evl = urwid.AsyncioEventLoop(loop=self.loop)
+
+    def tearDown(self):
+        if self.evl_runner is not None:
+            self.evl_runner.close()
 
     _expected_idle_handle = None
 
@@ -233,7 +243,7 @@ class AsyncioEventLoopTest(unittest.TestCase, EventLoopTestMixin):
             result = 1 / 0  # Simulate error in coroutine
             return result
 
-        asyncio.ensure_future(error_coro(), loop=asyncio.get_event_loop_policy().get_event_loop())
+        asyncio.ensure_future(error_coro(), loop=self.loop)
         self.assertRaises(ZeroDivisionError, evl.run)
 
 

{urwid-3.0.0 → urwid-3.0.2}/tests/test_scrollable.py

@@ -306,6 +306,24 @@ class TestScrollBarListBox(unittest.TestCase):
             widget.render(reduced_size).decoded_text,
         )
 
+    def test_minimal_height(self):
+        """If we have only 1 line render height and thumb position in the middle - do not render top."""
+        widget = urwid.ScrollBar(
+            urwid.ListBox(
+                (
+                    urwid.CheckBox("A"),
+                    urwid.CheckBox("B"),
+                    urwid.CheckBox("C"),
+                )
+            )
+        )
+        reduced_size = (7, 1)
+        self.assertEqual(("[ ] A █",), widget.render(reduced_size).decoded_text)
+        widget.keypress(reduced_size, "down")
+        self.assertEqual(("[ ] B █",), widget.render(reduced_size).decoded_text)
+        widget.keypress(reduced_size, "down")
+        self.assertEqual(("[ ] C █",), widget.render(reduced_size).decoded_text)
+
 
 def trivial_AttrMap(widget):
     return urwid.AttrMap(widget, {})

{urwid-3.0.0 → urwid-3.0.2}/urwid/canvas.py

@@ -1170,7 +1170,7 @@ def cview_trim_rows(cv, rows: int):
 
 
 def cview_trim_top(cv, trim: int):
-    return (cv[0], trim + cv[1], cv[2], cv[3] - trim) + cv[4:]
+    return (cv[0], trim + cv[1], cv[2], cv[3] - trim, *cv[4:])
 
 
 def cview_trim_left(cv, trim: int):

{urwid-3.0.0 → urwid-3.0.2}/urwid/event_loop/asyncio_loop.py

@@ -41,7 +41,6 @@ if typing.TYPE_CHECKING:
     _T = typing.TypeVar("_T")
 
 __all__ = ("AsyncioEventLoop",)
-IS_WINDOWS = sys.platform == "win32"
 
 
 class AsyncioEventLoop(EventLoop):
@@ -67,20 +66,37 @@ class AsyncioEventLoop(EventLoop):
     def __init__(self, *, loop: asyncio.AbstractEventLoop | None = None, **kwargs) -> None:
         super().__init__()
         self.logger = logging.getLogger(__name__).getChild(self.__class__.__name__)
-        if loop:
-            self._loop: asyncio.AbstractEventLoop = loop
+
+        if sys.version_info[:2] < (3, 11):
             self._event_loop_policy_altered: bool = False
             self._original_event_loop_policy: asyncio.AbstractEventLoopPolicy | None = None
-        else:
-            self._original_event_loop_policy = asyncio.get_event_loop_policy()
-            if IS_WINDOWS and not isinstance(self._original_event_loop_policy, asyncio.WindowsSelectorEventLoopPolicy):
-                self.logger.debug("Set WindowsSelectorEventLoopPolicy as asyncio event loop policy")
-                asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
-                self._event_loop_policy_altered = True
+
+            if loop:
+                self._loop: asyncio.AbstractEventLoop = loop
             else:
-                self._event_loop_policy_altered = False
+                self._original_event_loop_policy = asyncio.get_event_loop_policy()
+                if sys.platform == "win32" and not isinstance(
+                    self._original_event_loop_policy, asyncio.WindowsSelectorEventLoopPolicy
+                ):
+                    self.logger.debug("Set WindowsSelectorEventLoopPolicy as asyncio event loop policy")
+                    asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
+                    self._event_loop_policy_altered = True
+                else:
+                    self._event_loop_policy_altered = False
+
+                self._loop = asyncio.get_event_loop()
 
-            self._loop = asyncio.get_event_loop()
+        else:
+            self._runner: asyncio.Runner | None = None
+
+            if loop:
+                self._loop: asyncio.AbstractEventLoop = loop
+            else:
+                try:
+                    self._loop = asyncio.get_running_loop()
+                except RuntimeError:
+                    self._runner = asyncio.Runner(loop_factory=asyncio.SelectorEventLoop)
+                    self._loop = self._runner.get_loop()
 
         self._exc: BaseException | None = None
 
@@ -89,8 +105,11 @@ class AsyncioEventLoop(EventLoop):
         self._idle_callbacks: dict[int, Callable[[], typing.Any]] = {}
 
     def __del__(self) -> None:
-        if self._event_loop_policy_altered:
-            asyncio.set_event_loop_policy(self._original_event_loop_policy)  # Restore default event loop policy
+        if sys.version_info[:2] < (3, 11):
+            if self._event_loop_policy_altered:
+                asyncio.set_event_loop_policy(self._original_event_loop_policy)  # Restore default event loop policy
+        elif self._runner is not None:
+            self._runner.close()
 
     def _also_call_idle(self, callback: Callable[_Spec, _T]) -> Callable[_Spec, _T]:
         """

{urwid-3.0.0 → urwid-3.0.2}/urwid/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.0.0'
-__version_tuple__ = version_tuple = (3, 0, 0)
+__version__ = version = '3.0.2'
+__version_tuple__ = version_tuple = (3, 0, 2)

{urwid-3.0.0 → urwid-3.0.2}/urwid/widget/scrollable.py

@@ -562,7 +562,7 @@ class ScrollBar(WidgetDecoration[WrappedWidget]):
         top_weight = float(pos) / max(1, posmax)  # pylint: disable=possibly-used-before-assignment
         top_height = int((maxrow - thumb_height) * top_weight)
         if top_height == 0 and top_weight > 0:
-            top_height = 1
+            top_height = min(1, maxrow - thumb_height)
 
         # Bottom part is remaining space
         bottom_height = maxrow - thumb_height - top_height

{urwid-3.0.0 → urwid-3.0.2}/urwid.egg-info/PKG-INFO

@@ -1,8 +1,7 @@
 Metadata-Version: 2.4
 Name: urwid
-Version: 3.0.0
+Version: 3.0.2
 Summary: A full-featured console (xterm et al.) user interface library
-Home-page: https://urwid.org/
 Author-email: Ian Ward <ian@excess.org>
 License: LGPL-2.1-only
 Project-URL: Homepage, https://urwid.org/
@@ -31,7 +30,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >3.7
+Requires-Python: >=3.9.0
 Description-Content-Type: text/x-rst
 License-File: COPYING
 Requires-Dist: wcwidth
@@ -42,8 +41,8 @@ Requires-Dist: PyGObject; extra == "glib"
 Provides-Extra: tornado
 Requires-Dist: tornado>=5.0; extra == "tornado"
 Provides-Extra: trio
-Requires-Dist: trio>=0.22.0; extra == "trio"
-Requires-Dist: exceptiongroup; extra == "trio"
+Requires-Dist: trio>=0.24.0; extra == "trio"
+Requires-Dist: exceptiongroup; python_version < "3.11" and extra == "trio"
 Provides-Extra: twisted
 Requires-Dist: twisted; extra == "twisted"
 Provides-Extra: zmq
@@ -52,9 +51,7 @@ Provides-Extra: serial
 Requires-Dist: pyserial; extra == "serial"
 Provides-Extra: lcd
 Requires-Dist: pyserial; extra == "lcd"
-Dynamic: home-page
 Dynamic: license-file
-Dynamic: requires-python
 
 Urwid
 =====

{urwid-3.0.0 → urwid-3.0.2}/urwid.egg-info/SOURCES.txt

@@ -14,7 +14,6 @@ pylint-requirements.txt
 pyproject.toml
 requirements.txt
 ruff-requirements.txt
-setup.py
 test_requirements.txt
 tox.ini
 .devcontainer/dev.dockerfile

{urwid-3.0.0 → urwid-3.0.2}/urwid.egg-info/requires.txt

@@ -18,7 +18,9 @@ pyserial
 tornado>=5.0
 
 [trio]
-trio>=0.22.0
+trio>=0.24.0
+
+[trio:python_version < "3.11"]
 exceptiongroup
 
 [twisted]

urwid-3.0.0/setup.py

@@ -1,33 +0,0 @@
-# Urwid setup.py exports the useful bits
-#    Copyright (C) 2004-2014  Ian Ward
-#
-#    This library is free software; you can redistribute it and/or
-#    modify it under the terms of the GNU Lesser General Public
-#    License as published by the Free Software Foundation; either
-#    version 2.1 of the License, or (at your option) any later version.
-#
-#    This library is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#    Lesser General Public License for more details.
-#
-#    You should have received a copy of the GNU Lesser General Public
-#    License along with this library; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-# Urwid web site: https://urwid.org/
-
-from __future__ import annotations
-
-from setuptools import setup
-
-setup(
-    name="urwid",
-    url="https://urwid.org/",
-    python_requires=">3.7",
-    setup_requires=[
-        "setuptools >= 61.0.0",
-        "setuptools_scm[toml]>=7.0",
-        "wheel",
-    ],
-)