Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

install pyoculus from git and f90wrap from pypi #445

Merged
merged 1 commit into from
Sep 12, 2024
Merged

install pyoculus from git and f90wrap from pypi #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .github/workflows/extensive_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
- name: Install python dependencies
run: |
sudo apt-get install graphviz graphviz-dev
pip install wheel "numpy<2.0.0" scipy f90nml h5py scikit-build cmake qsc sympy pyevtk matplotlib ninja plotly networkx pygraphviz ground bentley_ottmann
pip install wheel "numpy<2.0.0" scipy f90nml h5py scikit-build cmake qsc sympy pyevtk matplotlib ninja plotly networkx pygraphviz ground bentley_ottmann f90wrap

- name: Install booz_xform
if: contains(matrix.packages, 'vmec') || contains(matrix.packages, 'all')
Expand All @@ -125,9 +125,6 @@ jobs:
pip install -e SPEC/Utilities/pythontools
python -c "import py_spec; print('success')"

- name: Install f90wrap
run: pip install -U git+https://github.com/zhucaoxiang/f90wrap

- name: Build SPEC python wrapper.
if: contains(matrix.packages, 'spec') || contains(matrix.packages, 'all')
run: |
Expand Down Expand Up @@ -166,8 +163,9 @@ jobs:
- name: Install simsopt package
if: contains(matrix.packages, 'spec') || contains(matrix.packages, 'all')
run: |
pip install -v git+https://github.com/zhisong/pyoculus
pip install -v .
pip install mpi4py py_spec pyoculus h5py
pip install mpi4py py_spec h5py

- name: Install simsopt package
if: contains(matrix.packages, 'none')
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,10 @@ jobs:
- name: Install python dependencies
run: |
sudo apt-get install graphviz graphviz-dev
pip install "numpy<2.0.0" cmake scikit-build f90nml ninja wheel setuptools sympy qsc pyevtk matplotlib plotly networkx pygraphviz mpi4py py_spec pyoculus h5py ground bentley_ottmann
pip install "numpy<2.0.0" cmake scikit-build f90nml ninja wheel setuptools sympy qsc pyevtk matplotlib plotly networkx pygraphviz mpi4py py_spec h5py ground bentley_ottmann f90wrap

- name: Install pyoculus
run: pip install -v git+https://github.com/zhisong/pyoculus

- name: Install booz_xform
run: pip install -v git+https://github.com/hiddenSymmetries/booz_xform
Expand Down Expand Up @@ -128,9 +131,6 @@ jobs:
pip install -e SPEC/Utilities/pythontools
python -c "import py_spec; print('success')"

- name: Install f90wrap
run: pip install -U git+https://github.com/zhucaoxiang/f90wrap

- name: Build SPEC python wrapper.
run: |
cd SPEC
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ RUN git clone --depth 1 https://github.com/hiddenSymmetries/VMEC2000.git /src/VM
cp cmake/machines/ubuntu.json cmake_config_file.json && \
/venv/bin/pip install -v . 2>&1 | tee vmec_build.log

RUN /venv/bin/pip install pyoculus
RUN /venv/bin/pip install git+https://github.com/zhisong/pyoculus
RUN /venv/bin/pip install vtk==9.2.6 pyqt5 matplotlib pyevtk plotly
RUN /venv/bin/pip install mayavi
RUN /venv/bin/pip install git+https://github.com/hiddenSymmetries/booz_xform
Expand Down
2 changes: 1 addition & 1 deletion ci/singularity.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Stage: devel
cd .. && \
rm -rf VMEC2000

/venv/bin/pip install pyoculus
/venv/bin/pip install git+https://github.com/zhisong/pyoculus
/venv/bin/pip install vtk==9.2.6 pyqt5 matplotlib pyevtk plotly
/venv/bin/pip install mayavi
/venv/bin/pip install git+https://github.com/hiddenSymmetries/booz_xform
Expand Down
Loading