uritools 6.1.2__tar.gz → 6.1.3__tar.gz

{uritools-6.1.2 → uritools-6.1.3}/CHANGELOG.rst

@@ -1,3 +1,11 @@
+v6.1.3 (2026-07-24)
+===================
+
+- Minor style improvements to keep ``ruff`` happy.
+
+- Update build environment.
+
+
 v6.1.2 (2026-05-22)
 ===================
 

{uritools-6.1.2/src/uritools.egg-info → uritools-6.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uritools
-Version: 6.1.2
+Version: 6.1.3
 Summary: URI parsing, classification and composition
 Author-email: Thomas Kemmer <tkemmer@computer.org>
 Maintainer-email: Thomas Kemmer <tkemmer@computer.org>

uritools-6.1.3/docs/conf.py

@@ -0,0 +1,18 @@
+import importlib.metadata
+
+project = "uritools"
+copyright = "2014-2026 Thomas Kemmer"
+release = importlib.metadata.version(project)
+version = ".".join(release.split(".")[:2])
+
+extensions = [
+    "sphinx.ext.autodoc",
+    "sphinx.ext.coverage",
+    "sphinx.ext.doctest",
+    "sphinx.ext.intersphinx",
+    "sphinx.ext.todo",
+]
+exclude_patterns = ["_build"]
+master_doc = "index"
+html_theme = "classic"
+intersphinx_mapping = {"python": ("https://docs.python.org/3", None)}

{uritools-6.1.2 → uritools-6.1.3}/pyproject.toml

@@ -51,3 +51,6 @@ version = {attr = "uritools.__version__"}
 typeCheckingMode = "standard"
 reportAttributeAccessIssue = "information"
 reportOptionalMemberAccess = "warning"
+
+[tool.ruff.lint]
+ignore = ["DTZ005", "SIM102", "UP031"]

{uritools-6.1.2 → uritools-6.1.3}/src/uritools/__init__.py

@@ -33,7 +33,7 @@ __all__ = (
     "uriunsplit",
 )
 
-__version__ = "6.1.2"
+__version__ = "6.1.3"
 
 
 # RFC 3986 2.2.  Reserved Characters

{uritools-6.1.2 → uritools-6.1.3}/src/uritools/__init__.pyi

@@ -1,7 +1,6 @@
 import ipaddress
 from collections.abc import Iterable, Mapping, Sequence
-from typing import Any, AnyStr, Generic, NamedTuple, overload
-from typing_extensions import TypeAlias
+from typing import Any, AnyStr, Generic, NamedTuple, TypeAlias, overload
 
 __all__ = [
     "GEN_DELIMS",

{uritools-6.1.2 → uritools-6.1.3/src/uritools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uritools
-Version: 6.1.2
+Version: 6.1.3
 Summary: URI parsing, classification and composition
 Author-email: Thomas Kemmer <tkemmer@computer.org>
 Maintainer-email: Thomas Kemmer <tkemmer@computer.org>

{uritools-6.1.2 → uritools-6.1.3}/tests/test_compose.py

@@ -212,13 +212,13 @@ class ComposeTest(unittest.TestCase):
             ("?name=foo&type=bar", od([("name", "foo"), ("type", "bar")])),
             ("?name=foo&name=bar", [("name", "foo"), ("name", "bar")]),
             ("?name=foo&name=bar", {"name": ["foo", "bar"]}),
-            ("?name=a/b/c", dict(name="a/b/c")),
-            ("?name=a:b:c", dict(name="a:b:c")),
-            ("?name=a?b?c", dict(name="a?b?c")),
-            ("?name=a@b@c", dict(name="a@b@c")),
-            ("?name=a;b;c", dict(name="a;b;c")),
-            ("?name=a%23b%23c", dict(name="a#b#c")),
-            ("?name=a%26b%26c", dict(name="a&b&c")),
+            ("?name=a/b/c", {"name": "a/b/c"}),
+            ("?name=a:b:c", {"name": "a:b:c"}),
+            ("?name=a?b?c", {"name": "a?b?c"}),
+            ("?name=a@b@c", {"name": "a@b@c"}),
+            ("?name=a;b;c", {"name": "a;b;c"}),
+            ("?name=a%23b%23c", {"name": "a#b#c"}),
+            ("?name=a%26b%26c", {"name": "a&b&c"}),
         ]
         for uri, query in cases:
             self.check(uri, query=query)

{uritools-6.1.2 → uritools-6.1.3}/tests/test_defrag.py

@@ -23,7 +23,7 @@ class DefragTest(unittest.TestCase):
         def encode(s):
             return s.encode() if s is not None else None
 
-        cases += list(map(encode, case) for case in cases)
+        cases += [map(encode, case) for case in cases]
 
         for uri, base, fragment in cases:
             defrag = uridefrag(uri)

{uritools-6.1.2 → uritools-6.1.3}/tests/test_encoding.py

@@ -8,7 +8,7 @@ class EncodingTest(unittest.TestCase):
         self.assertEqual(uriencode(decoded, safe, encoding), encoded)
         self.assertEqual(uridecode(encoded, encoding), decoded)
         # swap bytes/string types
-        self.assertEqual(uriencode(decoded.encode(encoding), safe, encoding), encoded)  # noqa
+        self.assertEqual(uriencode(decoded.encode(encoding), safe, encoding), encoded)
         self.assertEqual(uridecode(encoded.decode("ascii"), encoding), decoded)
 
     def test_encoding(self):

{uritools-6.1.2 → uritools-6.1.3}/tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py,docs,doctest,ruff,ruff-format,pyright
+envlist = py,docs,doctest,pyright,ruff,ruff-format
 
 [testenv]
 deps =
@@ -20,23 +20,20 @@ deps =
 commands =
      sphinx-build -W -b doctest -d {envtmpdir}/doctrees docs {envtmpdir}/doctest
 
+[testenv:pyright]
+deps =
+    pyright
+commands =
+    pyright {posargs}
+
 [testenv:ruff]
 deps =
     ruff
 commands =
     ruff check {posargs}
-skip_install = true
 
 [testenv:ruff-format]
 deps =
     ruff
 commands =
     ruff format --diff -q {posargs}
-skip_install = true
-
-[testenv:pyright]
-deps =
-    pyright
-commands =
-    pyright {posargs}
-skip_install = true

uritools-6.1.2/docs/conf.py

@@ -1,36 +0,0 @@
-import pathlib
-import sys
-
-src_directory = (pathlib.Path(__file__).parent.parent / "src").resolve()
-sys.path.insert(0, str(src_directory))
-
-
-# Extract the current version from the source.
-def get_version():
-    """Get the version and release from the source code."""
-
-    text = (src_directory / "uritools/__init__.py").read_text()
-    for line in text.splitlines():
-        if not line.strip().startswith("__version__"):
-            continue
-        full_version = line.partition("=")[2].strip().strip("\"'")
-        partial_version = ".".join(full_version.split(".")[:2])
-        return full_version, partial_version
-    return (None, None)
-
-
-project = "uritools"
-copyright = "2014-2026 Thomas Kemmer"
-release, version = get_version()
-
-extensions = [
-    "sphinx.ext.autodoc",
-    "sphinx.ext.coverage",
-    "sphinx.ext.doctest",
-    "sphinx.ext.intersphinx",
-    "sphinx.ext.todo",
-]
-exclude_patterns = ["_build"]
-master_doc = "index"
-html_theme = "classic"
-intersphinx_mapping = {"python": ("https://docs.python.org/3", None)}