-
Notifications
You must be signed in to change notification settings - Fork 10
Bugfix: gluecode model options #113
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.
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
Merged
cfrontin
merged 36 commits into
NLRWindSystems:develop
from
cfrontin:bugfix/gluecode-model-options
Jul 21, 2025
Merged
Changes from all commits
Commits
Show all changes
36 commits
Select commit
Hold shift + click to select a range
7685a69
hotfix
cfrontin 86858a2
add the actual hotfix
cfrontin 9d34460
update all examples
cfrontin 3b86124
added example testing routine to test
cfrontin 4ba5fdb
adjust cwd command
cfrontin d9ce4e5
reorganize some examples
cfrontin 674f75b
attempt fix
cfrontin a72e3a5
black reformat, pip statsmodels again after their hotfix
cfrontin 63fd540
ok think i fixed it
cfrontin 95938e8
cleanup runner
cfrontin 88e6550
try system-agnostic runner
cfrontin 58ff31f
try system-agnostic runner again
cfrontin 3db2ebe
indent fix
cfrontin 1c3a2dc
turn off n2 diagrams
cfrontin 6e549a3
test consolidated CI/CD workflow
cfrontin eabcf3f
attempt improved consolidated script
cfrontin 7217283
direct parallel example runner test
cfrontin 4001df6
complete runner code
cfrontin 246d346
a new test that should maybe actually work
cfrontin 2b28d20
add missing file and quotation marks
cfrontin 1a3cd01
switch to consolidated with parallel examples
cfrontin dfa6a3b
rectify author attribution in pyproject.toml
cfrontin 907ab41
remove commented dependency
cfrontin e36651a
cleaner gui interaction
cfrontin 5bf6c49
modified consolidated tests
cfrontin ee8e656
faster consolidated ci/cd
cfrontin 95c2999
rollback action
cfrontin e38c972
take 2 on caching
cfrontin 5c4f7c4
update dependency
cfrontin eef64fb
slight bugfix mod
cfrontin 84473d8
try cache again
cfrontin 7500e48
iterating on cicd cache
cfrontin d85bf4f
reorder
cfrontin 0339136
rename
cfrontin 73e0c85
address some of jareds comments and remove commented code
cfrontin 1f6f947
black reformat
cfrontin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,205 @@ | ||
| name: CI/CD test suite | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - '*' | ||
| pull_request: | ||
| branches: | ||
| - '*' | ||
|
|
||
| jobs: | ||
|
|
||
| setup-install: | ||
| name: Setup and install Ard | ||
| strategy: | ||
| matrix: | ||
| python-version: [3.12] # ["3.10", "3.11", "3.12", "3.13"] | ||
| os: [macos-latest, ubuntu-latest, windows-latest] | ||
| include: | ||
| - os: ubuntu-latest | ||
| path: ~/.cache/pip | ||
| - os: macos-latest | ||
| path: ~/Library/Caches/pip | ||
| - os: windows-latest | ||
| path: ~\AppData\Local\pip\Cache | ||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@v4 | ||
| - name: Cache dependencies | ||
| id: cache | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: ${{ matrix.path }} | ||
| key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }} | ||
| restore-keys: | ||
| ${{ runner.os }}-pip- | ||
| - name: Set up Python ${{ matrix.python-version }} | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
| - name: Install dependencies | ||
| run: | | ||
| python -m pip install --upgrade pip | ||
| - name: Install Ard | ||
| run: | | ||
| pip install .[dev] | ||
|
|
||
| test-unit: | ||
| name: Run unit tests | ||
| needs: setup-install | ||
| strategy: | ||
| matrix: | ||
| python-version: [3.12] # ["3.10", "3.11", "3.12", "3.13"] | ||
| os: [macos-latest, ubuntu-latest, windows-latest] | ||
| include: | ||
| - os: ubuntu-latest | ||
| path: ~/.cache/pip | ||
| - os: macos-latest | ||
| path: ~/Library/Caches/pip | ||
| - os: windows-latest | ||
| path: ~\AppData\Local\pip\Cache | ||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@v4 | ||
| - name: Set up Python ${{ matrix.python-version }} | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
| - name: Get cache dependencies | ||
| id: cache | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: ${{ matrix.path }} | ||
| key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }} | ||
| restore-keys: | ||
| ${{ runner.os }}-pip- | ||
| - name: Install dependencies | ||
| run: | | ||
| python -m pip install --upgrade pip | ||
| - name: Install Ard | ||
| run: | | ||
| pip install .[dev] | ||
| - name: Run unit tests with coverage | ||
| run: | | ||
| pytest --cov=ard --cov-fail-under=80 test/unit | ||
|
|
||
| test-system: | ||
| name: Run system tests | ||
| needs: test-unit | ||
| strategy: | ||
| matrix: | ||
| python-version: [3.12] # ["3.10", "3.11", "3.12", "3.13"] | ||
| os: [macos-latest, ubuntu-latest, windows-latest] | ||
| include: | ||
| - os: ubuntu-latest | ||
| path: ~/.cache/pip | ||
| - os: macos-latest | ||
| path: ~/Library/Caches/pip | ||
| - os: windows-latest | ||
| path: ~\AppData\Local\pip\Cache | ||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@v4 | ||
| - name: Set up Python ${{ matrix.python-version }} | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
| - name: Get cache dependencies | ||
| id: cache | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: ${{ matrix.path }} | ||
| key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }} | ||
| restore-keys: | ||
| ${{ runner.os }}-pip- | ||
| - name: Install dependencies | ||
| run: | | ||
| python -m pip install --upgrade pip | ||
| - name: Install Ard | ||
| run: | | ||
| pip install .[dev] | ||
| - name: Run system tests with coverage | ||
| run: | | ||
| pytest --cov=ard --cov-fail-under=50 test/system | ||
| # pytest --cov=ard --cov-fail-under=80 test/system | ||
|
|
||
| find-examples: | ||
| name: Find all examples | ||
| needs: [test-unit, test-system] | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@v4 | ||
| - name: Set up Python ${{ matrix.python-version }} | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
| - name: Find example python scripts | ||
| id: find_scripts | ||
| run: | | ||
| echo "scripts<<EOF" >> $GITHUB_OUTPUT | ||
| find examples -mindepth 2 -maxdepth 2 -name "*.py" | jq -R -s -c 'split("\n")[:-1]' >> $GITHUB_OUTPUT | ||
| echo "EOF" >> $GITHUB_OUTPUT | ||
| outputs: | ||
| scripts: ${{ steps.find_scripts.outputs.scripts }} | ||
|
|
||
| test-examples: | ||
| name: Run all examples | ||
| needs: find-examples | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| python-version: [3.12] # ["3.10", "3.11", "3.12", "3.13"] | ||
| os: [macos-latest, ubuntu-latest, windows-latest] | ||
| include: | ||
| - os: ubuntu-latest | ||
| path: ~/.cache/pip | ||
| - os: macos-latest | ||
| path: ~/Library/Caches/pip | ||
| - os: windows-latest | ||
| path: ~\AppData\Local\pip\Cache | ||
| script: ${{fromJson(needs.find-examples.outputs.scripts)}} | ||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@v4 | ||
| - name: Set up Python ${{ matrix.python-version }} | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
| - name: Get cache dependencies | ||
| id: cache | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: ${{ matrix.path }} | ||
| key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }} | ||
| restore-keys: | ||
| ${{ runner.os }}-pip- | ||
| - name: Install dependencies | ||
| run: | | ||
| python -m pip install --upgrade pip | ||
| - name: Install Ard | ||
| run: | | ||
| pip install .[dev] | ||
| - name: Run examples | ||
| shell: python | ||
| run: | | ||
| import os | ||
| import pathlib | ||
| import subprocess | ||
|
|
||
| env = os.environ.copy() | ||
| env["MPLBACKEND"] = "Agg" # Non-interactive backend | ||
|
|
||
| path_script = pathlib.Path("${{ matrix.script }}").absolute() | ||
| print(f"RUNNING {path_script}") | ||
| subprocess.run( | ||
| ["python", str(path_script.name)], | ||
| check=True, | ||
| cwd=str(path_script.parent), | ||
| env=env, | ||
| ) | ||
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
16 changes: 0 additions & 16 deletions
16
examples/01-iea-wind-740-10-rowp/inputs/ard/ard_system.yaml
This file was deleted.
Oops, something went wrong.
Empty file.
14 changes: 0 additions & 14 deletions
14
examples/01-iea-wind-740-10-rowp/inputs/data/IEA37_10MW_turbine.yaml
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.