2.0.6 (2025-05-17)

------------------
**Changed:** dependency

Author: vladimirs-git

CHANGELOG.rst

@@ -13,7 +13,7 @@ Unreleased
 **New:** `FortiGateAPI.monitor` connectors, to work with all `Monitor API` endpoints.
 
 
-2.0.5 (2025-05-17)
+2.0.6 (2025-05-17)
 ------------------
 
 **Changed:** `FortiGateBase.get_session()`, private to public

README.rst

@@ -24,7 +24,7 @@ Fully documented on `Read the Docs`_.
 Requirements
 ============
 
-Python >=3.8,<=3.13
+Python >=3.8
 
 
 Quickstart

docs/conf.py

@@ -8,7 +8,7 @@
 project = "fortigate-api"
 copyright = "2021, Vladimirs Prusakovs"
 author = "Vladimirs Prusakovs"
-release = "2.0.5"
+release = "2.0.6"
 
 extensions = [
     "sphinx.ext.autodoc",

fortigate_api/connector.py

@@ -92,7 +92,7 @@ def get(self, **kwargs) -> LDAny:
         :return: List of the fortigate-objects.
         :rtype: List[dict]
         """
-        uid = h.quote(vdict.pop(self.uid, kwargs))
+        uid = h.quote(vdict.pop(kwargs, key=self.uid))
         url = f"{self.url}/{uid}".rstrip("/")
         url = h.join_url_params(url=url, **kwargs)
         if self.uid:

fortigate_api/helpers.py

@@ -222,7 +222,7 @@ def pop_lstr(key: str, data: DAny) -> LStr:
     :param data: The dictionary from which the key is to be popped.
     :return: The values as a string. Update `data`, remove `key`.
     """
-    values = vdict.pop(key, data)
+    values = vdict.pop(data, key=key)
     if values is None:
         values = []
     if isinstance(values, str):

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fortigate_api"
-version = "2.0.5"
+version = "2.0.6"
 description = "Python package to configure Fortigate (Fortios) devices using REST API and SSH"
 authors = ["Vladimirs Prusakovs <[email protected]>"]
 readme = "README.rst"
@@ -24,46 +24,49 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
     "Natural Language :: English",
 ]
+
+[tool.poetry.urls]
+homepage = "https://fortigate-api.readthedocs.io"
+repository = "https://github.com/vladimirs-git/fortigate-api"
+"Bug Tracker" = "https://github.com/vladimirs-git/fortigate-api/issues"
+
 [tool.poetry.dependencies]
-python = "^3.9"
+python = "^3.8"
 #
 requests = ">=2.28"
 vhelpers = ">=0.4.0"
 
 [tool.poetry.group.test.dependencies]
-pytest = "^8.3.4"
-
-[tool.poetry.group.dev.dependencies]
 dictdiffer = "^0.9.0"
-jinja2 = "^3.1.2"
-mypy = "^1.14.0"
-pydantic = "^2.5.3"
-pydocstyle = "^6.3.0"
-pygments = "^2.18.0"  # rst-lint
-pylint = "^3.3.3"
-pytest = "^8.3.4"
-pytest-cov = "^6.0.0"
+pytest = "^8.3.5"
 pytest-mock = "^3.14.0"
-readthedocs-sphinx-search = "^0.3.2"
 requests-mock = "^1.12.1"
-restructuredtext-lint = "^1.4.0"
-ruff = "^0.8.4"
-sphinx = "7.1.2"
+
+[tool.poetry.group.docs.dependencies]
+jinja2 = "^3.1.2"
+readthedocs-sphinx-search = "^0.3.2"
+sphinx = "^7.2.6"
 sphinx-rtd-theme = "^1.3.0"
 sphinxcontrib-httpdomain = "^1.8.1"
 sphinxcontrib-openapi = "^0.8.3"
 tabulate = "^0.9.0"
+
+[tool.poetry.group.dev.dependencies]
+poetry = "^2.1.2"
+#
+mypy = "^1.15.0"
+pydantic = "^2.5.3"  # tools
+pydocstyle = "^6.3.0"
+pygments = "^2.19.1"  # rst-lint
+pylint = "^3.3.7"
+pytest = "^8.3.5"
+pytest-cov = "^6.1.1"
+restructuredtext-lint = "^1.4.0"
+ruff = "^0.11.10"
 twine = "^6.0.1"
-types-requests = "^2.32.0.20241016"
+types-requests = "^2.32.0.20250515"
 types-tabulate = "^0.9.0.20241207"
-typing-extensions = "^4.12.2"
-
-[tool.poetry.extras]
-test = ["pytest"]
-
-[tool.poetry.urls]
-"Bug Tracker" = "https://github.com/vladimirs-git/fortigate-api/issues"
-"Download URL" = "https://github.com/vladimirs-git/fortigate-api/archive/refs/tags/2.0.5.tar.gz"
+typing-extensions = "^4.13.2"
 
 [tool.pylint]
 max-line-length = 100
@@ -94,7 +97,7 @@ disable = [
 ]
 
 [tool.mypy]
-python_version = "3.9"
+python_version = "3.11"
 
 [tool.ruff]
 exclude = [
@@ -106,14 +109,14 @@ exclude = [
     ".venv",
     "_notes",
     "dist",
-    "demo",
+    "notes",
     "temp",
     "tmp",
     "venv",
 ]
 line-length = 100
 indent-width = 4
-target-version = "py39"
+target-version = "py311"
 
 [tool.ruff.format]
 quote-style = "double"

tests/test__package.py

@@ -9,15 +9,10 @@
 PYPROJECT_D = vdict.pyproject_d(ROOT)
 
 
-def test__version__tar():
-    """Version in tar.gz."""
-    expected = PYPROJECT_D["tool"]["poetry"]["version"]
-    package = PYPROJECT_D["tool"]["poetry"]["name"].replace("_", "-")
-    regex_tar = fr"{package}.+/(.+?)\.tar\.gz"
-
-    # pyproject.toml
-    text = PYPROJECT_D["tool"]["poetry"]["urls"]["Download URL"]
-    actual = vre.find1(regex_tar, text)
+def test__python_version():
+    """Python version in pyproject.toml."""
+    actual = PYPROJECT_D["tool"]["poetry"]["dependencies"]["python"]
+    expected = "^3.8"
     assert actual == expected
 
 
@@ -32,7 +27,6 @@ def test__version__changelog():
     assert actual == expected, f"version in {path=}"
 
 
-# noinspection PyTypeChecker
 def test__version__docs():
     """Version in docs/config.py."""
     path = Path.joinpath(ROOT, "docs", "conf.py")
@@ -44,6 +38,7 @@ def test__version__docs():
         if isinstance(node, ast.Assign):
             for target in node.targets:
                 if isinstance(target, ast.Name) and target.id == "release":
+                    # noinspection PyTypeChecker
                     actual = ast.literal_eval(node.value)
                     break
 
@@ -57,6 +52,6 @@ def test__last_modified_date():
     text = path.read_text(encoding="utf-8")
     regex = r".+\((\d\d\d\d-\d\d-\d\d)\)$"
     actual = vre.find1(regex, text, re.M)
-    files = vpath.get_files(ROOT, ext=".py")
+    files = vpath.get_files(ROOT, pattern="\.py$")
     expected = vdate.last_modified(files)
     assert actual == expected, "last modified file"