Merge branch 'master' into no-verify-trove-classifiers

pypa · Nov 9, 2024 · 0d4418b · 0d4418b
2 parents 55c79a3 + 58c0982
commit 0d4418b
Show file tree

Hide file tree

Showing 69 changed files with 1,183 additions and 1,507 deletions.
diff --git a/.github/workflows/build-distributions.yml b/.github/workflows/build-distributions.yml
@@ -32,7 +32,7 @@ jobs:
         python-version: ${{ env.DIST_PYTHON_VERSION }}
 
     - name: Install UV
-      run: curl -LsSf https://github.com/astral-sh/uv/releases/latest/download/uv-installer.sh | sh
+      uses: astral-sh/setup-uv@v3
 
     - name: Install Hatch
       if: inputs.version

diff --git a/.github/workflows/build-hatch.yml b/.github/workflows/build-hatch.yml
@@ -45,7 +45,7 @@ jobs:
         python-version: ${{ env.PYTHON_VERSION }}
 
     - name: Install UV
-      run: curl -LsSf https://github.com/astral-sh/uv/releases/latest/download/uv-installer.sh | sh
+      uses: astral-sh/setup-uv@v3
 
     - name: Install tools
       run: uv pip install --system build hatch
@@ -158,7 +158,7 @@ jobs:
         python-version: ${{ env.PYTHON_VERSION }}
 
     - name: Install UV
-      run: curl -LsSf https://github.com/astral-sh/uv/releases/latest/download/uv-installer.sh | sh
+      uses: astral-sh/setup-uv@v3
 
     - name: Install Hatch
       run: |-
@@ -284,7 +284,7 @@ jobs:
         python-version: ${{ env.PYTHON_VERSION }}
 
     - name: Install UV
-      run: curl -LsSf https://github.com/astral-sh/uv/releases/latest/download/uv-installer.sh | sh
+      uses: astral-sh/setup-uv@v3
 
     - name: Install PyOxidizer ${{ env.PYOXIDIZER_VERSION }}
       run: uv pip install --system pyoxidizer==${{ env.PYOXIDIZER_VERSION }}
@@ -370,7 +370,7 @@ jobs:
         python-version: ${{ env.PYTHON_VERSION }}
 
     - name: Install UV
-      run: curl -LsSf https://github.com/astral-sh/uv/releases/latest/download/uv-installer.sh | sh
+      uses: astral-sh/setup-uv@v3
 
     - name: Install PyOxidizer ${{ env.PYOXIDIZER_VERSION }}
       run: uv pip install --system pyoxidizer==${{ env.PYOXIDIZER_VERSION }}

diff --git a/.github/workflows/build-hatchling.yml b/.github/workflows/build-hatchling.yml
@@ -22,7 +22,7 @@ jobs:
         python-version: ${{ env.PYTHON_VERSION }}
 
     - name: Install UV
-      run: curl -LsSf https://github.com/astral-sh/uv/releases/latest/download/uv-installer.sh | sh
+      uses: astral-sh/setup-uv@v3
 
     - name: Install build dependencies
       run: uv pip install --system --upgrade build

diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
@@ -30,7 +30,7 @@ jobs:
         python-version: ${{ env.STABLE_PYTHON_VERSION }}
 
     - name: Install UV
-      run: curl -LsSf https://github.com/astral-sh/uv/releases/latest/download/uv-installer.sh | sh
+      uses: astral-sh/setup-uv@v3
 
     - name: Install hyperfine
       uses: taiki-e/install-action@v2

diff --git a/.github/workflows/docs-dev.yml b/.github/workflows/docs-dev.yml
@@ -33,7 +33,7 @@ jobs:
       run: python scripts/validate_history.py
 
     - name: Install UV
-      run: curl -LsSf https://github.com/astral-sh/uv/releases/latest/download/uv-installer.sh | sh
+      uses: astral-sh/setup-uv@v3
 
     - name: Install ourself
       run: |

diff --git a/.github/workflows/docs-release.yml b/.github/workflows/docs-release.yml
@@ -31,7 +31,7 @@ jobs:
       run: python scripts/validate_history.py
 
     - name: Install UV
-      run: curl -LsSf https://github.com/astral-sh/uv/releases/latest/download/uv-installer.sh | sh
+      uses: astral-sh/setup-uv@v3
 
     - name: Install ourself
       run: |

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
     - uses: actions/checkout@v4
@@ -34,8 +34,8 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
 
-    - name: Install UV
-      run: curl -LsSf https://github.com/astral-sh/uv/releases/latest/download/uv-installer.sh | sh
+    - name: Install uv
+      uses: astral-sh/setup-uv@v3
 
     - name: Install ourself
       run: |
@@ -57,6 +57,7 @@ jobs:
     - name: Upload coverage data
       uses: actions/upload-artifact@v4
       with:
+        include-hidden-files: true
         name: coverage-${{ matrix.os }}-${{ matrix.python-version }}
         path: .coverage*
 
@@ -114,7 +115,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
     - uses: actions/checkout@v4

diff --git a/backend/pyproject.toml b/backend/pyproject.toml
@@ -35,7 +35,7 @@ classifiers = [
   "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 dependencies = [
-  "packaging>=23.2",
+  "packaging>=24.2",
   "pathspec>=0.10.1",
   "pluggy>=1.0.0",
   "tomli>=1.2.2; python_version < '3.11'",

diff --git a/backend/scripts/update_licenses.py b/backend/scripts/update_licenses.py
diff --git a/backend/src/hatchling/builders/constants.py b/backend/src/hatchling/builders/constants.py
@@ -21,6 +21,8 @@
     '.pytest_cache',
     # Mypy
     '.mypy_cache',
+    # pixi
+    '.pixi',
 ))
 EXCLUDED_FILES = frozenset((
     # https://en.wikipedia.org/wiki/.DS_Store

diff --git a/backend/src/hatchling/builders/custom.py b/backend/src/hatchling/builders/custom.py
@@ -16,7 +16,7 @@
 class CustomBuilder(Generic[PluginManagerBound]):
     PLUGIN_NAME = 'custom'
 
-    def __new__(  # type: ignore
+    def __new__(  # type: ignore[misc]
         cls,
         root: str,
         plugin_manager: PluginManagerBound | None = None,
@@ -45,7 +45,7 @@ def __new__(  # type: ignore
             message = f'Build script does not exist: {build_script}'
             raise OSError(message)
 
-        hook_class = load_plugin_from_script(path, build_script, BuilderInterface, 'builder')  # type: ignore
+        hook_class = load_plugin_from_script(path, build_script, BuilderInterface, 'builder')  # type: ignore[type-abstract]
         hook = hook_class(root, plugin_manager=plugin_manager, config=config, metadata=metadata, app=app)
 
         # Always keep the name to avoid confusion

diff --git a/backend/src/hatchling/builders/hooks/custom.py b/backend/src/hatchling/builders/hooks/custom.py
@@ -11,7 +11,7 @@
 class CustomBuildHook:
     PLUGIN_NAME = 'custom'
 
-    def __new__(  # type: ignore
+    def __new__(  # type: ignore[misc]
         cls,
         root: str,
         config: dict[str, Any],

diff --git a/backend/src/hatchling/builders/hooks/plugin/hooks.py b/backend/src/hatchling/builders/hooks/plugin/hooks.py
@@ -12,4 +12,4 @@
 
 @hookimpl
 def hatch_register_build_hook() -> list[type[BuildHookInterface]]:
-    return [CustomBuildHook, VersionBuildHook]  # type: ignore
+    return [CustomBuildHook, VersionBuildHook]  # type: ignore[list-item]
diff --git a/backend/src/hatchling/builders/plugin/hooks.py b/backend/src/hatchling/builders/plugin/hooks.py
@@ -15,4 +15,4 @@
 
 @hookimpl
 def hatch_register_builder() -> list[type[BuilderInterface]]:
-    return [AppBuilder, BinaryBuilder, CustomBuilder, SdistBuilder, WheelBuilder]  # type: ignore
+    return [AppBuilder, BinaryBuilder, CustomBuilder, SdistBuilder, WheelBuilder]  # type: ignore[list-item]
diff --git a/backend/src/hatchling/builders/wheel.py b/backend/src/hatchling/builders/wheel.py
@@ -102,6 +102,8 @@ def add_file(self, included_file: IncludedFile) -> tuple[str, str, str]:
             set_zip_info_mode(zip_info, new_mode)
             if stat.S_ISDIR(file_stat.st_mode):  # no cov
                 zip_info.external_attr |= 0x10
+            else:
+                zip_info.file_size = file_stat.st_size
         else:
             zip_info = zipfile.ZipInfo.from_file(included_file.path, relative_path)
 

diff --git a/backend/src/hatchling/cli/dep/core.py b/backend/src/hatchling/cli/dep/core.py
@@ -126,7 +126,7 @@ def dependencies_in_sync(
     if sys_path is None:
         sys_path = sys.path
     if environment is None:
-        environment = default_environment()  # type: ignore
+        environment = default_environment()  # type: ignore[assignment]
 
     installed_distributions = DistributionCache(sys_path)
-    return all(dependency_in_sync(requirement, environment, installed_distributions) for requirement in requirements)  # type: ignore
+    return all(dependency_in_sync(requirement, environment, installed_distributions) for requirement in requirements)  # type: ignore[arg-type]
diff --git a/backend/src/hatchling/licenses/__init__.py b/backend/src/hatchling/licenses/__init__.py
diff --git a/backend/src/hatchling/licenses/parse.py b/backend/src/hatchling/licenses/parse.py