Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e636c23
Python modules: Changed `__ALL__` to `__all__` (lowercase, PEP8 and P…
ClaasRostock Apr 9, 2026
742e202
Updated CHANGELOG.md
ClaasRostock Apr 9, 2026
0b49b69
Updated to dictIO>=0.4.4
ClaasRostock Apr 9, 2026
6ceb98d
Updated to types-lxml>=2026.2
ClaasRostock Apr 9, 2026
75838d1
Updated to sphinx-argparse-cli>=1.21.3
ClaasRostock Apr 9, 2026
2f91c3c
Updated to numpy>=2.4
ClaasRostock Apr 9, 2026
f784277
Updated to pytest-cov>=7.1
ClaasRostock Apr 9, 2026
30b15ac
Updated to scipy>=1.17.1
ClaasRostock Apr 9, 2026
ce801e5
Updated to ruff>=0.15.9
ClaasRostock Apr 9, 2026
8639d60
Updated to ospx>=0.3.5
ClaasRostock Apr 9, 2026
d8f7808
.pre-commit-config.yaml: Updated rev of ruff-pre-commit to v0.15.9
ClaasRostock Apr 9, 2026
3a107d2
Updated CHANGELOG.md
ClaasRostock Apr 9, 2026
3e4f218
updated files in root folder with latest changes in python_project_te…
ClaasRostock Apr 9, 2026
d567679
updated uv.lock
ClaasRostock Apr 9, 2026
1b66eb7
updated GitHub workflows with latest changes in python_project_templa…
ClaasRostock Apr 9, 2026
bb479f7
updated Visual Studio Code settings with latest changes in python_pro…
ClaasRostock Apr 9, 2026
cc91267
src/farn/__init__.py: Adapted import statements, using `__all__` for …
ClaasRostock Apr 9, 2026
c56482b
Breaking:
ClaasRostock Apr 9, 2026
a80ca3e
updated files in /tests with latest changes in python_project_templat…
ClaasRostock Apr 9, 2026
a3effc7
removed `__all__` variable in __init__.py files of sub-packages, as r…
ClaasRostock Apr 9, 2026
65df05f
ruff.toml: Added ruff `format.preview` setting to optionally enable p…
ClaasRostock Apr 9, 2026
cb28512
tests/test_cases.py: ruff format
ClaasRostock Apr 9, 2026
db17279
updated Sphinx documentation with latest changes in python_project_te…
ClaasRostock Apr 9, 2026
5a3d25a
updated CHANGELOG.md
ClaasRostock Apr 9, 2026
2f48bc4
Updated to ospx>=0.3.5
ClaasRostock Apr 9, 2026
24b3441
updated uv.lock
ClaasRostock Apr 9, 2026
c857262
ruff format
ClaasRostock Apr 9, 2026
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
36 changes: 13 additions & 23 deletions .github/workflows/_build_and_publish_documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,72 +12,62 @@ jobs:
name: Build and publish documentation in combined version (farn, dictIO, ospx)
runs-on: ubuntu-latest
steps:
# Checkout farn (active branch)
- name: Checkout farn (active branch)
- name: Checkout active branch
uses: actions/checkout@v5
with:
lfs: true
- name: prepare farn
# ---- BEGIN: Extra steps to merge the documentation of the sub-packages dictIO and ospx into the farn documentation ----
- name: Copy farn README and CHANGELOG to docs/source
run: |
cp -v -f README.md docs/source/README_farn.md
cp -v -f CHANGELOG.md docs/source/CHANGELOG_farn.md
sed -i '1 s/Changelog/farn/' docs/source/CHANGELOG_farn.md

# Create temporary subfolders to hold the checked out sub-packages
- name: Create temporary subfolders
- name: Create temporary subfolders for dictIO and ospx
run: |
mkdir dictIO
mkdir ospx

# Checkout dictIO (same branch as the one that triggered the workflow here in farn)
- name: Checkout dictIO (same branch as in farn)
uses: actions/checkout@v5
with:
lfs: true
repository: 'dnv-opensource/dictIO'
ref: ${{github.ref}}
path: dictIO
lfs: true
- name: Prepare dictIO
- name: Copy dictIO README and CHANGELOG to docs/source
run: |
rm -rf dictIO/.git/
cp -v -f dictIO/README.md dictIO/docs/source/README_dictIO.md
cp -v -f dictIO/CHANGELOG.md dictIO/docs/source/CHANGELOG_dictIO.md
sed -i '1 s/Changelog/dictIO/' dictIO/docs/source/CHANGELOG_dictIO.md

# Checkout ospx (same branch as the one that triggered the workflow here in farn)
- name: Checkout ospx (same branch as in farn)
uses: actions/checkout@v5
with:
lfs: true
repository: 'dnv-opensource/ospx'
ref: ${{github.ref}}
path: ospx
lfs: true
- name: Prepare ospx
- name: Copy ospx README and CHANGELOG to docs/source
run: |
rm -rf ospx/.git/
cp -v -f ospx/README.md ospx/docs/source/README_ospx.md
cp -v -f ospx/CHANGELOG.md ospx/docs/source/CHANGELOG_ospx.md
sed -i '1 s/Changelog/ospx/' ospx/docs/source/CHANGELOG_ospx.md

# merge sub-packages into root
- name: merge sub-packages
- name: Merge sub-packages dictIO and ospx into root
run: |
cp -v -n -r dictIO/* .
cp -v -n -r ospx/* .

# replace TOC files by its combined versions
- name: replace TOC files
- name: replace TOC files in docs/source by its combined versions
run: |
cp -v -f docs/source/combined/* docs/source
rm -v -r docs/source/combined

# ---- END: Extra steps to merge the documentation of the sub-packages dictIO and ospx into the farn documentation ----
- name: Install uv
uses: astral-sh/setup-uv@v7
with:
enable-cache: true
cache-dependency-glob: "uv.lock"
cache-dependency-glob: 'uv.lock'
- name: Install the project
run: uv sync -U
run: uv sync --frozen
- name: Print debugging information
run: |
echo "github.ref:" ${{github.ref}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout active branch
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
lfs: true
- name: Install uv
uses: astral-sh/setup-uv@v5
uses: astral-sh/setup-uv@v7
with:
enable-cache: true
cache-dependency-glob: "uv.lock"
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version-file: "pyproject.toml"
cache-dependency-glob: 'uv.lock'
- name: Install the project
run: uv sync --upgrade
run: uv sync --frozen
- name: Print debugging information
run: |
echo "github.ref:" ${{github.ref}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_build_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: astral-sh/setup-uv@v7
with:
enable-cache: true
cache-dependency-glob: "uv.lock"
cache-dependency-glob: 'uv.lock'
- name: Build source distribution and wheels
run: uv build
- name: Check build artifacts
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/_code_quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: astral-sh/setup-uv@v7
with:
enable-cache: true
cache-dependency-glob: "uv.lock"
cache-dependency-glob: 'uv.lock'
- name: Install the project
run: uv sync -U
- name: Run ruff format
Expand All @@ -29,7 +29,7 @@ jobs:
uses: astral-sh/setup-uv@v7
with:
enable-cache: true
cache-dependency-glob: "uv.lock"
cache-dependency-glob: 'uv.lock'
- name: Install the project
run: uv sync -U
- name: Run ruff check
Expand All @@ -45,7 +45,7 @@ jobs:
uses: astral-sh/setup-uv@v7
with:
enable-cache: true
cache-dependency-glob: "uv.lock"
cache-dependency-glob: 'uv.lock'
- name: Install the project
run: uv sync -U
- name: Run pyright
Expand All @@ -61,7 +61,7 @@ jobs:
uses: astral-sh/setup-uv@v7
with:
enable-cache: true
cache-dependency-glob: "uv.lock"
cache-dependency-glob: 'uv.lock'
- name: Install the project
run: uv sync -U
- name: Run mypy
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ jobs:
name: Test (Python ${{ matrix.python }}, ${{ matrix.os }})
runs-on: ${{ matrix.os }}
strategy:
fail-fast: true
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python: ['3.11', '3.12', '3.13', '3.14']
Expand All @@ -17,7 +18,7 @@ jobs:
uses: astral-sh/setup-uv@v7
with:
enable-cache: true
cache-dependency-glob: "uv.lock"
cache-dependency-glob: 'uv.lock'
- name: Install the project
run: uv sync -p ${{ matrix.python }} -U --no-dev
- name: Run pytest
Expand Down
14 changes: 13 additions & 1 deletion .github/workflows/_test_future.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ jobs:
continue-on-error: true
runs-on: ${{ matrix.os }}
strategy:
fail-fast: true
matrix:
os: [ubuntu-latest, windows-latest]
python:
Expand All @@ -21,7 +22,18 @@ jobs:
uses: astral-sh/setup-uv@v7
with:
enable-cache: true
cache-dependency-glob: "uv.lock"
cache-dependency-glob: 'uv.lock'
- name: Remove Python upper version constraint from pyproject.toml
shell: pwsh
run: |
$File = Get-Item pyproject.toml
$Content = Get-Content $File -Raw
[regex]$RequiresPythonPattern = '(?<!-)(\brequires-python = "\s?[>=]{1,2}\s?\d+\.\d+\.?\d*\.?[\d\w]*\s?)(,\s?[<=]{1,2}\s?\d+\.?\d*\.?\d*\.?[\d\w]*\s?)?(")'
if ($Content -match $RequiresPythonPattern) {
$RequiresPythonFound = $Matches[0]
$RequiresPythonReplacement = $Matches[1] + $Matches[3]
$Content -Replace $RequiresPythonFound, $RequiresPythonReplacement | Set-Content $File -NoNewline
}
- name: Install the project
run: uv sync -p ${{ matrix.python.uvpy }} -U --no-dev
- name: Run pytest
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ ipython_config.py
# It is generally recommended to include `uv.lock` in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, `uv` might install dependencies in one environment that don't work in another.
# In such case, `uv.lock` should be added to `.gitignore`
# In such case, `uv.lock` should be added to `.gitignore` (and, as such, excluded from version control).
# uv.lock

# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repos:
- id: check-toml
- id: check-merge-conflict
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.15.1
rev: v0.15.9
hooks:
- id: ruff-format
- id: ruff-check
Expand Down
Loading
Loading