Skip to content

Commit

Permalink
Stop using local JULIAUP_DEPOT_PATH
Browse files Browse the repository at this point in the history
  • Loading branch information
visr committed Jul 5, 2024
1 parent 1a61e35 commit 12ea12e
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 7 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ dmypy.json
build/tests/temp/
python/ribasim_api/tests/temp/
report.xml
/utils/juliaup

# Designated working dir for working on Ribasim models
models/
Expand Down
3 changes: 1 addition & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true,
"julia.lint.disabledDirs": [
".pixi",
"utils/juliaup"
".pixi"
],
"julia.lint.run": true
}
2 changes: 1 addition & 1 deletion pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ test-ribasim-api = "pytest --basetemp=python/ribasim_api/tests/temp --junitxml=r

[feature.dev.tasks]
# Installation
install-julia = "juliaup add 1.10.4 && juliaup default 1.10.4"
install-julia = "juliaup add 1.10.4 && juliaup override set 1.10.4"
install-pre-commit = "pre-commit install"
install-ci = { depends_on = ["install-julia", "update-registry-julia"] }
install = { depends_on = [
Expand Down
1 change: 0 additions & 1 deletion utils/env_setup.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
set JULIAUP_DEPOT_PATH=%~dp0
set QUARTO_PYTHON=python

setlocal EnableDelayedExpansion
Expand Down
2 changes: 0 additions & 2 deletions utils/env_setup.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#!/bin/bash
JULIAUP_DEPOT_PATH=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
export JULIAUP_DEPOT_PATH
QUARTO_PYTHON=python
export QUARTO_PYTHON
relative_conda_prefix=$(realpath --relative-to="$PWD" "$CONDA_PREFIX")
Expand Down

0 comments on commit 12ea12e

Please sign in to comment.