urwid 3.0.3__tar.gz → 3.0.4__tar.gz

{urwid-3.0.3 → urwid-3.0.4}/.github/workflows/documentation.yml

@@ -23,7 +23,7 @@ jobs:
   Build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0  # need for setuptools_scm
       - name: Set up Python
@@ -44,7 +44,7 @@ jobs:
         run: pip install -e .
       - name: Build documentation
         run: sphinx-build docs build/documentation
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           path: build/documentation
           name: documentation

{urwid-3.0.3 → urwid-3.0.4}/.github/workflows/isolated_static_check.yml

@@ -4,19 +4,17 @@ on:
   pull_request:
     paths:
       - "ruff-requirements.txt"
-      - "black-requirements.txt"
-      - "isort-requirements.txt"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
-  Isort:
-    name: Validate import sorting
+  Ruff-format:
+    name: Validate formatting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
@@ -25,34 +23,16 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install --upgrade -r isort-requirements.txt
-      - name: Check imports with isort
-        run: |
-          isort --check --diff .
-
-  Black:
-    name: Validate black formatting
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - name: Set up Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: '3.x'
-          cache: 'pip'
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install --upgrade -r black-requirements.txt
-      - name: Check code style with black
+          pip install --upgrade -r ruff-requirements.txt
+      - name: Check code style with ruff
         run: |
-          black --check .
+          ruff format --check .
 
   Ruff:
     name: Check with Ruff
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
@@ -70,7 +50,7 @@ jobs:
     name: Check with pylint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Install Ubuntu dependencies
         run: |
           sudo apt-get -qq update

{urwid-3.0.3 → urwid-3.0.4}/.github/workflows/pythonpackage.yml

@@ -26,11 +26,11 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  Isort:
-    name: Validate import sorting
+  Ruff-format:
+    name: Validate formatting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
@@ -39,34 +39,16 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install --upgrade -r isort-requirements.txt
-      - name: Check imports with isort
-        run: |
-          isort --check --diff .
-
-  Black:
-    name: Validate black formatting
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - name: Set up Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: '3.x'
-          cache: 'pip'
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install --upgrade -r black-requirements.txt
-      - name: Check code style with black
+          pip install --upgrade -r ruff-requirements.txt
+      - name: Check code style with ruff
         run: |
-          black --check .
+          ruff format --check .
 
   Ruff:
     name: Check with Ruff
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
@@ -84,7 +66,7 @@ jobs:
     name: Check with pylint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Install Ubuntu dependencies
         run: |
           sudo apt-get -qq update
@@ -106,7 +88,7 @@ jobs:
         run: pylint --output-format=github urwid
 
   Test:
-    needs: [ Isort, Black, Ruff, PyLint ]
+    needs: [ Ruff-format, Ruff, PyLint ]
     runs-on: ${{ matrix.os }}
     strategy:
       max-parallel: 6
@@ -114,10 +96,13 @@ jobs:
         os: [ "ubuntu-latest", "windows-latest" ]
         # , "macos-latest"
         # enable macOS only if OS specific branch will be added
-        python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
+        python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13", "3.14" ]
+        exclude:
+          - os: "windows-latest"
+            python-version: "3.14"
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0  # need for setuptools_scm
       - name: Set up Python ${{ matrix.python-version }}
@@ -170,10 +155,10 @@ jobs:
 
   build:
     name: Build distribution
-    needs: [ Test, Isort, Black, Ruff, PyLint ]
+    needs: [ Test, Ruff-format, Ruff, PyLint ]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0  # need for setuptools_scm
 
@@ -187,13 +172,13 @@ jobs:
       - name: Build dist
         run: python -m build
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           path: dist/*.tar.gz
           name: built-sdist
           retention-days: 3
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           path: dist/*.whl
           name: built-bdist
@@ -204,7 +189,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ build ]
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
@@ -214,7 +199,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install --upgrade twine
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@v6
         with:
           # unpacks default artifact into dist/
           # if `name: wheels` is omitted, the action will create extra parent dir
@@ -239,7 +224,7 @@ jobs:
     permissions:
       id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
     steps:
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@v6
         with:
           pattern: built-*
           merge-multiple: true

{urwid-3.0.3 → urwid-3.0.4}/.github/workflows/yamllint.yml

@@ -10,7 +10,7 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Python
         uses: actions/setup-python@v6
         with:

{urwid-3.0.3 → urwid-3.0.4}/.pre-commit-config.yaml

@@ -1,35 +1,21 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-yaml
       - id: end-of-file-fixer
       - id: trailing-whitespace
       - id: mixed-line-ending
 
-  - repo: https://github.com/pycqa/isort
-    rev: 6.0.1
-    hooks:
-      - id: isort
-        name: isort (python)
-      - id: isort
-        name: isort (cython)
-        types: [cython]
-      - id: isort
-        name: isort (pyi)
-        types: [pyi]
-
-  - repo: https://github.com/psf/black
-    rev: 25.1.0
-    hooks:
-      - id: black
-
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.12.0
+    rev: v0.14.5
     hooks:
-      - id: ruff
-        args: [ --fix, --exit-non-zero-on-fix ]
+      # Run the linter.
+      - id: ruff-check
+        args: [ --fix ]
+      # Run the formatter.
+      - id: ruff-format
 
   - repo: https://github.com/adrienverge/yamllint.git
     rev: v1.37.1

{urwid-3.0.3 → urwid-3.0.4}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: urwid
-Version: 3.0.3
+Version: 3.0.4
 Summary: A full-featured console (xterm et al.) user interface library
 Author-email: Ian Ward <ian@excess.org>
-License: LGPL-2.1-only
+License-Expression: LGPL-2.1-only
 Project-URL: Homepage, https://urwid.org/
 Project-URL: Documentation, https://urwid.org/manual/index.html
 Project-URL: Repository, https://github.com/urwid/urwid
@@ -14,7 +14,6 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Environment :: Console :: Curses
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS :: MacOS X
@@ -27,6 +26,7 @@ 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 :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -74,7 +74,7 @@ It includes many features useful for text console application developers includi
 - Display modules include raw, curses, and experimental LCD and web displays
 - Support for UTF-8, simple 8-bit and CJK encodings
 - 24-bit (true color), 256 color, and 88 color mode support
-- Compatible with Python 3.7+ and PyPy
+- Compatible with Python 3.9+ and PyPy
 
 Home Page:
   http://urwid.org/
@@ -147,6 +147,7 @@ Supported Python versions
 - 3.11
 - 3.12
 - 3.13
+- 3.14
 - pypy3
 
 Authors

{urwid-3.0.3 → urwid-3.0.4}/README.rst

@@ -19,7 +19,7 @@ It includes many features useful for text console application developers includi
 - Display modules include raw, curses, and experimental LCD and web displays
 - Support for UTF-8, simple 8-bit and CJK encodings
 - 24-bit (true color), 256 color, and 88 color mode support
-- Compatible with Python 3.7+ and PyPy
+- Compatible with Python 3.9+ and PyPy
 
 Home Page:
   http://urwid.org/
@@ -92,6 +92,7 @@ Supported Python versions
 - 3.11
 - 3.12
 - 3.13
+- 3.14
 - pypy3
 
 Authors

{urwid-3.0.3 → urwid-3.0.4}/classifiers.txt

@@ -2,7 +2,6 @@ Development Status :: 5 - Production/Stable
 Environment :: Console
 Environment :: Console :: Curses
 Intended Audience :: Developers
-License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)
 Operating System :: POSIX
 Operating System :: Unix
 Operating System :: MacOS :: MacOS X
@@ -15,6 +14,7 @@ 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 :: Python :: 3 :: Only
 Programming Language :: Python :: Implementation :: CPython
 Programming Language :: Python :: Implementation :: PyPy

{urwid-3.0.3 → urwid-3.0.4}/docs/changelog.rst

@@ -2,6 +2,23 @@
 Changelog
 ---------
 
+Urwid 3.0.4
+===========
+
+2025-12-01
+
+Deprecations ⚡
+++++++++++++++
+* Fix CheckBox DeprecationWarning: Use user_args instead of user_arg by @sawdmn in https://github.com/urwid/urwid/pull/1079
+Other Changes
++++++++++++++
+* Refactoring: use official python way for lazy imports by @penguinolog in https://github.com/urwid/urwid/pull/1077
+
+## New Contributors
+* @sawdmn made their first contribution in https://github.com/urwid/urwid/pull/1079
+
+**Full Changelog**: https://github.com/urwid/urwid/compare/3.0.3...3.0.4
+
 Urwid 3.0.3
 ===========
 

{urwid-3.0.3 → urwid-3.0.4}/examples/twisted_serve_ssh.py

@@ -289,9 +289,9 @@ class TwistedScreen(Screen):
         >>> s = Screen()
         >>> s.set_terminal_properties(colors=256)
         >>> a2e = s._attrspec_to_escape
-        >>> a2e(s.AttrSpec('brown', 'dark green'))
+        >>> a2e(s.AttrSpec("brown", "dark green"))
         '\\x1b[0;33;42m'
-        >>> a2e(s.AttrSpec('#fea,underline', '#d0d'))
+        >>> a2e(s.AttrSpec("#fea,underline", "#d0d"))
         '\\x1b[0;38;5;229;4;48;5;164m'
         """
         if a.foreground_high:

urwid-3.0.4/pylint-requirements.txt

@@ -0,0 +1 @@
+pylint==4.0.3

{urwid-3.0.3 → urwid-3.0.4}/pyproject.toml

@@ -2,9 +2,9 @@
 # Minimum requirements for the build system to execute.
 # PEP 508 specifications for PEP 518.
 requires = [
-  "setuptools >= 61.0.0",
-  "setuptools_scm[toml]>=7.0",
+  "setuptools >= 80.8.0",
   "wheel",
+  "setuptools_scm[toml]>=8.1.0",
 ]
 build-backend="setuptools.build_meta"
 
@@ -13,7 +13,8 @@ name = "urwid"
 description = "A full-featured console (xterm et al.) user interface library"
 requires-python = ">=3.9.0"
 keywords = ["curses", "ui", "widget", "scroll", "listbox", "user interface", "text layout", "console", "ncurses"]
-license={text="LGPL-2.1-only"}  # Use SPDX classifier
+license = "LGPL-2.1-only"  # Use SPDX classifier
+license-files=["COPYING"]
 readme = {file = "README.rst", content-type = "text/x-rst"}
 authors=[{name="Ian Ward", email="ian@excess.org"}]
 dynamic = ["classifiers", "version", "dependencies"]
@@ -161,6 +162,7 @@ extend-exclude = ["tests"]
 extend-select = [
   "E",
   "W",  # also pycodestyle warnings
+  "F",  # pyflakes
   "PYI",  # flake8-pyi
   "ASYNC",  # flake8-async
   "FA",  # from __future__ import annotations
@@ -174,9 +176,12 @@ extend-select = [
   "ICN", "PGH",  # flake8-import-conventions, pygrep-hooks
   "Q",  # quotes
   "FLY",  # Flynt
+  "FURB",  # Refurb
+  "PIE",  # flake8-pie,
   "TRY", "UP", "I", "PL", "PERF", "RUF",  # tryceratops, pyupgrade, isort, pylint + perflint, Ruff-specific
 ]
 extend-ignore = [
+  "E221", "E222",  # handled by formatter
   "PLR6301", "E203",
   # refactor rules (too many statements/arguments/branches)
   "PLR0904", "PLR0911", "PLR0912", "PLR0913", "PLR0914", "PLR0915", "PLR0917", "PLR2004",
@@ -207,6 +212,9 @@ allow-dunder-method-names = [
   "_contents__delitem__",
 ]
 
+[tool.ruff.format]
+docstring-code-format = true
+
 [tool.pylint]
 extension-pkg-whitelist = []
 ignore = ["CVS", "version.py"]

urwid-3.0.4/ruff-requirements.txt

@@ -0,0 +1 @@
+ruff==0.14.7

{urwid-3.0.3 → urwid-3.0.4}/tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py3{9,10,11,12,13},pypy3,isort,black,ruff,pylint,refurb
+envlist = py3{9,10,11,12,13,14},pypy3,ruff,pylint,refurb
 skip_missing_interpreters = True
 
 [testenv]
@@ -18,26 +18,13 @@ commands =
   python -m build
   twine check {toxinidir}/dist/*
 
-[testenv:isort]
-skip_install = true
-deps =
-  isort
-commands =
-  isort .
-
-[testenv:black]
-skip_install = true
-depends = isort
-deps =
-  black
-commands =
-  black .
-
 [testenv:ruff]
 skip_install = true
-depends = black,isort
+depends =
 deps = ruff
-commands = ruff check .
+commands =
+  ruff format --check .
+  ruff check .
 
 [testenv:docs]
 deps =
@@ -47,7 +34,7 @@ deps =
 commands = sphinx-build docs/ build/documentation
 
 [testenv:pylint]
-depends = black,isort
+depends = ruff
 deps =
   -r {toxinidir}/test_requirements.txt
   PyGObject
@@ -55,6 +42,6 @@ deps =
 commands = pylint urwid
 
 [testenv:refurb]
-depends = black,isort
+depends = ruff
 deps = refurb
 commands = refurb urwid examples

{urwid-3.0.3 → urwid-3.0.4}/urwid/__init__.py

@@ -21,7 +21,7 @@
 
 from __future__ import annotations
 
-import importlib
+import importlib.util
 import sys
 import types
 import typing
@@ -265,12 +265,28 @@ _moved_warn: dict[str, str] = {
 }
 # Backward compatible lazy load without any warnings
 # Before DeprecationWarning need to start PendingDeprecationWarning process.
-_moved_no_warn: dict[str, str] = {
-    "display_common": "urwid.display.common",
-    "raw_display": "urwid.display.raw",
-    "curses_display": "urwid.display.curses",
-    "escape": "urwid.display.escape",
-}
+
+
+def lazy_import(name: str, package: str | None = None) -> types.ModuleType:
+    """Lazy import implementation from Python documentation.
+
+    Useful for cases where no warnings expected for moved modules.
+    """
+    spec = importlib.util.find_spec(name, package)
+    if not spec:
+        raise ImportError(f"No module named {name!r}")
+    if not spec.loader:
+        raise ImportError(f"Module named {name!r} is invalid")
+
+    loader = importlib.util.LazyLoader(spec.loader)
+    spec.loader = loader
+    module = importlib.util.module_from_spec(spec)
+    if not package:
+        sys.modules[name] = module
+    else:
+        sys.modules[f"{package.rstrip('.')}.{name.lstrip('.')}"] = module
+    loader.exec_module(module)
+    return module
 
 
 class _MovedModule(types.ModuleType):
@@ -293,6 +309,12 @@ class _MovedModule(types.ModuleType):
         return getattr(real_module, name)
 
 
+display_common = lazy_import("urwid.display.common")
+raw_display = lazy_import("urwid.display.raw")
+curses_display = lazy_import("urwid.display.curses")
+escape = lazy_import("urwid.display.escape")
+
+
 class _MovedModuleWarn(_MovedModule):
     """Special class to handle moved modules.
 
@@ -310,10 +332,6 @@ class _MovedModuleWarn(_MovedModule):
         return super().__getattr__(name)
 
 
-for _name, _module in _moved_no_warn.items():
-    _module_path = f"{__name__}.{_name}"
-    sys.modules[_module_path] = _MovedModule(_module_path, _module)
-
 for _name, _module in _moved_warn.items():
     _module_path = f"{__name__}.{_name}"
     sys.modules[_module_path] = _MovedModuleWarn(_module_path, _module)
@@ -325,11 +343,6 @@ def __getattr__(name: str) -> typing.Any:
     :return: attribute by name
     :raises AttributeError: attribute is not defined for lazy load
     """
-    if name in _moved_no_warn:
-        mod = importlib.import_module(_moved_no_warn[name])
-        __locals[name] = mod
-        return mod
-
     if name in _moved_warn:
         warnings.warn(
             f"{name} is moved to {_moved_warn[name]}",