setup-selenium-testing 0.1.3__tar.gz → 0.1.6__tar.gz

{setup_selenium_testing-0.1.3 → setup_selenium_testing-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: setup-selenium-testing
-Version: 0.1.3
+Version: 0.1.6
 Summary: Setup Selenium for automation testing
 Home-page: https://github.com/bandophahita/setup_selenium
 License: MIT
@@ -21,10 +21,9 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Provides-Extra: dev
 Provides-Extra: test
 Requires-Dist: black ; extra == "dev"
-Requires-Dist: isort ; extra == "dev"
 Requires-Dist: mypy ; extra == "dev"
 Requires-Dist: pytest ; extra == "dev" or extra == "test"
-Requires-Dist: ruff ; extra == "dev"
+Requires-Dist: ruff (>=0.2.0) ; extra == "dev"
 Requires-Dist: selenium (>=4.7.0)
 Requires-Dist: semantic-version
 Requires-Dist: tox ; extra == "dev" or extra == "test"

{setup_selenium_testing-0.1.3 → setup_selenium_testing-0.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "setup-selenium-testing"
-version = "0.1.3"
+version = "0.1.6"
 description = "Setup Selenium for automation testing"
 authors = ["Marcel Wilson <trenchrats@gmail.com>"]
 license = "MIT"
@@ -31,9 +31,8 @@ typing-extensions = "*"
 pytest = {version="*", optional = true}
 black = {version="*", optional = true}
 mypy = {version="*", optional = true}
-ruff = {version="*", optional = true}
+ruff = {version = ">=0.2.0", optional = true}
 tox = {version="*", optional = true}
-isort = {version = "*", optional = true}
 
 [tool.poetry.extras]
 dev = [
@@ -41,7 +40,6 @@ dev = [
     "black",
     "mypy",
     "ruff",
-    "isort",
     "tox",
 ]
 test = [
@@ -50,15 +48,6 @@ test = [
 ]
 
 
-[tool.isort]
-line_length = 88
-multi_line_output = 3
-include_trailing_comma = "True"
-use_parentheses = "True"
-combine_as_imports = "True"
-skip = [".idea", ".tox"]
-
-
 [build-system]
 requires = ["poetry-core>=1.2.0"]
 build-backend = "poetry.core.masonry.api"
@@ -77,9 +66,36 @@ build-backend = "poetry.core.masonry.api"
 
 
 [tool.ruff]
-# Enable the pycodestyle (`E`) and Pyflakes (`F`) rules by default.
-# Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or
-# McCabe complexity (`C901`) by default.
+target-version = "py38"
+line-length = 88
+extend-exclude = [
+    ".github",
+    ".pytest_cache",
+    ".venv",
+    "venv",
+    "dockerfiles",
+    "docs",
+    ".coverage",
+    ".coveragerc",
+    ".env",
+    ".env.example",
+    ".flake8",
+    ".gitignore",
+    "alembic.ini",
+    "bandit.yaml",
+    "docker-compose-dev.yaml",
+    "docker-compose-pro.yaml",
+    "Makefile",
+    "mkdocks.yml",
+    "mypy.ini",
+    "poetry.lock",
+    "pyproject.toml",
+    "pytest.ini",
+    "README.md",
+    ".idea",
+]
+
+[tool.ruff.lint]
 select = [
     "A",  # flake8-builtins
     "ANN",  # flake8-annotations  # coming back to this one later to compare against mypy
@@ -163,43 +179,9 @@ ignore = [
     "UP038", # Use `X | Y` in `isinstance` call instead of `(X, Y)`
 ]
 
-# Same as Black.
-line-length = 88
-target-version = "py310"
-
-exclude = [
-    ".github",
-    ".pytest_cache",
-    ".venv",
-    "venv",
-    "dockerfiles",
-    "docs",
-    ".coverage",
-    ".coveragerc",
-    ".env",
-    ".env.example",
-    ".flake8",
-    ".gitignore",
-    "alembic.ini",
-    "bandit.yaml",
-    "docker-compose-dev.yaml",
-    "docker-compose-pro.yaml",
-    "Makefile",
-    "mkdocks.yml",
-    "mypy.ini",
-    "poetry.lock",
-    "pyproject.toml",
-    "pytest.ini",
-    "README.md",
-    ".idea",
-]
-
-[tool.ruff.lint]
 extend-safe-fixes = [
-    "EM101",
-    "EM102",
+    "EM101", "EM102",
     "TCH001", "TCH002", "TCH003", "TCH004",
-    #    "SIM108"
     "C419",
     "D200", "D205",
     "PT003", "PT006", "PT018",
@@ -207,28 +189,24 @@ extend-safe-fixes = [
     "UP007",
 ]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.flake8-pytest-style]
+mark-parentheses = false
+
+[tool.ruff.lint.pycodestyle]
+ignore-overlong-task-comments = true
+
+[tool.ruff.lint.isort]
+combine-as-imports = true
+split-on-trailing-comma = false
+
+[tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401"]
 "tests/**" = [
     "D",  # we don't need public-API-polished docstrings in tests.
     "FBT",  # using a boolean as a test object is useful!
     "PLR",  # likewise using specific numbers and strings in tests.
 ]
-
-[tool.ruff.isort]
-combine-as-imports = true
-split-on-trailing-comma = true
-
-
-[tool.ruff.flake8-pytest-style]
-mark-parentheses = false
-
-
-[tool.ruff.pycodestyle]
-ignore-overlong-task-comments = true
-
-
-[tool.ruff.flake8-annotations]
+[tool.ruff.lint.flake8-annotations]
 # ignore returns types for functions that implicity or explicitly only return None
 suppress-none-returning = true
 allow-star-arg-any = true

setup_selenium_testing-0.1.6/setup_selenium/__init__.py

@@ -0,0 +1 @@
+from .setup_selenium import Browser, SetupSelenium, set_logger

setup_selenium_testing-0.1.3/setup_selenium/selenium_module.py → setup_selenium_testing-0.1.6/setup_selenium/setup_selenium.py

@@ -8,7 +8,7 @@ import os as os
 from enum import Enum
 from typing import TYPE_CHECKING, Optional, Union
 
-from selenium import webdriver
+from selenium import __version__, webdriver
 from selenium.common.exceptions import NoSuchWindowException, WebDriverException
 from selenium.webdriver.chrome.service import Service as ChromeService
 from selenium.webdriver.common.selenium_manager import SeleniumManager
@@ -28,6 +28,11 @@ if TYPE_CHECKING:
         webdriver.FirefoxOptions, webdriver.ChromeOptions, webdriver.EdgeOptions
     ]
 
+NEW_SELENIUM = False
+if Version(__version__) >= Version("4.20.0"):
+    NEW_SELENIUM = True
+
+
 __all__ = ["SetupSelenium"]
 
 
@@ -171,7 +176,11 @@ class SetupSelenium:
         driver_version = driver_version or None
 
         sm = SeleniumManager()
-        args = [f"{sm.get_binary()}", "--browser", browser]
+
+        if NEW_SELENIUM:
+            args = [f"{sm._get_binary()}", "--browser", browser]
+        else:
+            args = [f"{sm.get_binary()}", "--browser", browser]  # type: ignore[attr-defined]
 
         if browser_version:
             args.append("--browser-version")
@@ -187,7 +196,12 @@ class SetupSelenium:
             args.append("--browser-path")
             args.append(browser_path)
 
-        output = sm.run(args)
+        if NEW_SELENIUM:
+            args.append("--output")
+            args.append("json")
+            output = sm._run(args)
+        else:
+            output = sm.run(args)  # type: ignore[attr-defined]
         driver_path = output["driver_path"]
         browser_path = output["browser_path"]
 
@@ -288,10 +302,14 @@ class SetupSelenium:
         # log file. if we enable root logging, we can capture the logging from
         # geckodriver, ourselves.
         logpath = os.path.devnull
-        options.log.level = "fatal"  # type: ignore[assignment]
         if enable_log_driver:
             lp = os.path.abspath(os.path.expanduser(log_dir))
             logpath = os.path.join(lp, "geckodriver.log")
+            if not options.log.level:
+                options.log.level = "trace"  # type: ignore[assignment]
+
+        if not options.log.level:
+            options.log.level = "fatal"  # type: ignore[assignment]
 
         if driver_path:
             service = FirefoxService(

setup_selenium_testing-0.1.3/setup_selenium/__init__.py

@@ -1 +0,0 @@
-from .selenium_module import Browser, SetupSelenium, set_logger