Skip to content

Commit 32ec757

Browse files
committed
updated devcontainer, made a .OLD for LSP stuff, thats moved to DEMIURGE (for the MSC LSP in OCAML).
1 parent 2dd4be4 commit 32ec757

File tree

9 files changed

+17
-29
lines changed

9 files changed

+17
-29
lines changed

.devcontainer/devcontainer.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"settings": {
77
"terminal.integrated.defaultProfile.linux": "bash",
88
"editor.formatOnSave": true,
9-
"python.pythonPath": "~/.pyenv/versions/3.13.0/bin/python",
9+
"python.defaultInterpreterPath": ".venv/bin/python",
1010
"python.linting.enabled": true,
1111
"python.linting.ruffEnabled": true,
1212
"editor.defaultFormatter": "ms-python.black-formatter"
@@ -21,7 +21,6 @@
2121
}
2222
},
2323
"postCreateCommand": "bash .devcontainer/provisioning.sh && bash .devcontainer/setup.sh && cp .devcontainer/.bashrc ~/.bashrc && source ~/.bashrc && pip install -e . || true",
24-
"postStartCommand": "jupyter-lab --ip=0.0.0.0 --no-browser --allow-root",
2524
"forwardPorts": [8000, 8888, 8341],
2625
"runArgs": ["--network=host"],
2726
"onCreateCommand": "if [ \"$CODESPACES\" = \"true\" ]; then echo 'In Codespaces: Running minimal setup'; else bash .devcontainer/provisioning.sh; fi || true",
@@ -32,8 +31,5 @@
3231
"ghcr.io/devcontainers/features/python:1": {
3332
"version": "3.13"
3433
}
35-
},
36-
"remoteEnv": {
37-
"OLLAMA_SERVER": "http://host.docker.internal:11434"
3834
}
39-
}
35+
}

.devcontainer/docker-compose-override.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

.devcontainer/setup.sh

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,18 @@
22
# /.devcontainer/setup.sh
33
set -e # Exit on any error
44

5-
echo "Setting up the Demiurge dev environment..."
5+
echo "Setting up the Morphological-Source-Code dev environment..."
66

7-
# Load the correct .env file based on the current branch
7+
# UNUSED::Seperate .env for each branch
88
BRANCH=$(git rev-parse --abbrev-ref HEAD)
99
if [[ "$BRANCH" == "staging" ]]; then
10-
cp /config/staging.env .env
11-
elif [[ "$BRANCH" == "main" ]]; then
12-
cp /config/production.env .env
10+
cp env.example .env
11+
elif [[ "$BRANCH" == "development" ]]; then
12+
cp env.example .env
13+
elif [[ "$BRANCH" == "production" ]]; then
14+
cp env.example .env
1315
else
14-
cp /config/dev.env .env
16+
cp env.example .env
1517
fi
1618

1719
# Install Python dependencies and set up the environment
@@ -21,13 +23,13 @@ uv install --extra dev
2123
uv run -m jupyterlab --generate-config
2224

2325
# Create a Jupyter kernel for this environment
24-
uv run -m ipykernel install --user --name=cognosis
26+
uv run -m ipykernel install --user --name=morphological
2527

26-
# Init JupyterLab
27-
uv run --with jupyter jupyter lab --ip=0.0.0.0 --port=8888 --allow-root
28-
29-
# Run nox to execute predefined tasks like tests and linting
30-
uv run -m nox -s tests # Runs the tests session defined in the noxfile.py
28+
# Run tests first (they might fail fast)
29+
uv run -m nox -s tests
3130

3231
# Optional: Add any additional setup steps here
33-
echo "Demiurge development environment setup is complete."
32+
33+
echo "Starting JupyterLab..."
34+
echo "Setup complete. JupyterLab will start now."
35+
exec uv run --with jupyter jupyter lab --ip=0.0.0.0 --port=8888 --allow-root
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)