Skip to content

Commit 2515f7d

Browse files
authored
Merge pull request #1002 from ProjectTorreyPines/magnetics
Update how equilibrium control points work
2 parents 527bdde + 5a86744 commit 2515f7d

File tree

16 files changed

+461
-341
lines changed

16 files changed

+461
-341
lines changed

.github/workflows/runtests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ jobs:
4141
fail-fast: false
4242
matrix:
4343
flavor:
44-
- { os: ubuntu-latest, arch: x64, version: "1.x" }
45-
- { os: macos-latest, arch: arm64, version: "1.x" }
46-
# - { os: windows-latest, arch: x86, version: "1.x" }
44+
- { os: ubuntu-latest, arch: x64, version: "1.11" }
45+
- { os: macos-latest, arch: arm64, version: "1.11" }
46+
# - { os: windows-latest, arch: x86, version: "1.11" }
4747
env:
4848
GKSwstype: 100 # disable Plots.jl interactive output
4949

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ DataFrames = "1"
9090
DelimitedFiles = "1"
9191
EGGO = "2.1"
9292
EPEDNN = "1"
93-
FRESCO = "0.6"
93+
FRESCO = "0.7"
9494
FileIO = "1"
9595
FixedPointAcceleration = "1.0.1"
9696
ForwardDiff = "0.10"
@@ -136,6 +136,6 @@ ThermalSystemModels = "1"
136136
TimerOutputs = "0.5"
137137
TroyonBetaNN = "1"
138138
TurbulentTransport = "1"
139-
VacuumFields = "4, 5"
139+
VacuumFields = "6"
140140
Weave = "0.10"
141141
YAML = "0.4"

docs/src/install.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,13 @@ For installation start your Julia interpreter by typing `julia` at the terminal,
5252

5353
1. You will need to [install `jupyter-lab`](https://jupyterlab.readthedocs.io/en/stable/getting_started/installation.html) if that's not already available on your system
5454

55+
!!! note
56+
The WebIO jupyter-lab extension is needed for the [`Interact.jl`](https://github.com/JuliaGizmos/Interact.jl?tab=readme-ov-file#usage) package to work.
57+
58+
Make sure WebIO is working with `jupyter labextension list`. If it is working properly, you should see something like: webio-jupyterlab-provider v0.1.0 enabled OK (python, webio_jupyter_extension). This can also be checked with `jupyter nbextension list`, which should show something like: webio-jupyter-nbextension/nbextension enabled.
59+
60+
If the extension has compatibility issues, install an older verision of Jupyter (eg. `conda install jupyterlab=3.6.7`). Also ensure that the WebIO and Interact packages are fully up-to-date, and restart the notebook session before testing that it works. Finally, it may be necessary to downgrade your system's version of Python - the recommended version for compatibility with Interact is 3.11.11.
61+
5562
1. Install the `IJulia` package by running:
5663

5764
```bash
@@ -65,13 +72,6 @@ For installation start your Julia interpreter by typing `julia` at the terminal,
6572

6673
This needs to be done every time a new version of Julia is installed.
6774

68-
!!! note
69-
The WebIO jupyter-lab extension is needed for the [`Interact.jl`](https://github.com/JuliaGizmos/Interact.jl?tab=readme-ov-file#usage) package to work.
70-
71-
Make sure WebIO is working with `jupyter labextension list`. If it is working properly, you should see something like: webio-jupyterlab-provider v0.1.0 enabled OK (python, webio_jupyter_extension). This can also be checked with `jupyter nbextension list`, which should show something like: webio-jupyter-nbextension/nbextension enabled.
72-
73-
If the extension has compatibility issues, consider installing an older verision of Jupyter (eg. `conda install jupyterlab=3.6.7`). Also ensure that the WebIO and Interact packages are fully up-to-date, and restart the notebook session before testing that it works. Finally, it may be necessary to downgrade your system's version of Python - the recommended version for compatibility with Interact is 3.11.11.
74-
7575
1. Start a new Jupyter-lab session (this should open a web-browser page with Jupyter running)
7676

7777
```bash

0 commit comments

Comments
 (0)