Merge branch 'main' into python-typings

Author: bangseongbeom

.github/workflows/CI.yml

@@ -1,4 +1,4 @@
-# This file is autogenerated by maturin v1.10.2
+# This file is autogenerated by maturin v1.11.5
 # To update, run
 #
 #    maturin generate-ci --pytest github
@@ -37,8 +37,8 @@ jobs:
           - runner: ubuntu-22.04
             target: ppc64le
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.x
       - name: Build wheels
@@ -49,7 +49,7 @@ jobs:
           sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
           manylinux: auto
       - name: Upload wheels
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: wheels-linux-${{ matrix.platform.target }}
           path: dist
@@ -93,8 +93,8 @@ jobs:
           - runner: ubuntu-22.04
             target: armv7
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.x
       - name: Build wheels
@@ -105,7 +105,7 @@ jobs:
           sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
           manylinux: musllinux_1_2
       - name: Upload wheels
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: wheels-musllinux-${{ matrix.platform.target }}
           path: dist
@@ -147,27 +147,31 @@ jobs:
         platform:
           - runner: windows-latest
             target: x64
+            python_arch: x64
           - runner: windows-latest
             target: x86
+            python_arch: x86
+          - runner: windows-11-arm
+            target: aarch64
+            python_arch: arm64
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
         with:
-          python-version: 3.x
-          architecture: ${{ matrix.platform.target }}
+          python-version: 3.13
+          architecture: ${{ matrix.platform.python_arch }}
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
           args: --release --out dist --find-interpreter
           sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
       - name: Upload wheels
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: wheels-windows-${{ matrix.platform.target }}
           path: dist
       - name: pytest
-        if: ${{ !startsWith(matrix.platform.target, 'aarch64') }}
         shell: bash
         run: |
           set -e
@@ -187,8 +191,8 @@ jobs:
           - runner: macos-latest
             target: aarch64
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.x
       - name: Build wheels
@@ -198,7 +202,7 @@ jobs:
           args: --release --out dist --find-interpreter
           sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
       - name: Upload wheels
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: wheels-macos-${{ matrix.platform.target }}
           path: dist
@@ -214,14 +218,14 @@ jobs:
   sdist:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Build sdist
         uses: PyO3/maturin-action@v1
         with:
           command: sdist
           args: --out dist
       - name: Upload sdist
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: wheels-sdist
           path: dist
@@ -240,14 +244,14 @@ jobs:
       # Used to generate artifact attestation
       attestations: write
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v6
       - name: Generate artifact attestation
-        uses: actions/attest-build-provenance@v2
+        uses: actions/attest-build-provenance@v3
         with:
           subject-path: 'wheels-*/*'
+      - name: Install uv
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        uses: astral-sh/setup-uv@v7
       - name: Publish to PyPI
         if: ${{ startsWith(github.ref, 'refs/tags/') }}
-        uses: PyO3/maturin-action@v1
-        with:
-          command: upload
-          args: --non-interactive --skip-existing wheels-*/*
+        run: uv publish 'wheels-*/*'

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "python-urlpattern"
-version = "0.1.6"
+version = "0.1.7"
 authors = ["방성범 (Bang Seongbeom) <bangseongbeom@gmail.com>"]
 edition = "2024"
 description = "An implementation of the URL Pattern Standard for Python written in Rust."
@@ -15,4 +15,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 pyo3 = "0.27.2"
-deno_urlpattern = { package = "urlpattern", version = "0.4.2" }
+deno_urlpattern = { package = "urlpattern", version = "0.5.2" }

Cargo.toml

@@ -13,6 +13,8 @@ The URL Pattern Standard is a web standard for URL pattern matching. It is usefu
 
 It's a thin wrapper of [denoland/rust-urlpattern](https://github.com/denoland/rust-urlpattern) with [PyO3](https://github.com/PyO3/pyo3) + [Maturin](https://github.com/PyO3/maturin).
 
+The naming conventions follow [the standard](https://urlpattern.spec.whatwg.org/) as closely as possible, similar to [xml.dom](https://docs.python.org/3/library/xml.dom.html).
+
 ## Installation
 
 On Linux/UNIX or macOS:
@@ -55,6 +57,16 @@ result = pattern.exec({"pathname": "/users/4163/"})
 print(result["pathname"]["groups"]["id"])  # output: 4163
 ```
 
+### `baseURL`
+
+```py
+from urlpattern import URLPattern
+
+pattern = URLPattern({"pathname": "/admin/*"}, "https://example.com")
+print(pattern.test({"pathname": "/admin/main/"}, "https://example.com"))  # output: True
+print(pattern.test("/admin/main/", "https://example.com"))  # output: True
+```
+
 ### `ignoreCase`
 
 ```py
@@ -69,7 +81,7 @@ print(pattern.test("https://example.com/test"))  # output: True
 print(pattern.test("https://example.com/TeST"))  # output: True
 ```
 
-### Simple WSGI app
+### A simple WSGI app
 
 ```py
 from wsgiref.simple_server import make_server

README.md

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["maturin>=1.10,<2.0"]
+requires = ["maturin>=1.11,<2.0"]
 build-backend = "maturin"
 
 [project]
@@ -15,14 +15,15 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
-    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: Free Threading",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     "Programming Language :: Rust",
@@ -35,6 +36,3 @@ dynamic = ["version"]
 Homepage = "https://github.com/urlpattern/python-urlpattern"
 Repository = "https://github.com/urlpattern/python-urlpattern.git"
 Issues = "https://github.com/urlpattern/python-urlpattern/issues"
-
-[tool.maturin]
-features = ["pyo3/extension-module"]

pyproject.toml

@@ -353,7 +353,7 @@ impl From<deno_urlpattern::Error> for Error {
 }
 
 /// A Python module implemented in Rust.
-#[pymodule]
+#[pymodule(gil_used = false)]
 mod urlpattern {
     #[pymodule_export]
     use super::UrlPattern;

src/lib.rs

@@ -46,14 +46,17 @@ def test(entry):
 
     if isinstance(entry.get("expected_match"), dict):
         result = pattern.exec(*entry["inputs"])
-        assert result
 
         for key in entry["expected_match"]:
             assert result[key] == entry["expected_match"][key]
 
+    else:
+        result = pattern.exec(*entry["inputs"])
+        assert result is None
+
     if "exactly_empty_components" in entry:
         result = pattern.exec(*entry["inputs"])
 
         for component in entry["exactly_empty_components"]:
             if result:
-                assert result[component]["groups"] == {}
+                assert result[component]["groups"] == {}

tests/test_lib.py

@@ -3108,5 +3108,15 @@
       "hostname": { "input": "www.example.com", "groups": {} },
       "pathname": { "input": "/path/with/x", "groups": { "0": "path/with/x" } }
     }
+  },
+  {
+    "pattern": [{ "hostname": ":domain(.*)" }],
+    "inputs": [{ "hostname": "localhost" }],
+    "expected_obj": {
+      "hostname": ":domain(.*)"
+    },
+    "expected_match": {
+      "hostname": { "input": "localhost", "groups": { "domain" : "localhost"} }
+    }
   }
 ]