Spaces:
Sleeping
Sleeping
Commit ·
dba3a3e
1
Parent(s): cbea823
chore(deps): align published SolverForge stack
Browse filesUpdate the app to the published solverforge 0.9.1 runtime and solverforge-ui 0.6.3 UI crate, keeping solverforge.app.toml metadata in sync with the resolved crates.io releases.
Declare Rust 1.95 in Cargo metadata, move the Docker builder to rust:1.95-alpine, and update the Makefile requirement text to match the SolverForge runtime floor.
Refresh direct dependency constraints to the latest compatible crates.io releases and remove the old rand 0.8 dependency from the lockfile.
- Cargo.lock +26 -67
- Cargo.toml +13 -12
- Dockerfile +1 -1
- Makefile +2 -2
- solverforge.app.toml +2 -2
Cargo.lock
CHANGED
|
@@ -138,7 +138,7 @@ checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
|
|
| 138 |
dependencies = [
|
| 139 |
"cfg-if",
|
| 140 |
"cpufeatures",
|
| 141 |
-
"rand_core
|
| 142 |
]
|
| 143 |
|
| 144 |
[[package]]
|
|
@@ -277,17 +277,6 @@ dependencies = [
|
|
| 277 |
"slab",
|
| 278 |
]
|
| 279 |
|
| 280 |
-
[[package]]
|
| 281 |
-
name = "getrandom"
|
| 282 |
-
version = "0.2.17"
|
| 283 |
-
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 284 |
-
checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
|
| 285 |
-
dependencies = [
|
| 286 |
-
"cfg-if",
|
| 287 |
-
"libc",
|
| 288 |
-
"wasi",
|
| 289 |
-
]
|
| 290 |
-
|
| 291 |
[[package]]
|
| 292 |
name = "getrandom"
|
| 293 |
version = "0.4.2"
|
|
@@ -297,7 +286,7 @@ dependencies = [
|
|
| 297 |
"cfg-if",
|
| 298 |
"libc",
|
| 299 |
"r-efi",
|
| 300 |
-
"rand_core
|
| 301 |
"wasip2",
|
| 302 |
"wasip3",
|
| 303 |
]
|
|
@@ -685,17 +674,6 @@ version = "6.0.0"
|
|
| 685 |
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 686 |
checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
|
| 687 |
|
| 688 |
-
[[package]]
|
| 689 |
-
name = "rand"
|
| 690 |
-
version = "0.8.6"
|
| 691 |
-
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 692 |
-
checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
|
| 693 |
-
dependencies = [
|
| 694 |
-
"libc",
|
| 695 |
-
"rand_chacha 0.3.1",
|
| 696 |
-
"rand_core 0.6.4",
|
| 697 |
-
]
|
| 698 |
-
|
| 699 |
[[package]]
|
| 700 |
name = "rand"
|
| 701 |
version = "0.10.1"
|
|
@@ -703,18 +681,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
| 703 |
checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
|
| 704 |
dependencies = [
|
| 705 |
"chacha20",
|
| 706 |
-
"getrandom
|
| 707 |
-
"rand_core
|
| 708 |
-
]
|
| 709 |
-
|
| 710 |
-
[[package]]
|
| 711 |
-
name = "rand_chacha"
|
| 712 |
-
version = "0.3.1"
|
| 713 |
-
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 714 |
-
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
|
| 715 |
-
dependencies = [
|
| 716 |
-
"ppv-lite86",
|
| 717 |
-
"rand_core 0.6.4",
|
| 718 |
]
|
| 719 |
|
| 720 |
[[package]]
|
|
@@ -724,16 +692,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
| 724 |
checksum = "3e6af7f3e25ded52c41df4e0b1af2d047e45896c2f3281792ed68a1c243daedb"
|
| 725 |
dependencies = [
|
| 726 |
"ppv-lite86",
|
| 727 |
-
"rand_core
|
| 728 |
-
]
|
| 729 |
-
|
| 730 |
-
[[package]]
|
| 731 |
-
name = "rand_core"
|
| 732 |
-
version = "0.6.4"
|
| 733 |
-
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 734 |
-
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
|
| 735 |
-
dependencies = [
|
| 736 |
-
"getrandom 0.2.17",
|
| 737 |
]
|
| 738 |
|
| 739 |
[[package]]
|
|
@@ -949,9 +908,9 @@ dependencies = [
|
|
| 949 |
|
| 950 |
[[package]]
|
| 951 |
name = "solverforge"
|
| 952 |
-
version = "0.9.
|
| 953 |
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 954 |
-
checksum = "
|
| 955 |
dependencies = [
|
| 956 |
"solverforge-config",
|
| 957 |
"solverforge-console",
|
|
@@ -965,9 +924,9 @@ dependencies = [
|
|
| 965 |
|
| 966 |
[[package]]
|
| 967 |
name = "solverforge-config"
|
| 968 |
-
version = "0.9.
|
| 969 |
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 970 |
-
checksum = "
|
| 971 |
dependencies = [
|
| 972 |
"serde",
|
| 973 |
"serde_yaml",
|
|
@@ -978,9 +937,9 @@ dependencies = [
|
|
| 978 |
|
| 979 |
[[package]]
|
| 980 |
name = "solverforge-console"
|
| 981 |
-
version = "0.9.
|
| 982 |
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 983 |
-
checksum = "
|
| 984 |
dependencies = [
|
| 985 |
"num-format",
|
| 986 |
"owo-colors",
|
|
@@ -990,9 +949,9 @@ dependencies = [
|
|
| 990 |
|
| 991 |
[[package]]
|
| 992 |
name = "solverforge-core"
|
| 993 |
-
version = "0.9.
|
| 994 |
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 995 |
-
checksum = "
|
| 996 |
dependencies = [
|
| 997 |
"serde",
|
| 998 |
"thiserror",
|
|
@@ -1000,9 +959,9 @@ dependencies = [
|
|
| 1000 |
|
| 1001 |
[[package]]
|
| 1002 |
name = "solverforge-cvrp"
|
| 1003 |
-
version = "0.9.
|
| 1004 |
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 1005 |
-
checksum = "
|
| 1006 |
dependencies = [
|
| 1007 |
"solverforge-solver",
|
| 1008 |
]
|
|
@@ -1014,7 +973,7 @@ dependencies = [
|
|
| 1014 |
"axum",
|
| 1015 |
"chrono",
|
| 1016 |
"parking_lot",
|
| 1017 |
-
"rand
|
| 1018 |
"serde",
|
| 1019 |
"serde_json",
|
| 1020 |
"solverforge",
|
|
@@ -1027,9 +986,9 @@ dependencies = [
|
|
| 1027 |
|
| 1028 |
[[package]]
|
| 1029 |
name = "solverforge-macros"
|
| 1030 |
-
version = "0.9.
|
| 1031 |
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 1032 |
-
checksum = "
|
| 1033 |
dependencies = [
|
| 1034 |
"proc-macro2",
|
| 1035 |
"quote",
|
|
@@ -1038,9 +997,9 @@ dependencies = [
|
|
| 1038 |
|
| 1039 |
[[package]]
|
| 1040 |
name = "solverforge-scoring"
|
| 1041 |
-
version = "0.9.
|
| 1042 |
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 1043 |
-
checksum = "
|
| 1044 |
dependencies = [
|
| 1045 |
"solverforge-core",
|
| 1046 |
"thiserror",
|
|
@@ -1048,12 +1007,12 @@ dependencies = [
|
|
| 1048 |
|
| 1049 |
[[package]]
|
| 1050 |
name = "solverforge-solver"
|
| 1051 |
-
version = "0.9.
|
| 1052 |
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 1053 |
-
checksum = "
|
| 1054 |
dependencies = [
|
| 1055 |
-
"rand
|
| 1056 |
-
"rand_chacha
|
| 1057 |
"rayon",
|
| 1058 |
"serde",
|
| 1059 |
"smallvec",
|
|
@@ -1067,9 +1026,9 @@ dependencies = [
|
|
| 1067 |
|
| 1068 |
[[package]]
|
| 1069 |
name = "solverforge-ui"
|
| 1070 |
-
version = "0.6.
|
| 1071 |
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 1072 |
-
checksum = "
|
| 1073 |
dependencies = [
|
| 1074 |
"axum",
|
| 1075 |
"include_dir",
|
|
|
|
| 138 |
dependencies = [
|
| 139 |
"cfg-if",
|
| 140 |
"cpufeatures",
|
| 141 |
+
"rand_core",
|
| 142 |
]
|
| 143 |
|
| 144 |
[[package]]
|
|
|
|
| 277 |
"slab",
|
| 278 |
]
|
| 279 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 280 |
[[package]]
|
| 281 |
name = "getrandom"
|
| 282 |
version = "0.4.2"
|
|
|
|
| 286 |
"cfg-if",
|
| 287 |
"libc",
|
| 288 |
"r-efi",
|
| 289 |
+
"rand_core",
|
| 290 |
"wasip2",
|
| 291 |
"wasip3",
|
| 292 |
]
|
|
|
|
| 674 |
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 675 |
checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
|
| 676 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 677 |
[[package]]
|
| 678 |
name = "rand"
|
| 679 |
version = "0.10.1"
|
|
|
|
| 681 |
checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
|
| 682 |
dependencies = [
|
| 683 |
"chacha20",
|
| 684 |
+
"getrandom",
|
| 685 |
+
"rand_core",
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 686 |
]
|
| 687 |
|
| 688 |
[[package]]
|
|
|
|
| 692 |
checksum = "3e6af7f3e25ded52c41df4e0b1af2d047e45896c2f3281792ed68a1c243daedb"
|
| 693 |
dependencies = [
|
| 694 |
"ppv-lite86",
|
| 695 |
+
"rand_core",
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 696 |
]
|
| 697 |
|
| 698 |
[[package]]
|
|
|
|
| 908 |
|
| 909 |
[[package]]
|
| 910 |
name = "solverforge"
|
| 911 |
+
version = "0.9.1"
|
| 912 |
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 913 |
+
checksum = "bf7016080121cd103083cff864a6bda8e2b65377bbbf852c0b05df091d584af1"
|
| 914 |
dependencies = [
|
| 915 |
"solverforge-config",
|
| 916 |
"solverforge-console",
|
|
|
|
| 924 |
|
| 925 |
[[package]]
|
| 926 |
name = "solverforge-config"
|
| 927 |
+
version = "0.9.1"
|
| 928 |
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 929 |
+
checksum = "045070a1f2a86fb27e04dab7c4fed7a35a275af887622df2e64d95d05d43121e"
|
| 930 |
dependencies = [
|
| 931 |
"serde",
|
| 932 |
"serde_yaml",
|
|
|
|
| 937 |
|
| 938 |
[[package]]
|
| 939 |
name = "solverforge-console"
|
| 940 |
+
version = "0.9.1"
|
| 941 |
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 942 |
+
checksum = "0759e5ae26e608b55c23c8b645ad63ff0f7f9db3860c1668a16966dd5bba4476"
|
| 943 |
dependencies = [
|
| 944 |
"num-format",
|
| 945 |
"owo-colors",
|
|
|
|
| 949 |
|
| 950 |
[[package]]
|
| 951 |
name = "solverforge-core"
|
| 952 |
+
version = "0.9.1"
|
| 953 |
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 954 |
+
checksum = "5b63b5c0213e0e602364f680637170ca9fec4b6f129de9981f118041aae5d689"
|
| 955 |
dependencies = [
|
| 956 |
"serde",
|
| 957 |
"thiserror",
|
|
|
|
| 959 |
|
| 960 |
[[package]]
|
| 961 |
name = "solverforge-cvrp"
|
| 962 |
+
version = "0.9.1"
|
| 963 |
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 964 |
+
checksum = "287dd64c8843bfb44b75df0566dac9601ee7448926f2047066239673239a40f9"
|
| 965 |
dependencies = [
|
| 966 |
"solverforge-solver",
|
| 967 |
]
|
|
|
|
| 973 |
"axum",
|
| 974 |
"chrono",
|
| 975 |
"parking_lot",
|
| 976 |
+
"rand",
|
| 977 |
"serde",
|
| 978 |
"serde_json",
|
| 979 |
"solverforge",
|
|
|
|
| 986 |
|
| 987 |
[[package]]
|
| 988 |
name = "solverforge-macros"
|
| 989 |
+
version = "0.9.1"
|
| 990 |
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 991 |
+
checksum = "946610887a584b315b487db0859e00abf73d54811babd627e869cbc69ea58c63"
|
| 992 |
dependencies = [
|
| 993 |
"proc-macro2",
|
| 994 |
"quote",
|
|
|
|
| 997 |
|
| 998 |
[[package]]
|
| 999 |
name = "solverforge-scoring"
|
| 1000 |
+
version = "0.9.1"
|
| 1001 |
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 1002 |
+
checksum = "240a9463ec2d9a50a9082bf35535179d21b4463b284c3199c0b764e0b6214a92"
|
| 1003 |
dependencies = [
|
| 1004 |
"solverforge-core",
|
| 1005 |
"thiserror",
|
|
|
|
| 1007 |
|
| 1008 |
[[package]]
|
| 1009 |
name = "solverforge-solver"
|
| 1010 |
+
version = "0.9.1"
|
| 1011 |
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 1012 |
+
checksum = "9d4ae8a78ab9b9c32f2732bf79a79c4417a86467fb1063c70f132798c3e943f5"
|
| 1013 |
dependencies = [
|
| 1014 |
+
"rand",
|
| 1015 |
+
"rand_chacha",
|
| 1016 |
"rayon",
|
| 1017 |
"serde",
|
| 1018 |
"smallvec",
|
|
|
|
| 1026 |
|
| 1027 |
[[package]]
|
| 1028 |
name = "solverforge-ui"
|
| 1029 |
+
version = "0.6.3"
|
| 1030 |
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 1031 |
+
checksum = "0e7539f982c47c5627e834a764af64d1dde31b806f08118491e7fac8b5388c60"
|
| 1032 |
dependencies = [
|
| 1033 |
"axum",
|
| 1034 |
"include_dir",
|
Cargo.toml
CHANGED
|
@@ -2,27 +2,28 @@
|
|
| 2 |
name = "solverforge-hospital"
|
| 3 |
version = "1.0.1"
|
| 4 |
edition = "2021"
|
|
|
|
| 5 |
description = "SolverForge hospital scheduling example"
|
| 6 |
publish = false
|
| 7 |
|
| 8 |
[dependencies]
|
| 9 |
-
solverforge = { version = "0.9.
|
| 10 |
"serde",
|
| 11 |
"console",
|
| 12 |
"verbose-logging",
|
| 13 |
] }
|
| 14 |
-
solverforge-ui = "0.6.
|
| 15 |
-
rand = "0.
|
| 16 |
|
| 17 |
-
axum = "0.8"
|
| 18 |
-
tokio = { version = "1", features = ["full"] }
|
| 19 |
-
tokio-stream = { version = "0.1", features = ["sync"] }
|
| 20 |
-
tower-http = { version = "0.6", features = ["fs", "cors"] }
|
| 21 |
-
tower = "0.5"
|
| 22 |
-
serde = { version = "1", features = ["derive"] }
|
| 23 |
-
serde_json = "1"
|
| 24 |
-
chrono = { version = "0.4", features = ["serde"] }
|
| 25 |
-
parking_lot = "0.12"
|
| 26 |
|
| 27 |
[profile.release]
|
| 28 |
opt-level = 3
|
|
|
|
| 2 |
name = "solverforge-hospital"
|
| 3 |
version = "1.0.1"
|
| 4 |
edition = "2021"
|
| 5 |
+
rust-version = "1.95"
|
| 6 |
description = "SolverForge hospital scheduling example"
|
| 7 |
publish = false
|
| 8 |
|
| 9 |
[dependencies]
|
| 10 |
+
solverforge = { version = "0.9.1", features = [
|
| 11 |
"serde",
|
| 12 |
"console",
|
| 13 |
"verbose-logging",
|
| 14 |
] }
|
| 15 |
+
solverforge-ui = "0.6.3"
|
| 16 |
+
rand = "0.10.1"
|
| 17 |
|
| 18 |
+
axum = "0.8.9"
|
| 19 |
+
tokio = { version = "1.52.1", features = ["full"] }
|
| 20 |
+
tokio-stream = { version = "0.1.18", features = ["sync"] }
|
| 21 |
+
tower-http = { version = "0.6.8", features = ["fs", "cors"] }
|
| 22 |
+
tower = "0.5.3"
|
| 23 |
+
serde = { version = "1.0.228", features = ["derive"] }
|
| 24 |
+
serde_json = "1.0.149"
|
| 25 |
+
chrono = { version = "0.4.44", features = ["serde"] }
|
| 26 |
+
parking_lot = "0.12.5"
|
| 27 |
|
| 28 |
[profile.release]
|
| 29 |
opt-level = 3
|
Dockerfile
CHANGED
|
@@ -4,7 +4,7 @@
|
|
| 4 |
# complete Docker build context:
|
| 5 |
# docker build -f Dockerfile -t solverforge-hospital .
|
| 6 |
|
| 7 |
-
FROM rust:1.
|
| 8 |
|
| 9 |
# Install build dependencies
|
| 10 |
RUN apk add --no-cache musl-dev
|
|
|
|
| 4 |
# complete Docker build context:
|
| 5 |
# docker build -f Dockerfile -t solverforge-hospital .
|
| 6 |
|
| 7 |
+
FROM rust:1.95-alpine AS builder
|
| 8 |
|
| 9 |
# Install build dependencies
|
| 10 |
RUN apk add --no-cache musl-dev
|
Makefile
CHANGED
|
@@ -1,4 +1,4 @@
|
|
| 1 |
-
# SolverForge Hospital Makefile
|
| 2 |
# Rust + frontend + Space-oriented local build system
|
| 3 |
#
|
| 4 |
# This app is primarily validated for local development and Docker-based
|
|
@@ -24,7 +24,7 @@ PROGRESS := →
|
|
| 24 |
# ============== Project Metadata ==============
|
| 25 |
APP_NAME := solverforge-hospital
|
| 26 |
VERSION := $(shell sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -n1)
|
| 27 |
-
RUST_VERSION := 1.
|
| 28 |
PORT ?= 7860
|
| 29 |
DOCKER_IMAGE ?= $(APP_NAME)
|
| 30 |
DOCKER_CONTEXT ?= .
|
|
|
|
| 1 |
+
# SolverForge Hospital Makefile
|
| 2 |
# Rust + frontend + Space-oriented local build system
|
| 3 |
#
|
| 4 |
# This app is primarily validated for local development and Docker-based
|
|
|
|
| 24 |
# ============== Project Metadata ==============
|
| 25 |
APP_NAME := solverforge-hospital
|
| 26 |
VERSION := $(shell sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -n1)
|
| 27 |
+
RUST_VERSION := 1.95+
|
| 28 |
PORT ?= 7860
|
| 29 |
DOCKER_IMAGE ?= $(APP_NAME)
|
| 30 |
DOCKER_CONTEXT ?= .
|
solverforge.app.toml
CHANGED
|
@@ -9,9 +9,9 @@ cli_version = "0.9.0"
|
|
| 9 |
# Published crate releases used by this example.
|
| 10 |
target = "SolverForge crates.io target"
|
| 11 |
runtime_crate = "solverforge"
|
| 12 |
-
runtime_version = "0.9.
|
| 13 |
ui_crate = "solverforge-ui"
|
| 14 |
-
ui_version = "0.6.
|
| 15 |
|
| 16 |
[demo]
|
| 17 |
# Public demo-data ids exposed by this app.
|
|
|
|
| 9 |
# Published crate releases used by this example.
|
| 10 |
target = "SolverForge crates.io target"
|
| 11 |
runtime_crate = "solverforge"
|
| 12 |
+
runtime_version = "0.9.1"
|
| 13 |
ui_crate = "solverforge-ui"
|
| 14 |
+
ui_version = "0.6.3"
|
| 15 |
|
| 16 |
[demo]
|
| 17 |
# Public demo-data ids exposed by this app.
|