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

Jump to bottom

Add missing requirements.txt to oscillator and oscillator-overlap tutorial #556

Merged
merged 3 commits into from
Aug 29, 2024
Merged

Add missing requirements.txt to oscillator and oscillator-overlap tutorial #556

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa820d0
Add requirements to oscillator tutorial
NiklasVin Aug 19, 2024
48a0a04
Apply suggestions from code review
BenjaminRodenberg Aug 29, 2024
14c80f7
Update run.sh and add requirements.txt for overlapping oscillator.
BenjaminRodenberg Aug 29, 2024
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
2 changes: 2 additions & 0 deletions oscillator/mass-left-python/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
numpy >1, <2
pyprecice~=3.0
BenjaminRodenberg marked this conversation as resolved.
Show resolved Hide resolved
BenjaminRodenberg marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 4 additions & 0 deletions oscillator/mass-left-python/run.sh
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case, we have the solver in ../solver-python.
Would it make sense to create the requirements.txt and the venv there, to avoid duplication?

Copy link
Member

@BenjaminRodenberg BenjaminRodenberg Aug 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that's a good point that could also save us a lot of implementation & maintainment work in #547.

Let's do the following here: Let's get this PR merged with the structure as it is. Moving requirements.txt and the venv into the solver is a general thing that we should discuss in #574 and then solve consistently (maybe even for the nutils cases). I'll add a comment there.

Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#!/usr/bin/env bash
set -e -u

python3 -m venv .venv
. .venv/bin/activate
pip install -r requirements.txt

. ../../tools/log.sh
exec > >(tee --append "$LOGFILE") 2>&1

Expand Down
2 changes: 2 additions & 0 deletions oscillator/mass-right-python/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
numpy >1, <2
pyprecice~=3.0
BenjaminRodenberg marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 4 additions & 0 deletions oscillator/mass-right-python/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#!/usr/bin/env bash
set -e -u

python3 -m venv .venv
. .venv/bin/activate
pip install -r requirements.txt

. ../../tools/log.sh
exec > >(tee --append "$LOGFILE") 2>&1

Expand Down