Skip to content

Commit d19533e

Browse files
authored
Merge branch 'main' into dependabot/github_actions/actions/cache-5
2 parents 5f9a56a + 0be48e8 commit d19533e

105 files changed

Lines changed: 9868 additions & 4294 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.JETLSConfig.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
formatter = "JuliaFormatter"
2+
3+
[full_analysis]
4+
auto_instantiate = false # boolean, default: true
5+
6+
[diagnostic]
7+
all_files = false # boolean, default: true

.github/workflows/CI.yml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
version:
25-
- '1.10'
25+
- 'lts'
2626
- '1'
2727
os:
2828
- ubuntu-latest
@@ -40,9 +40,6 @@ jobs:
4040
version: 1
4141
build_is_production_build: true
4242
steps:
43-
- name: Install matplotlib
44-
run: if [ "$RUNNER_OS" = "Linux" ]; then sudo apt-get install -y python3-matplotlib; fi
45-
shell: bash
4643
- uses: actions/checkout@v4
4744
- uses: julia-actions/setup-julia@v2
4845
with:
@@ -71,31 +68,33 @@ jobs:
7168
fail-fast: false
7269
matrix:
7370
julia_version:
74-
- "1.10"
75-
- "1.11"
76-
- "pre"
71+
- "lts"
72+
- "1"
7773
julia_arch:
7874
- x64
7975
os:
8076
- ubuntu-latest
8177
runs-on: ${{ matrix.os }}
8278
steps:
83-
- name: Install matplotlib
84-
run: if [ "$RUNNER_OS" = "Linux" ]; then sudo apt-get install -y python3-matplotlib; fi
85-
shell: bash
8679
- uses: actions/checkout@v4
8780
- uses: julia-actions/setup-julia@v2
8881
with:
8982
arch: ${{ matrix.julia_arch }}
9083
version: ${{ matrix.julia_version }}
9184
- uses: julia-actions/cache@v2
9285
- uses: julia-actions/julia-buildpkg@v1
93-
- name: Build PyCall
94-
run: julia --project -e 'ENV["PYTHON"]=""; using Pkg; Pkg.instantiate(); Pkg.add("PyCall"); Pkg.build("PyCall")'
95-
shell: bash
9686
- uses: julia-actions/julia-runtest@v1
9787
env:
9888
BUILD_IS_PRODUCTION_BUILD: false
89+
- name: Install matplotlib
90+
run: sudo apt-get install -y python3-matplotlib
91+
- name: Build PyCall with system Python
92+
run: julia -e 'ENV["PYTHON"]="python3"; using Pkg; Pkg.add("PyCall"); Pkg.build("PyCall")'
93+
- uses: julia-actions/julia-runtest@v1
94+
env:
95+
JULIA_NUM_THREADS: 1
96+
with:
97+
test_args: 'plot-controlplots'
9998
- uses: julia-actions/julia-processcoverage@v1
10099
- uses: codecov/codecov-action@v5
101100
with:
@@ -109,9 +108,6 @@ jobs:
109108
steps:
110109
- uses: actions/checkout@v4
111110
- uses: julia-actions/setup-julia@v2
112-
- name: Build PyCall
113-
run: julia --project=docs/ -e 'ENV["PYTHON"]=""; using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate(); Pkg.build("PyCall")'
114-
shell: bash
115111
- uses: julia-actions/cache@v2
116112
- uses: julia-actions/julia-buildpkg@v1
117113

.github/workflows/setup-test.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Setup Test
2+
on:
3+
pull_request:
4+
branches:
5+
- main
6+
types: [opened, synchronize, reopened, ready_for_review]
7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.ref }}
9+
cancel-in-progress: true
10+
jobs:
11+
setup-test:
12+
name: Test end-user and developer setup
13+
if: github.event.pull_request.draft == false
14+
runs-on: ubuntu-latest
15+
timeout-minutes: 40
16+
steps:
17+
- uses: actions/checkout@v4
18+
- uses: julia-actions/setup-julia@v2
19+
with:
20+
version: '1'
21+
- uses: julia-actions/cache@v2
22+
- name: Install xvfb for headless GLMakie
23+
run: sudo apt-get update && sudo apt-get install -y xvfb
24+
- name: Run setup tests
25+
run: bash test/test_setup.sh

.gitignore

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Manifest.toml
1+
Manifest*.toml
22
.vscode/settings.json
33
venv
44
results/TUDELFT_V3_LEI_KITE/polars/$C_L$ vs $C_D$.pdf
@@ -7,5 +7,27 @@ results/TUDELFT_V3_LEI_KITE/polars/tutorial_testing_stall_model_n_panels_54_dist
77
docs/build/
88
results/TUDELFT_V3_LEI_KITE/polars/tutorial_testing_stall_model_n_panels_54_distribution_SPLIT_PROVIDED.pdf
99
!test/data/*.bin
10-
Manifest-v1.11.toml
11-
Manifest-v1.10.toml
10+
CLAUDE.md
11+
12+
# Claude Code sandbox artifacts
13+
.bash_profile
14+
.bashrc
15+
.gitconfig
16+
.gitmodules
17+
.profile
18+
.ripgreprc
19+
.zprofile
20+
.zshrc
21+
HEAD
22+
config
23+
objects
24+
refs
25+
hooks
26+
27+
# IDE / tool configs
28+
.claude/
29+
.idea/
30+
.mcp.json
31+
.vscode/
32+
.vscode
33+
.idea

.zenodo.json

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"title": "VortexStepMethod.jl",
3+
"description": "Aerodynamic models of 3D wings using the Vortex Step Method.",
4+
"upload_type": "software",
5+
"license": "MIT",
6+
"access_right": "open",
7+
"creators": [
8+
{
9+
"name": "Cayon, Oriol",
10+
"orcid": "0000-0002-2065-8673"
11+
},
12+
{
13+
"name": "Poland, Jelle Agatho Wilhelm",
14+
"orcid": "0000-0003-3164-5648"
15+
},
16+
{
17+
"name": "van de Lint, Bart"
18+
},
19+
{
20+
"name": "Fechner, Uwe"
21+
}
22+
],
23+
"keywords": [
24+
"Airborne Wind Energy",
25+
"AWE",
26+
"AWES",
27+
"Vortex Step Method",
28+
"Julia"
29+
],
30+
"related_identifiers": [
31+
{
32+
"identifier": "10.3390/en16073061",
33+
"relation": "isSupplementTo",
34+
"resource_type": "publication-article"
35+
}
36+
]
37+
}

CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ title: "VortexStepMethod.jl"
1515
keywords:
1616
- Airborne Wind Energy, AWE, AWES, Vortex step methods
1717
version: 1.0.0
18-
# doi: "11.1111/11111"
19-
# date-released: YYYY-MM-DD
18+
doi: "10.5281/zenodo.XXXXX"
19+
date-released: "YYYY-MM-DD"
2020
license: MIT
2121
url: "https://github.com/OpenSourceAWE/VortexStepMethod.jl"
2222
preferred-citation:

0 commit comments

Comments
 (0)