Skip to content

Commit fc96eda

Browse files
authored
Merge branch 'main' into new_eum
2 parents a564bd7 + c93b2eb commit fc96eda

File tree

121 files changed

+5645
-3342
lines changed

Some content is hidden

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

121 files changed

+5645
-3342
lines changed

.github/workflows/docs.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1313
- name: Set up Python
14-
uses: actions/setup-python@v4
14+
uses: actions/setup-python@v5
1515
with:
16-
python-version: 3.11
16+
python-version: 3.12
1717

1818
- name: Install dependencies
1919
run: |
@@ -32,3 +32,4 @@ jobs:
3232
with:
3333
github_token: ${{ secrets.GITHUB_TOKEN }}
3434
publish_dir: docs/_site/
35+

.github/workflows/downstream_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- name: Set up Python
15-
uses: actions/setup-python@v4
15+
uses: actions/setup-python@v5
1616
with:
17-
python-version: 3.9
17+
python-version: "3.10"
1818
- name: Install dependencies
1919
run: |
2020
python -m pip install --upgrade pip

.github/workflows/full_test.yml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,26 @@ name: Full test
55

66
on:
77
push:
8-
branches: [ main]
8+
branches: [main]
99
pull_request:
10-
branches: [ main ]
11-
10+
branches: [main]
1211

1312
jobs:
1413
build:
1514

16-
runs-on: ${{ matrix.os }}
15+
runs-on: ubuntu-latest
1716
strategy:
1817
matrix:
19-
os: [ubuntu-latest, windows-latest]
20-
python-version: [3.9, "3.12"]
18+
python-version: ["3.10", "3.13"]
2119

2220
steps:
23-
- uses: actions/checkout@v3
24-
- uses: chartboost/ruff-action@v1 # Fail fast if there are any linting errors
21+
- uses: actions/checkout@v4
22+
- uses: astral-sh/ruff-action@v2 # Fail fast if there are any linting errors
2523
with:
2624
version: 0.6.2 # consistent with pyproject.toml ?
2725
src: mikeio # ignore notebooks
2826
- name: Set up Python ${{ matrix.python-version }}
29-
uses: actions/setup-python@v4
27+
uses: actions/setup-python@v5
3028
with:
3129
python-version: ${{ matrix.python-version }}
3230
- name: Install dependencies
@@ -44,3 +42,13 @@ jobs:
4442
run: make doctest
4543
- name: Static type check
4644
run: make typecheck
45+
- name: Build package
46+
run: |
47+
pip install build wheel twine
48+
python -m build
49+
50+
- name: Upload build artifact
51+
uses: actions/upload-artifact@v4
52+
with:
53+
name: dist-${{matrix.python-version}}
54+
path: dist/*

.github/workflows/legacy_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717
- name: Set up Python
18-
uses: actions/setup-python@v4
18+
uses: actions/setup-python@v5
1919
with:
20-
python-version: 3.9
20+
python-version: "3.10"
2121

2222
- name: Install MIKE IO
2323
run: |

.github/workflows/notebooks_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
- name: Set up Python
19-
uses: actions/setup-python@v4
19+
uses: actions/setup-python@v5
2020
with:
21-
python-version: '3.9'
21+
python-version: "3.13"
2222
- name: Install mikeio
2323
run: |
2424
pip install .[test,notebooks]

.github/workflows/perf_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717
python-version: ["3.10"]
1818

1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
- name: Set up Python ${{ matrix.python-version }}
22-
uses: actions/setup-python@v4
22+
uses: actions/setup-python@v5
2323
with:
2424
python-version: ${{ matrix.python-version }}
2525
- name: Install dependencies

.github/workflows/python-publish.yml

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,52 @@ on:
99
workflow_dispatch:
1010

1111
jobs:
12-
deploy:
1312

13+
test:
14+
runs-on: ${{ matrix.os }}
15+
strategy:
16+
matrix:
17+
os: [ubuntu-latest, windows-latest]
18+
python-version: ["3.10", "3.13"]
19+
20+
steps:
21+
- uses: actions/checkout@v4
22+
- name: Set up Python ${{ matrix.python-version }}
23+
uses: actions/setup-python@v5
24+
with:
25+
python-version: ${{ matrix.python-version }}
26+
- name: Install dependencies
27+
run: |
28+
python -m pip install --upgrade pip
29+
pip install pytest
30+
31+
- name: Install mikeio
32+
run: |
33+
pip install .[test]
34+
- name: Test with pytest
35+
run: |
36+
pytest --ignore tests/performance/ --ignore tests/notebooks/ --disable-warnings
37+
38+
deploy:
39+
needs: test
1440
runs-on: ubuntu-latest
1541
permissions:
1642
# IMPORTANT: this permission is mandatory for trusted publishing
1743
id-token: write
1844

1945

2046
steps:
21-
- uses: actions/checkout@v3
47+
- uses: actions/checkout@v4
2248
- name: Set up Python
23-
uses: actions/setup-python@v4
49+
uses: actions/setup-python@v5
2450
with:
25-
python-version: '3.10'
51+
python-version: '3.13'
2652
- name: Install dependencies
2753
run: |
2854
python -m pip install --upgrade pip
2955
pip install build wheel twine
3056
- name: Install mikeio
3157
run: pip install .[test]
32-
- name: Test
33-
run: pytest
3458
- name: Build
3559
run: python -m build
3660
- name: Publish package distributions to PyPI

.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,10 @@ docs/api/
3535

3636
.testmondata
3737
objects.json
38-
.jupyter_cache/
38+
.jupyter_cache/
39+
40+
# direnv
41+
.envrc
42+
43+
# useful, but not sure if it should be in source control
44+
uv.lock

.pre-commit-config.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
repos:
2+
- repo: https://github.com/astral-sh/ruff-pre-commit
3+
# Ruff version.
4+
rev: v0.8.6
5+
hooks:
6+
# Run the linter.
7+
- id: ruff
8+
# Run the formatter.
9+
- id: ruff-format

MANIFEST.in

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)