Skip to content

Commit 97cc112

Browse files
committed
update to catalyst 16, removed mtk dep, --update-manifests option in dev.sh
1 parent 7aab4fa commit 97cc112

11 files changed

Lines changed: 800 additions & 539 deletions

File tree

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.1
1+
0.1.2

backend/Manifest-v1.11.toml

Lines changed: 370 additions & 252 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/Manifest-v1.12.toml

Lines changed: 387 additions & 267 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/Project.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "GRSServer"
22
uuid = "86ab0978-0466-42e7-a2ae-38e617ed6ea3"
3-
version = "0.1.1"
3+
version = "0.1.2"
44
authors = ["nifets <stefanmanol@gmail.com>", "lmshk "]
55

66
[deps]
@@ -13,7 +13,6 @@ HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
1313
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
1414
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
1515
LoggingExtras = "e6f89c97-d47a-5376-807f-9c37f3926c36"
16-
ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
1716
MultivariateStats = "6f286f6a-111f-5878-ab1e-185364afe411"
1817
Oxygen = "df9a0d86-3283-4920-82dc-4555fc0d1d8b"
1918
Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
@@ -24,14 +23,13 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
2423

2524
[compat]
2625
Arrow = "2.8.0"
27-
Catalyst = "15.0.11"
26+
Catalyst = "16"
2827
Colors = "0.13.1"
2928
Dates = "1.11.0"
3029
GeneRegulatorySystems = "0.4.0"
3130
JSON = "1.3.0"
3231
Logging = "1.11.0"
3332
LoggingExtras = "1.2.0"
34-
ModelingToolkit = "9.84.0"
3533
MultivariateStats = "0.10.4"
3634
Oxygen = "1.10.0"
3735
Setfield = "1.1.2"

backend/src/network_representation.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
module NetworkRepresentation
22

33
using Catalyst
4-
using ModelingToolkit
54

65
using GeneRegulatorySystems.Models
76
using GeneRegulatorySystems.Models: Wrapped, Instant
@@ -58,7 +57,7 @@ struct SpeciesId
5857
end
5958

6059
function SpeciesId(s::SymbolicUtils.BasicSymbolic)
61-
SpeciesId(normalize_name(strip_time(Symbol(s))))
60+
SpeciesId(strip_time(normalize_name(s)))
6261
end
6362

6463
function species_components(name::Symbol)

dev.sh

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ set -euo pipefail
44
# Development launcher for the GRS app.
55
#
66
# Usage:
7-
# ./dev.sh Start Vite frontend + Julia backend (browser mode)
8-
# ./dev.sh --tauri Start via Tauri (desktop window, Julia spawned by Rust)
9-
# ./dev.sh --sync-version Update all package files from VERSION
7+
# ./dev.sh Start Vite frontend + Julia backend (browser mode)
8+
# ./dev.sh --tauri Start via Tauri (desktop window, Julia spawned by Rust)
9+
# ./dev.sh --sync-version Update all package files from VERSION
10+
# ./dev.sh --update-manifests Regenerate Manifest-v1.11.toml and Manifest-v1.12.toml
1011

1112
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
1213
FRONTEND_DIR="$SCRIPT_DIR/frontend"
@@ -61,6 +62,26 @@ if [ "${1:-}" = "--sync-version" ]; then
6162
exit 0
6263
fi
6364

65+
if [ "${1:-}" = "--update-manifests" ]; then
66+
CHANNELS=$(juliaup status 2>/dev/null | awk 'NR>2 && $0 !~ /^-/ { for(i=1;i<=NF;i++) if ($i ~ /^[0-9]+\.[0-9]+$/ || $i == "release" || $i == "lts") { print $i; break } }')
67+
if [ -z "$CHANNELS" ]; then
68+
echo "[dev.sh] Could not detect juliaup channels. Is juliaup installed?"
69+
exit 1
70+
fi
71+
for CHANNEL in $CHANNELS; do
72+
MINOR=$(julia +${CHANNEL} --version 2>/dev/null | sed 's/julia version \([0-9]*\.[0-9]*\).*/\1/')
73+
if [ -z "$MINOR" ]; then
74+
echo "[dev.sh] Could not determine version for channel ${CHANNEL}, skipping."
75+
continue
76+
fi
77+
echo "[dev.sh] Updating Manifest-v${MINOR}.toml (channel: ${CHANNEL})..."
78+
rm -f "$BACKEND_DIR/Manifest-v${MINOR}.toml"
79+
touch "$BACKEND_DIR/Manifest-v${MINOR}.toml"
80+
(cd "$BACKEND_DIR" && julia +${CHANNEL} --project=. -e 'using Pkg; Pkg.resolve(); Pkg.instantiate()')
81+
done
82+
exit 0
83+
fi
84+
6485
# ============================================================================
6586
# Prerequisite checks
6687
# ============================================================================
@@ -102,11 +123,16 @@ if [ ! -d "$FRONTEND_DIR/node_modules" ]; then
102123
(cd "$FRONTEND_DIR" && npm install)
103124
fi
104125

105-
# --- Backend: Julia Pkg.instantiate ---
126+
# --- Backend: Julia Pkg setup ---
127+
128+
JULIA_MINOR=$(echo "$JULIA_VERSION" | sed 's/\([0-9]*\.[0-9]*\).*/\1/')
129+
VERSIONED_MANIFEST="$BACKEND_DIR/Manifest-v${JULIA_MINOR}.toml"
106130

107-
if [ ! -f "$BACKEND_DIR/Manifest.toml" ]; then
108-
echo "[dev.sh] Instantiating Julia backend dependencies..."
109-
(cd "$BACKEND_DIR" && julia --project=. -e 'using Pkg; Pkg.instantiate()')
131+
if [ ! -f "$VERSIONED_MANIFEST" ] || [ "$BACKEND_DIR/Project.toml" -nt "$VERSIONED_MANIFEST" ]; then
132+
echo "[dev.sh] Resolving Julia backend dependencies for v${JULIA_MINOR}..."
133+
rm -f "$VERSIONED_MANIFEST"
134+
touch "$VERSIONED_MANIFEST"
135+
(cd "$BACKEND_DIR" && julia --project=. -e 'using Pkg; Pkg.resolve(); Pkg.instantiate()')
110136
fi
111137

112138
# ============================================================================

frontend/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "grs-frontend",
33
"private": true,
4-
"version": "0.1.1",
4+
"version": "0.1.2",
55
"type": "module",
66
"scripts": {
77
"dev": "vite",

tauri-app/Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tauri-app/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "GRS-App"
3-
version = "0.1.1"
3+
version = "0.1.2"
44
description = "Gene Regulatory Systems"
55
authors = ["nifets", "lmshk"]
66
license = ""

0 commit comments

Comments
 (0)