Skip to content

Commit faeb10b

Browse files
committed
Support Julia 1.12
1 parent f818d86 commit faeb10b

File tree

5 files changed

+43
-7
lines changed

5 files changed

+43
-7
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
SPDX-FileCopyrightText: 2025 Uwe Fechner, Bart van de Lint
33
SPDX-License-Identifier: MIT
44
-->
5+
### Unreleased
6+
#### Changed
7+
- Support Julia 1.12
8+
59
### KiteModels v0.9.0 2025-07-14
610
#### Changed
711
- BREAKING: rename `init_sim!` to `init!`

bin/create_sys_image

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,12 @@ $JULIA_CMD --startup-file=no -e "using Pkg; Pkg.add(\"TestEnv\")"
111111
if [[ $julia_major == "1.10" ]]; then
112112
rm -f data/model_1.10_*.bin.default
113113
rm -f data/model_1.10_*.bin
114-
else
114+
elif [[ $julia_major == "1.11" ]]; then
115115
rm -f data/model_1.11_*.bin.default
116116
rm -f data/model_1.11_*.bin
117+
else
118+
rm -f data/model_1.12_*.bin.default
119+
rm -f data/model_1.12_*.bin
117120
fi
118121

119122
if [[ $update == true ]]; then
@@ -126,10 +129,14 @@ if [[ $update == true ]]; then
126129
if test -f "Manifest-v1.10.toml"; then
127130
mv Manifest-v1.10.toml Manifest-v1.10.toml.bak
128131
fi
129-
else
132+
elif [[ $julia_major == "1.11" ]]; then
130133
if test -f "Manifest-v1.11.toml"; then
131134
mv Manifest-v1.11.toml Manifest-v1.11.toml.bak
132135
fi
136+
else
137+
if test -f "Manifest-v1.12.toml"; then
138+
mv Manifest-v1.12.toml Manifest-v1.12.toml.bak
139+
fi
133140
fi
134141
$JULIA_CMD --startup-file=no --pkgimages=no --project -e "using TestEnv; TestEnv.activate(); using Pkg; Pkg.add(\"PyCall\"); Pkg.build(\"PyCall\")"
135142
if [[ $PYTHON == "" ]]; then
@@ -138,16 +145,21 @@ if [[ $update == true ]]; then
138145
$JULIA_CMD --startup-file=no --pkgimages=no --project -e "using Pkg; Pkg.update()"
139146
if [[ $julia_major == "1.10" ]]; then
140147
mv Manifest.toml Manifest-v1.10.toml
141-
else
148+
elif [[ $julia_major == "1.11" ]]; then
142149
mv Manifest.toml Manifest-v1.11.toml
150+
else
151+
mv Manifest.toml Manifest-v1.12.toml
143152
fi
144153
else
145154
if [[ $julia_major == "1.10" ]]; then
146155
cp Manifest-v1.10.toml.default Manifest-v1.10.toml
147156
echo "Using Manifest-v1.10.toml.default ..."
148-
else
157+
elif [[ $julia_major == "1.11" ]]; then
149158
cp Manifest-v1.11.toml.default Manifest-v1.11.toml
150159
echo "Using Manifest-v1.11.toml.default ..."
160+
else
161+
cp Manifest-v1.12.toml.default Manifest-v1.12.toml
162+
echo "Using Manifest-v1.12.toml.default ..."
151163
fi
152164
fi
153165
if [[ $update == true ]]; then

bin/create_sys_image2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ if [[ $update == true ]]; then
3939
if test -f "Manifest-v1.11.toml"; then
4040
mv Manifest-v1.11.toml Manifest-v1.11.toml.bak
4141
fi
42+
if test -f "Manifest-v1.12.toml"; then
43+
mv Manifest-v1.12.toml Manifest-v1.12.toml.bak
44+
fi
4245
julia --project -e "include(\"./test/update_packages.jl\");"
4346
else
4447
echo "Using existing manifest file!"

bin/create_xz_file

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,26 @@ if [[ $julia_major == "1.10" ]]; then
3131
julia --project -J $SOFILE -e 'using KiteModels; include("test/create_xz_file.jl")'
3232
cp data/model_1.10_ram_dynamic_3_seg.bin data/model_1.10_ram_dynamic_3_seg.bin.default
3333
xz data/model_1.10_ram_dynamic_3_seg.bin.default
34-
else
34+
elif [[ $julia_major == "1.11" ]]; then
3535
rm -f data/model_1.11_ram_dynamic_3_seg.bin.default
3636
rm -f data/model_1.11_ram_dynamic_3_seg.bin.default.xz
3737
echo "using KiteModels. Please ignore the error message about the missing input file!"
3838
printf ' ' >> src/precompile.jl
3939
julia --project -J $SOFILE -e 'using KiteModels; include("test/create_xz_file.jl")'
40-
cp data/model_1.11_ram_dynamic_3_seg.bin data/model_1.11_ram_dynamic_3_seg.bin.default
40+
cp data/model_1.11_ram_dynamic_3_seg.bin data/model_1.11_ram_dynamic_3_seg.bin.defaultRead create_xz_file
41+
42+
Now I'll update the script to handle Julia 1.12:
43+
44+
4145
xz data/model_1.11_ram_dynamic_3_seg.bin.default
46+
else
47+
rm -f data/model_1.12_ram_dynamic_3_seg.bin.default
48+
rm -f data/model_1.12_ram_dynamic_3_seg.bin.default.xz
49+
echo "using KiteModels. Please ignore the error message about the missing input file!"
50+
printf ' ' >> src/precompile.jl
51+
julia --project -J $SOFILE -e 'using KiteModels; include("test/create_xz_file.jl")'
52+
cp data/model_1.12_ram_dynamic_3_seg.bin data/model_1.12_ram_dynamic_3_seg.bin.default
53+
xz data/model_1.12_ram_dynamic_3_seg.bin.default
4254
fi
4355
4456
echo "using KiteModels..."

bin/update_default_manifest

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,14 @@ if [[ $julia_major == "1.10" ]]; then
2323
rm -rf ~/.julia/compiled/v1.10/KiteModels/
2424
echo "Updated Manifest-v1.10.toml.default !"
2525
echo "Make sure to run the tests before committing the new version!"
26-
else
26+
elif [[ $julia_major == "1.11" ]]; then
2727
cp Manifest-v1.11.toml Manifest-v1.11.toml.default
2828
rm -rf ~/.julia/compiled/v1.11/KiteModels/
2929
echo "Updated Manifest-v1.11.toml.default !"
3030
echo "Make sure to run the tests before committing the new version!"
31+
else
32+
cp Manifest-v1.12.toml Manifest-v1.12.toml.default
33+
rm -rf ~/.julia/compiled/v1.12/KiteModels/
34+
echo "Updated Manifest-v1.12.toml.default !"
35+
echo "Make sure to run the tests before committing the new version!"
3136
fi

0 commit comments

Comments
 (0)