xvfbwrapper 0.2.23__tar.gz → 0.2.25__tar.gz

{xvfbwrapper-0.2.23/xvfbwrapper.egg-info → xvfbwrapper-0.2.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xvfbwrapper
-Version: 0.2.23
+Version: 0.2.25
 Summary: Manage headless displays with Xvfb (X virtual framebuffer)
 Author: Corey Goldberg
 Maintainer: Corey Goldberg
@@ -44,6 +44,11 @@ Dynamic: license-file
 - Releases: [PyPI][pypi-home]
 - License: [MIT][mit-license]
 
+The package provides the `xvfvwrapper.Xvfb` class that is used to interact with
+an Xvfb server.
+
+See the [module API documentation][api-docs] for more information.
+
 ----
 
 ## Status
@@ -253,14 +258,11 @@ import unittest
 from selenium import webdriver
 from xvfbwrapper import Xvfb
 
-# force X11 in case we are running on a Wayland system
-os.environ["XDG_SESSION_TYPE"] = "x11"
-
 
 class TestPage(unittest.TestCase):
 
     def setUp(self):
-        xvfb = Xvfb()
+        xvfb = Xvfb(set_xdg_session_type=True)
         xvfb.start()
         self.driver = webdriver.Chrome()
         self.addCleanup(xvfb.stop)
@@ -282,26 +284,11 @@ if __name__ == "__main__":
 
 ----
 
-## xvfbwrapper Issues
-
-To report a bug or request a new feature, please open an issue on [GitHub][github-issues].
-
-----
-
-## xvfbwrapper Development
+## Development
 
-1. Fork the project repo on [GitHub][github-repo]
+- Git: [github.com/cgoldberg/xvfbwrapper.git][github-repo]
 
-2. Clone the repo:
-
-    ```
-    git clone https://github.com/<USERNAME>/xvfbwrapper.git
-    cd xvfbwrapper
-    ```
-
-3. Make changes and run the tests:
-
-    Create a virtual env and install required testing packages:
+- Create a virtual env and install required testing packages:
 
     ```
     python -m venv venv
@@ -309,27 +296,21 @@ To report a bug or request a new feature, please open an issue on [GitHub][githu
     pip install --editable --group dev --group test .
     ```
 
-    Run all tests in the default Python environment:
+- Run all tests in the default Python environment:
 
     ```
     pytest
     ```
 
-    Run all tests, linting, and type checking across all supported/installed
-    Python environments:
+- Run all tests, linting, and type checking across all supported/installed
+  Python environments:
 
     ```
     tox
     ```
 
-4. Commit and push your changes
-
-5. Submit a [Pull Request][github-prs]
-
-
 [github-profile]: https://github.com/cgoldberg
 [github-repo]: https://github.com/cgoldberg/xvfbwrapper
-[github-issues]: https://github.com/cgoldberg/xvfbwrapper/issues
-[github-prs]: https://github.com/cgoldberg/xvfbwrapper/pulls
 [pypi-home]: https://pypi.org/project/xvfbwrapper
 [mit-license]: https://raw.githubusercontent.com/cgoldberg/xvfbwrapper/refs/heads/master/LICENSE
+[api-docs]: https://coreygoldberg.com/xvfbwrapper

{xvfbwrapper-0.2.23 → xvfbwrapper-0.2.25}/README.md

@@ -13,6 +13,11 @@
 - Releases: [PyPI][pypi-home]
 - License: [MIT][mit-license]
 
+The package provides the `xvfvwrapper.Xvfb` class that is used to interact with
+an Xvfb server.
+
+See the [module API documentation][api-docs] for more information.
+
 ----
 
 ## Status
@@ -222,14 +227,11 @@ import unittest
 from selenium import webdriver
 from xvfbwrapper import Xvfb
 
-# force X11 in case we are running on a Wayland system
-os.environ["XDG_SESSION_TYPE"] = "x11"
-
 
 class TestPage(unittest.TestCase):
 
     def setUp(self):
-        xvfb = Xvfb()
+        xvfb = Xvfb(set_xdg_session_type=True)
         xvfb.start()
         self.driver = webdriver.Chrome()
         self.addCleanup(xvfb.stop)
@@ -251,26 +253,11 @@ if __name__ == "__main__":
 
 ----
 
-## xvfbwrapper Issues
-
-To report a bug or request a new feature, please open an issue on [GitHub][github-issues].
-
-----
-
-## xvfbwrapper Development
+## Development
 
-1. Fork the project repo on [GitHub][github-repo]
+- Git: [github.com/cgoldberg/xvfbwrapper.git][github-repo]
 
-2. Clone the repo:
-
-    ```
-    git clone https://github.com/<USERNAME>/xvfbwrapper.git
-    cd xvfbwrapper
-    ```
-
-3. Make changes and run the tests:
-
-    Create a virtual env and install required testing packages:
+- Create a virtual env and install required testing packages:
 
     ```
     python -m venv venv
@@ -278,27 +265,21 @@ To report a bug or request a new feature, please open an issue on [GitHub][githu
     pip install --editable --group dev --group test .
     ```
 
-    Run all tests in the default Python environment:
+- Run all tests in the default Python environment:
 
     ```
     pytest
     ```
 
-    Run all tests, linting, and type checking across all supported/installed
-    Python environments:
+- Run all tests, linting, and type checking across all supported/installed
+  Python environments:
 
     ```
     tox
     ```
 
-4. Commit and push your changes
-
-5. Submit a [Pull Request][github-prs]
-
-
 [github-profile]: https://github.com/cgoldberg
 [github-repo]: https://github.com/cgoldberg/xvfbwrapper
-[github-issues]: https://github.com/cgoldberg/xvfbwrapper/issues
-[github-prs]: https://github.com/cgoldberg/xvfbwrapper/pulls
 [pypi-home]: https://pypi.org/project/xvfbwrapper
 [mit-license]: https://raw.githubusercontent.com/cgoldberg/xvfbwrapper/refs/heads/master/LICENSE
+[api-docs]: https://coreygoldberg.com/xvfbwrapper

{xvfbwrapper-0.2.23 → xvfbwrapper-0.2.25}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "xvfbwrapper"
-version = "0.2.23"
+version = "0.2.25"
 description = "Manage headless displays with Xvfb (X virtual framebuffer)"
 license = "MIT"
 license-files = ["LICENSE"]
@@ -41,17 +41,15 @@ dev = [
     "tox",
 ]
 lint = [
-    "black",
-    "refurb",
     "ruff",
 ]
 test = [
     "psutil",
     "pytest",
-    "pytest-cov",
 ]
 type = [
     "mypy",
+    "types-psutil",
 ]
 validate = [
     "packaging",
@@ -62,14 +60,8 @@ validate = [
 [tool.setuptools]
 py-modules = ["xvfbwrapper"]
 
-[tool.pytest.ini_options]
-addopts = "-vv" # extra verbose
-
-[tool.black]
-line-length = 88
-target-version = [
-    "py310", "py311", "py312", "py313", "py314"
-]
+[tool.pytest]
+addopts = ["-v"]
 
 [tool.ruff]
 line-length = 88
@@ -77,18 +69,14 @@ respect-gitignore = true
 target-version = "py310"
 
 [tool.ruff.lint]
-fixable = ["ALL"]
-select = [
-    "D", "E", "F", "I", "N", "FURB", "RUF", "TID", "UP", "W"
-]
+select = ["ALL"]
 extend-ignore = [
-    "D100", "D101", "D102", "D103", "D105", "D107", "D203", "D213"
+    "ANN", "COM812", "D", "EM101", "EM102", "FBT", "PERF203",
+    "PLR", "PT", "PYI034", "SLF001", "S101", "S108", "S311",
+    "S603", "TRY003", "TRY400"
 ]
+fixable = ["ALL"]
 
 [tool.ruff.format]
 docstring-code-format = true
 docstring-code-line-length = 88
-
-[tool.refurb]
-python_version = "3.10"
-enable_all = true

{xvfbwrapper-0.2.23 → xvfbwrapper-0.2.25}/test_xvfb.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
-
+# Copyright (c) 2012-2026 Corey Goldberg
+# SPDX-License-Identifier: MIT
 
 """Tests for xvfbwrapper."""
 
@@ -7,6 +8,7 @@ import os
 import sys
 import tempfile
 import unittest
+from contextlib import suppress
 from unittest.mock import patch
 
 import psutil
@@ -52,10 +54,8 @@ class XvfbCleanTestCase(unittest.TestCase):
                 continue
         _, alive = psutil.wait_procs(procs, timeout=3)
         for proc in alive:
-            try:
+            with suppress(psutil.NoSuchProcess, psutil.AccessDenied):
                 proc.kill()
-            except (psutil.NoSuchProcess, psutil.AccessDenied):
-                pass
 
     # ---------- Class-level ----------
 
@@ -375,11 +375,13 @@ class TestXvfb(XvfbCleanTestCase):
             "bar",
         ]
         # Force the display socket to never appear
-        with patch.object(xvfb, "_local_display_exists", return_value=False):
-            with self.assertRaisesRegex(
+        with (
+            patch.object(xvfb, "_local_display_exists", return_value=False),
+            self.assertRaisesRegex(
                 RuntimeError, f"Xvfb display did not open: {expected_cmd_args}"
-            ):
-                xvfb.start()
+            ),
+        ):
+            xvfb.start()
         # After failure, calling stop() again must not raise an exception
         xvfb.stop()
         # We never injected DISPLAY into our custom env

{xvfbwrapper-0.2.23 → xvfbwrapper-0.2.25}/tox.ini

@@ -6,8 +6,6 @@
 #     "tox -e <env>" (i.e.: "tox -e py314" or "tox -e lint")
 #
 # This tox configuration will skip any Python interpreters that can't be found.
-# To manage multiple Python interpreters for covering all versions, you can use
-# pyenv: https://github.com/pyenv/pyenv
 
 
 [tox]
@@ -16,6 +14,9 @@ envlist =
     lint
     type
     py310
+    py311
+    py312
+    py313
     py314
     pypy3
 skip_missing_interpreters = true
@@ -27,7 +28,7 @@ platform = linux|darwin|.*bsd.*
 dependency_groups =
     test
 commands =
-    pytest --cov=xvfbwrapper {posargs:.}
+    pytest {posargs:.}
 
 
 [testenv:validate]
@@ -47,13 +48,8 @@ dependency_groups =
     lint
 skip_install = true
 commands =
-    # crazy workaround so black doesn't print red messages to console on success
-    {envpython} -c "import subprocess as s; import sys; "\
-    "r = s.run(['black', '.'], capture_output=True, text=True, encoding='utf-8'); "\
-    "sys.stdout.write(r.stderr) if not r.returncode else sys.stderr.write(r.stderr)"
     ruff check --fix --show-fixes --exit-non-zero-on-fix .
     ruff format --exit-non-zero-on-format .
-    refurb xvfbwrapper.py test_xvfb.py
 
 
 [testenv:type]

{xvfbwrapper-0.2.23 → xvfbwrapper-0.2.25/xvfbwrapper.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xvfbwrapper
-Version: 0.2.23
+Version: 0.2.25
 Summary: Manage headless displays with Xvfb (X virtual framebuffer)
 Author: Corey Goldberg
 Maintainer: Corey Goldberg
@@ -44,6 +44,11 @@ Dynamic: license-file
 - Releases: [PyPI][pypi-home]
 - License: [MIT][mit-license]
 
+The package provides the `xvfvwrapper.Xvfb` class that is used to interact with
+an Xvfb server.
+
+See the [module API documentation][api-docs] for more information.
+
 ----
 
 ## Status
@@ -253,14 +258,11 @@ import unittest
 from selenium import webdriver
 from xvfbwrapper import Xvfb
 
-# force X11 in case we are running on a Wayland system
-os.environ["XDG_SESSION_TYPE"] = "x11"
-
 
 class TestPage(unittest.TestCase):
 
     def setUp(self):
-        xvfb = Xvfb()
+        xvfb = Xvfb(set_xdg_session_type=True)
         xvfb.start()
         self.driver = webdriver.Chrome()
         self.addCleanup(xvfb.stop)
@@ -282,26 +284,11 @@ if __name__ == "__main__":
 
 ----
 
-## xvfbwrapper Issues
-
-To report a bug or request a new feature, please open an issue on [GitHub][github-issues].
-
-----
-
-## xvfbwrapper Development
+## Development
 
-1. Fork the project repo on [GitHub][github-repo]
+- Git: [github.com/cgoldberg/xvfbwrapper.git][github-repo]
 
-2. Clone the repo:
-
-    ```
-    git clone https://github.com/<USERNAME>/xvfbwrapper.git
-    cd xvfbwrapper
-    ```
-
-3. Make changes and run the tests:
-
-    Create a virtual env and install required testing packages:
+- Create a virtual env and install required testing packages:
 
     ```
     python -m venv venv
@@ -309,27 +296,21 @@ To report a bug or request a new feature, please open an issue on [GitHub][githu
     pip install --editable --group dev --group test .
     ```
 
-    Run all tests in the default Python environment:
+- Run all tests in the default Python environment:
 
     ```
     pytest
     ```
 
-    Run all tests, linting, and type checking across all supported/installed
-    Python environments:
+- Run all tests, linting, and type checking across all supported/installed
+  Python environments:
 
     ```
     tox
     ```
 
-4. Commit and push your changes
-
-5. Submit a [Pull Request][github-prs]
-
-
 [github-profile]: https://github.com/cgoldberg
 [github-repo]: https://github.com/cgoldberg/xvfbwrapper
-[github-issues]: https://github.com/cgoldberg/xvfbwrapper/issues
-[github-prs]: https://github.com/cgoldberg/xvfbwrapper/pulls
 [pypi-home]: https://pypi.org/project/xvfbwrapper
 [mit-license]: https://raw.githubusercontent.com/cgoldberg/xvfbwrapper/refs/heads/master/LICENSE
+[api-docs]: https://coreygoldberg.com/xvfbwrapper

{xvfbwrapper-0.2.23 → xvfbwrapper-0.2.25}/xvfbwrapper.py

@@ -1,5 +1,6 @@
-# Corey Goldberg, 2012-2026
-# License: MIT
+# Copyright (c) 2012-2026 Corey Goldberg
+# SPDX-License-Identifier: MIT
+
 
 """Run a headless display inside X virtual framebuffer (Xvfb)."""
 
@@ -16,9 +17,9 @@ from random import randint
 
 try:
     import fcntl
-except ImportError:
+except ImportError as e:
     system = platform.system()
-    raise OSError(f"xvfbwrapper is not supported on this platform: {system}")
+    raise OSError(f"xvfbwrapper is not supported on this platform: {system}") from e
 
 
 class Xvfb:
@@ -60,7 +61,7 @@ class Xvfb:
         if not extra_args:
             extra_args = []
 
-        self.extra_xvfb_args = [
+        self.extra_xvfb_args: list[str] = [
             "-screen",
             "0",
             f"{self.width}x{self.height}x{self.colordepth}",
@@ -134,7 +135,7 @@ class Xvfb:
 
     def _xvfb_exists(self) -> bool:
         """Check that Xvfb is available on PATH and is executable."""
-        return True if shutil.which("Xvfb") is not None else False
+        return shutil.which("Xvfb") is not None
 
     def _cleanup_lock_file(self):
         """Delete lock files when stopping.