Skip to content

Commit 4f4e96e

Browse files
authored
Merge branch 'main' into date_parsing
2 parents 75b5a52 + eab9df2 commit 4f4e96e

45 files changed

Lines changed: 35144 additions & 29840 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci-python.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@ on:
1010
- tests/**
1111
- .github/workflows/ci-python.yml
1212
- pyproject.toml
13+
- pixi.toml
1314
- pixi.lock
1415
pull_request:
1516
paths:
1617
- compass/**
1718
- tests/**
1819
- .github/workflows/ci-python.yml
1920
- pyproject.toml
21+
- pixi.toml
2022
- pixi.lock
2123
workflow_dispatch:
2224

@@ -54,7 +56,7 @@ jobs:
5456

5557
- uses: prefix-dev/setup-pixi@1b2de7f3351f171c8b4dfeb558c639cb58ed4ec0 # v0.9.5
5658
with:
57-
pixi-version: v0.62.2
59+
pixi-version: v0.68.1
5860
locked: true
5961
cache: true
6062
cache-write: false
@@ -72,7 +74,7 @@ jobs:
7274
fail-fast: false
7375
max-parallel: 8
7476
matrix:
75-
os: [ubuntu-latest, macos-latest, windows-latest]
77+
os: [ubuntu-latest, macos-latest, macos-26-intel, windows-latest]
7678

7779
steps:
7880
- name: Checkout Repo
@@ -83,7 +85,7 @@ jobs:
8385

8486
- uses: prefix-dev/setup-pixi@1b2de7f3351f171c8b4dfeb558c639cb58ed4ec0 # v0.9.5
8587
with:
86-
pixi-version: v0.62.2
88+
pixi-version: v0.68.1
8789
locked: true
8890
cache: true
8991
cache-write: ${{ github.ref == 'refs/heads/main' }}
@@ -101,7 +103,7 @@ jobs:
101103
fail-fast: false
102104
max-parallel: 8
103105
matrix:
104-
os: [ubuntu-latest, macos-latest, windows-latest]
106+
os: [ubuntu-latest, macos-latest, macos-26-intel, windows-latest]
105107

106108
steps:
107109
- name: Checkout Repo
@@ -112,7 +114,7 @@ jobs:
112114

113115
- uses: prefix-dev/setup-pixi@1b2de7f3351f171c8b4dfeb558c639cb58ed4ec0 # v0.9.5
114116
with:
115-
pixi-version: v0.62.2
117+
pixi-version: v0.68.1
116118
locked: true
117119
cache: true
118120
cache-write: false
@@ -130,8 +132,12 @@ jobs:
130132
fail-fast: false
131133
max-parallel: 8
132134
matrix:
133-
os: [ubuntu-latest, macos-latest]
135+
os: [ubuntu-latest, macos-latest, macos-26-intel]
134136
python-version: ['3.13', '3.12']
137+
exclude:
138+
# https://docling-project.github.io/docling/getting_started/installation/#:~:text=When%20installing%20Docling,using%20Python%203.13%2B.
139+
- os: macos-26-intel
140+
python-version: '3.13'
135141

136142
steps:
137143
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -175,9 +181,9 @@ jobs:
175181
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
176182
with:
177183
path: .tox/
178-
key: ${{ runner.os }}-${{ matrix.python-version }}-tox-v1-${{ hashFiles('**/pyproject.toml') }}
184+
key: ${{ runner.os }}-${{ runner.arch }}-${{ matrix.python-version }}-tox-v2-${{ hashFiles('**/pyproject.toml') }}
179185
restore-keys: |
180-
${{ runner.os }}-${{ matrix.python-version }}-tox-v1-
186+
${{ runner.os }}-${{ runner.arch }}-${{ matrix.python-version }}-tox-v2-
181187
182188
- name: Test with tox
183189
run: tox -e ${{ matrix.python-version == '3.12' && 'msv' || 'latest' }}
@@ -189,4 +195,4 @@ jobs:
189195
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
190196
with:
191197
path: .tox/
192-
key: ${{ runner.os }}-${{ matrix.python-version }}-tox-v1-${{ hashFiles('**/pyproject.toml') }}
198+
key: ${{ runner.os }}-${{ runner.arch }}-${{ matrix.python-version }}-tox-v2-${{ hashFiles('**/pyproject.toml') }}

.github/workflows/ci-rust.yml

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ on:
1111
- Cargo.toml
1212
- Cargo.lock
1313
- .github/workflows/ci-rust.yml
14-
- pyproject.toml
14+
- pixi.toml
1515
- pixi.lock
1616
pull_request:
1717
paths:
1818
- crates/**
1919
- Cargo.toml
2020
- Cargo.lock
2121
- .github/workflows/ci-rust.yml
22-
- pyproject.toml
22+
- pixi.toml
2323
- pixi.lock
2424
schedule:
2525
- cron: '0 5 * * 1'
@@ -34,8 +34,7 @@ jobs:
3434

3535
- uses: prefix-dev/setup-pixi@1b2de7f3351f171c8b4dfeb558c639cb58ed4ec0 # v0.9.5
3636
with:
37-
pixi-version: v0.62.2
38-
frozen: true
37+
pixi-version: v0.68.1
3938
cache: true
4039
cache-write: ${{ github.ref == 'refs/heads/main' }}
4140
environments: rdev
@@ -61,8 +60,7 @@ jobs:
6160

6261
- uses: prefix-dev/setup-pixi@1b2de7f3351f171c8b4dfeb558c639cb58ed4ec0 # v0.9.5
6362
with:
64-
pixi-version: v0.62.2
65-
frozen: true
63+
pixi-version: v0.68.1
6664
cache: true
6765
cache-write: ${{ github.ref == 'refs/heads/main' }}
6866
environments: rdev
@@ -89,15 +87,14 @@ jobs:
8987
strategy:
9088
fail-fast: false
9189
matrix:
92-
os: [ubuntu-latest, macos-latest, windows-latest]
90+
os: [ubuntu-latest, macos-latest, macos-26-intel, windows-latest]
9391

9492
steps:
9593
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
9694

9795
- uses: prefix-dev/setup-pixi@1b2de7f3351f171c8b4dfeb558c639cb58ed4ec0 # v0.9.5
9896
with:
99-
pixi-version: v0.62.2
100-
frozen: true
97+
pixi-version: v0.68.1
10198
cache: true
10299
cache-write: ${{ github.ref == 'refs/heads/main' }}
103100
environments: rdev
@@ -129,8 +126,7 @@ jobs:
129126

130127
- uses: prefix-dev/setup-pixi@1b2de7f3351f171c8b4dfeb558c639cb58ed4ec0 # v0.9.5
131128
with:
132-
pixi-version: v0.62.2
133-
frozen: true
129+
pixi-version: v0.68.1
134130
cache: true
135131
cache-write: ${{ github.ref == 'refs/heads/main' }}
136132
environments: rdev
@@ -160,8 +156,7 @@ jobs:
160156

161157
- uses: prefix-dev/setup-pixi@1b2de7f3351f171c8b4dfeb558c639cb58ed4ec0 # v0.9.5
162158
with:
163-
pixi-version: v0.62.2
164-
frozen: true
159+
pixi-version: v0.68.1
165160
cache: true
166161
cache-write: ${{ github.ref == 'refs/heads/main' }}
167162
environments: rdev
@@ -189,8 +184,7 @@ jobs:
189184

190185
- uses: prefix-dev/setup-pixi@1b2de7f3351f171c8b4dfeb558c639cb58ed4ec0 # v0.9.5
191186
with:
192-
pixi-version: v0.62.2
193-
frozen: true
187+
pixi-version: v0.68.1
194188
cache: true
195189
cache-write: ${{ github.ref == 'refs/heads/main' }}
196190
environments: rdev

.github/workflows/codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
- uses: prefix-dev/setup-pixi@1b2de7f3351f171c8b4dfeb558c639cb58ed4ec0 # v0.9.5
3434
with:
35-
pixi-version: v0.62.2
35+
pixi-version: v0.68.1
3636
locked: true
3737
cache: true
3838
cache-write: false

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ jobs:
3333
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3434

3535
- name: Initialize CodeQL
36-
uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
36+
uses: github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
3737
with:
3838
languages: ${{ matrix.language }}
3939
build-mode: ${{ matrix.build-mode }}
4040

4141
- name: Perform CodeQL Analysis
42-
uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
42+
uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
4343
with:
4444
category: "/language:${{matrix.language}}"

.github/workflows/docker-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
# https://github.com/sigstore/cosign-installer
4242
- name: Install cosign
4343
if: startsWith(github.ref, 'refs/tags/v')
44-
uses: sigstore/cosign-installer@cad07c2e89fa2edd6e2d7bab4c1aa38e53f76003 #v4.1.1
44+
uses: sigstore/cosign-installer@6f9f17788090df1f26f669e9d70d6ae9567deba6 #v4.1.2
4545
with:
4646
cosign-release: 'v2.2.4'
4747

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
- uses: prefix-dev/setup-pixi@1b2de7f3351f171c8b4dfeb558c639cb58ed4ec0 # v0.9.5
3939
with:
40-
pixi-version: v0.62.2
40+
pixi-version: v0.68.1
4141
locked: true
4242
cache: false # Don't use cache because we use the ``pdoc`` environment
4343
environments: pdoc
@@ -46,7 +46,7 @@ jobs:
4646
run: pixi run -e pdoc python-docs # This errors on warnings
4747

4848
- name: deploy
49-
uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0
49+
uses: peaceiris/actions-gh-pages@84c30a85c19949d7eee79c4ff27748b70285e453 # v4.1.0
5050
if: startsWith(github.ref, 'refs/tags/v')
5151
with:
5252
github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish_to_pypi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- uses: prefix-dev/setup-pixi@1b2de7f3351f171c8b4dfeb558c639cb58ed4ec0 # v0.9.5
2525
with:
26-
pixi-version: v0.62.2
26+
pixi-version: v0.68.1
2727
locked: true
2828
cache: false
2929
environments: pbuild

.github/workflows/release_drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Release Drafter
14-
uses: release-drafter/release-drafter@5de93583980a40bd78603b6dfdcda5b4df377b32 # v7.2.0
14+
uses: release-drafter/release-drafter@c2e2804cc59f45f57076a99af580d0fedb697927 # v7.3.0
1515
env:
1616
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/prefix-dev/pixi:0.50.2 AS build
3+
FROM ghcr.io/prefix-dev/pixi:0.68.1 AS build
44

55
ARG PIXI_ENV=default
66

0 commit comments

Comments
 (0)