Merge branch 'master' into master

pypa · Nov 9, 2024 · 96d9332 · 96d9332
2 parents 170a8ff + a664f3c
commit 96d9332
Show file tree

Hide file tree

Showing 43 changed files with 1,039 additions and 1,449 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: |
@@ -115,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/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