Skip to content

Commit 900556d

Browse files
Merge branch 'main' into add-larecs
2 parents 6cc76ab + 7f65c1f commit 900556d

File tree

29 files changed

+230
-510
lines changed

29 files changed

+230
-510
lines changed

.github/workflows/build-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2222
with:
2323
fetch-depth: 2
24-
- uses: prefix-dev/setup-pixi@8eaba7c61d661f73d558b0b477156b7b62667fa4 # v0.8.4
24+
- uses: prefix-dev/setup-pixi@19eac09b398e3d0c747adc7921926a6d802df4da # v0.8.8
2525
with:
2626
pixi-version: v0.37.0
2727

.github/workflows/build-upload.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2626
with:
2727
fetch-depth: 2
28-
- uses: prefix-dev/setup-pixi@8eaba7c61d661f73d558b0b477156b7b62667fa4 # v0.8.4
28+
- uses: prefix-dev/setup-pixi@19eac09b398e3d0c747adc7921926a6d802df4da # v0.8.8
2929
with:
3030
pixi-version: v0.37.0
3131

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
14-
- uses: prefix-dev/setup-pixi@8eaba7c61d661f73d558b0b477156b7b62667fa4 # v0.8.4
14+
- uses: prefix-dev/setup-pixi@19eac09b398e3d0c747adc7921926a6d802df4da # v0.8.8
1515
with:
1616
pixi-version: v0.37.0
1717

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1717
with:
1818
fetch-depth: 2
19-
- uses: prefix-dev/setup-pixi@8eaba7c61d661f73d558b0b477156b7b62667fa4 # v0.8.4
19+
- uses: prefix-dev/setup-pixi@19eac09b398e3d0c747adc7921926a6d802df4da # v0.8.8
2020
with:
2121
pixi-version: v0.37.0
2222

.github/workflows/remove-incompatible-packages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1818
with:
1919
fetch-depth: 2
20-
- uses: prefix-dev/setup-pixi@8eaba7c61d661f73d558b0b477156b7b62667fa4 # v0.8.4
20+
- uses: prefix-dev/setup-pixi@19eac09b398e3d0c747adc7921926a6d802df4da # v0.8.8
2121
with:
2222
pixi-version: v0.37.0
2323

.github/workflows/update-lockfiles.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1717
- name: Set up pixi
18-
uses: prefix-dev/setup-pixi@8eaba7c61d661f73d558b0b477156b7b62667fa4 # v0.8.4
18+
uses: prefix-dev/setup-pixi@19eac09b398e3d0c747adc7921926a6d802df4da # v0.8.8
1919
with:
2020
run-install: false
2121
- name: Update lockfiles

recipes/ExtraMojo/recipe.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
context:
2-
version: "0.13.0"
2+
version: "0.14.0"
33

44
package:
55
name: "extramojo"
66
version: ${{ version }}
77

88
source:
99
- git: https://github.com/ExtraMojo/ExtraMojo.git
10-
rev: 97c9151d968206581cfd8a1d626c2e5d519046e5
10+
rev: 3282009a7cad20b77072b1cb930d96ea4bb73668
1111

1212
build:
1313
number: 0
1414
script:
1515
- mojo package ExtraMojo -o ${{ PREFIX }}/lib/mojo/ExtraMojo.mojopkg
1616
requirements:
1717
host:
18-
- max =25.2
18+
- max =25.3
1919
run:
20-
- max =25.2
20+
- max =25.3
2121
- ${{ pin_compatible('max') }}
2222

2323
tests:
@@ -29,7 +29,7 @@ tests:
2929
- mojo test -I ${{ PREFIX }}/lib/mojo/ExtraMojo.mojopkg tests/test_bstr.mojo
3030
requirements:
3131
run:
32-
- max =25.2
32+
- max =25.3
3333
files:
3434
recipe:
3535
- tests/test_file.mojo

recipes/ExtraMojo/tests/test_bstr.mojo

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,17 @@ fn test_memchr() raises:
3131

3232
@parameter
3333
for do_alignment in range(0, len(check)):
34-
var cases = List[(StringLiteral, Int)](
34+
var cases = List[(String, Int)](
3535
(
36-
"enlivened,unleavened,Arnulfo's,Unilever's,unloved|Anouilh,analogue,analogy",
36+
String(
37+
"enlivened,unleavened,Arnulfo's,Unilever's,unloved|Anouilh,analogue,analogy"
38+
),
3739
49,
3840
),
3941
(
40-
"enlivened,unleavened,Arnulfo's,Unilever's,unloved,Anouilh,analogue,analogy,enlivened,unleavened,Arnulfo's,Unilever's,unloved|Anouilh,analogue,analogy",
42+
String(
43+
"enlivened,unleavened,Arnulfo's,Unilever's,unloved,Anouilh,analogue,analogy,enlivened,unleavened,Arnulfo's,Unilever's,unloved|Anouilh,analogue,analogy"
44+
),
4145
124,
4246
),
4347
)
@@ -59,13 +63,17 @@ fn test_memchr() raises:
5963

6064

6165
fn test_memchr_wide() raises:
62-
var cases = List[(StringLiteral, Int)](
66+
var cases = List[(String, Int)](
6367
(
64-
"enlivened,unleavened,Arnulfo's,Unilever's,unloved|Anouilh,analogue,analogy",
68+
String(
69+
"enlivened,unleavened,Arnulfo's,Unilever's,unloved|Anouilh,analogue,analogy"
70+
),
6571
49,
6672
),
6773
(
68-
"enlivened,unleavened,Arnulfo's,Unilever's,unloved,Anouilh,analogue,analogy,enlivened,unleavened,Arnulfo's,Unilever's,unloved|Anouilh,analogue,analogy",
74+
String(
75+
"enlivened,unleavened,Arnulfo's,Unilever's,unloved,Anouilh,analogue,analogy,enlivened,unleavened,Arnulfo's,Unilever's,unloved|Anouilh,analogue,analogy"
76+
),
6977
124,
7078
),
7179
)

recipes/ExtraMojo/tests/test_file.mojo

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
from collections import Dict
2-
from utils import StringSlice
32
from pathlib import Path
43
from python import Python
54
from tensor import Tensor
@@ -49,7 +48,11 @@ fn test_read_until(file: Path, expected_lines: List[String]) raises:
4948
buffer.clear()
5049

5150
assert_equal(counter, len(expected_lines))
52-
print("Successful read_until with buffer capacity of {}".format(cap[]))
51+
print(
52+
String("Successful read_until with buffer capacity of {}").format(
53+
cap[]
54+
)
55+
)
5356

5457

5558
fn test_read_until_return_trailing(

recipes/emberjson/recipe.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
context:
2-
version: 0.1.4
2+
version: 0.1.5
33

44
package:
55
name: "emberjson"
66
version: ${{ version }}
77

88
source:
99
- git: https://github.com/bgreni/EmberJson.git
10-
rev: f2b2c89ad39fdd96f0b58036ed5e04478a3f2556
10+
rev: afbb34ebeb14a2927c798db593055fe4b7091098
1111

1212
build:
1313
number: 0
@@ -16,7 +16,7 @@ build:
1616

1717
requirements:
1818
host:
19-
- max =25.2
19+
- max =25.3
2020
run:
2121
- ${{ pin_compatible('max') }}
2222

@@ -28,7 +28,7 @@ tests:
2828

2929
about:
3030
homepage: https://github.com/bgreni/EmberJson
31-
license: MIT
31+
license: Apache-2.0
3232
license_file: LICENSE
3333
summary: A lightweight JSON parsing library written in pure Mojo
3434
repository: https://github.com/bgreni/EmberJson

0 commit comments

Comments
 (0)