Add non-Linux CI jobs. (#240)

Author: wRAR

.github/workflows/build.yml renamed to .github/workflows/checks.yml

@@ -1,4 +1,4 @@
-name: Build
+name: Checks
 
 on:
   push:

.github/workflows/tests-macos.yml

@@ -0,0 +1,35 @@
+name: macOS
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  tests:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Run tests
+      run: |
+        pip install --upgrade pip
+        pip install --upgrade tox
+        tox -e py
+
+    - name: Upload coverage report
+      uses: codecov/codecov-action@v5

.github/workflows/tests.yml renamed to .github/workflows/tests-ubuntu.yml

@@ -1,4 +1,4 @@
-name: Tests
+name: Ubuntu
 
 on:
   push:

.github/workflows/tests-windows.yml

@@ -0,0 +1,35 @@
+name: Windows
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  tests:
+
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Run tests
+      run: |
+        pip install --upgrade pip
+        pip install --upgrade tox
+        tox -e py
+
+    - name: Upload coverage report
+      uses: codecov/codecov-action@v5

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.9.3
+  rev: v0.11.2
   hooks:
     - id: ruff
       args: [ --fix ]

pyproject.toml

@@ -27,12 +27,12 @@ check_untyped_defs = true
 [[tool.mypy.overrides]]
 # All non-tests functions must be typed.
 module = "w3lib.*"
-disallow_untyped_defs = true
+allow_untyped_defs = false
 
 [[tool.mypy.overrides]]
 # Allow test functions to be untyped
 module = "tests.*"
-disallow_untyped_defs = false
+allow_untyped_defs = true
 
 [tool.pylint.MASTER]
 persistent = "no"
@@ -60,6 +60,7 @@ disable = [
     "too-many-positional-arguments",
     "too-many-public-methods",
     "unused-argument",
+    "unused-import",
     "unused-variable",
 ]
 

tests/test_url.py

@@ -1070,7 +1070,7 @@ def test_url_query_cleaner_keep_fragments(self):
     def test_path_to_file_uri(self):
         if os.name == "nt":
             assert (
-                path_to_file_uri(r"C:\\windows\clock.avi")
+                path_to_file_uri(r"C:\windows\clock.avi")
                 == "file:///C:/windows/clock.avi"
             )
         else:
@@ -1079,13 +1079,13 @@ def test_path_to_file_uri(self):
         fn = "test.txt"
         x = path_to_file_uri(fn)
         assert x.startswith("file:///")
-        assert file_uri_to_path(x).lower() == str(Path(fn).resolve()).lower()
+        assert file_uri_to_path(x).lower() == str(Path(fn).absolute()).lower()
 
     def test_file_uri_to_path(self):
         if os.name == "nt":
             assert (
                 file_uri_to_path("file:///C:/windows/clock.avi")
-                == r"C:\\windows\clock.avi"
+                == r"C:\windows\clock.avi"
             )
             uri = "file:///C:/windows/clock.avi"
             uri2 = path_to_file_uri(file_uri_to_path(uri))
@@ -1101,9 +1101,7 @@ def test_file_uri_to_path(self):
 
     def test_any_to_uri(self):
         if os.name == "nt":
-            assert (
-                any_to_uri(r"C:\\windows\clock.avi") == "file:///C:/windows/clock.avi"
-            )
+            assert any_to_uri(r"C:\windows\clock.avi") == "file:///C:/windows/clock.avi"
         else:
             assert any_to_uri("/some/path.txt") == "file:///some/path.txt"
         assert any_to_uri("file:///some/path.txt") == "file:///some/path.txt"

tox.ini

@@ -20,16 +20,15 @@ commands =
 [testenv:typing]
 basepython = python3
 deps =
-    # mypy would error if pytest (or its stub) not found
     pytest
-    mypy==1.14.1
+    mypy==1.15.0
 commands =
     mypy --strict {posargs: w3lib tests}
 
 [testenv:pylint]
 deps =
     {[testenv]deps}
-    pylint==3.3.3
+    pylint==3.3.6
 commands =
     pylint conftest.py docs setup.py tests w3lib
 

w3lib/encoding.py

@@ -8,10 +8,12 @@
 import encodings
 import re
 from re import Match
-from typing import Callable, cast
+from typing import TYPE_CHECKING, Callable, cast
 
 import w3lib.util
-from w3lib._types import AnyUnicodeError
+
+if TYPE_CHECKING:
+    from w3lib._types import AnyUnicodeError
 
 _HEADER_ENCODING_RE = re.compile(r"charset=([\w-]+)", re.IGNORECASE)
 
@@ -136,7 +138,7 @@ def _c18n_encoding(encoding: str) -> str:
     encoding aliases
     """
     normed = encodings.normalize_encoding(encoding).lower()
-    return cast(str, encodings.aliases.aliases.get(normed, normed))
+    return cast("str", encodings.aliases.aliases.get(normed, normed))
 
 
 def resolve_encoding(encoding_alias: str) -> str | None:
@@ -201,7 +203,7 @@ def read_bom(data: bytes) -> tuple[None, None] | tuple[str, bytes]:
 # Python decoder doesn't follow unicode standard when handling
 # bad utf-8 encoded strings. see http://bugs.python.org/issue8271
 codecs.register_error(
-    "w3lib_replace", lambda exc: ("\ufffd", cast(AnyUnicodeError, exc).end)
+    "w3lib_replace", lambda exc: ("\ufffd", cast("AnyUnicodeError", exc).end)
 )
 
 
@@ -283,7 +285,7 @@ def html_to_unicode(
     '''
     bom_enc, bom = read_bom(html_body_str)
     if bom_enc is not None:
-        bom = cast(bytes, bom)
+        bom = cast("bytes", bom)
         return bom_enc, to_unicode(html_body_str[len(bom) :], bom_enc)
 
     enc = http_content_type_encoding(content_type_header)

w3lib/url.py

@@ -31,17 +31,18 @@
 from urllib.request import pathname2url, url2pathname
 
 from ._infra import _ASCII_TAB_OR_NEWLINE, _C0_CONTROL_OR_SPACE
-from ._types import AnyUnicodeError
 from ._url import _SPECIAL_SCHEMES
 from .util import to_unicode
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
 
+    from ._types import AnyUnicodeError
+
 
 # error handling function for bytes-to-Unicode decoding errors with URLs
 def _quote_byte(error: UnicodeError) -> tuple[str, int]:
-    error = cast(AnyUnicodeError, error)
+    error = cast("AnyUnicodeError", error)
     return (to_unicode(quote(error.object[error.start : error.end])), error.end)
 
 
@@ -320,8 +321,8 @@ def url_query_cleaner(
     if isinstance(parameterlist, (str, bytes)):
         parameterlist = [parameterlist]
     url, fragment = urldefrag(url)
-    url = cast(str, url)
-    fragment = cast(str, fragment)
+    url = cast("str", url)
+    fragment = cast("str", fragment)
     base, _, query = url.partition("?")
     seen = set()
     querylist = []
@@ -400,7 +401,7 @@ def path_to_file_uri(path: str | os.PathLike[str]) -> str:
     """Convert local filesystem path to legal File URIs as described in:
     http://en.wikipedia.org/wiki/File_URI_scheme
     """
-    x = pathname2url(str(Path(path).resolve()))
+    x = pathname2url(str(Path(path).absolute()))
     return f"file:///{x.lstrip('/')}"
 
 
@@ -697,7 +698,7 @@ def parse_qsl_to_bytes(
     # (at https://hg.python.org/cpython/rev/c38ac7ab8d9a)
     # except for the unquote(s, encoding, errors) calls replaced
     # with unquote_to_bytes(s)
-    coerce_args = cast(Callable[..., tuple[str, Callable[..., bytes]]], _coerce_args)
+    coerce_args = cast("Callable[..., tuple[str, Callable[..., bytes]]]", _coerce_args)
     qs, _coerce_result = coerce_args(qs)
     pairs = [s2 for s1 in qs.split("&") for s2 in s1.split(";")]
     r = []