Skip to content

Commit 7ca955f

Browse files
Prepare Release v2.5.0
Prepare Release
2 parents fabdad4 + addc47c commit 7ca955f

File tree

145 files changed

+12075
-11754
lines changed

Some content is hidden

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

145 files changed

+12075
-11754
lines changed

.github/CODEOWNER

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @FZJ-IEK3-VSA/fine-reviewers
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Push dev to Jugit
2+
on:
3+
workflow_dispatch:
4+
push:
5+
branches: ["develop"]
6+
jobs:
7+
build:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v4
11+
with:
12+
repository: FZJ-IEK3-VSA/FINE
13+
fetch-depth: 0
14+
- name: Push To Gitlab
15+
env:
16+
token: ${{ secrets.GITLAB_ACCESS_TOKEN }}
17+
run: |
18+
echo Starting to push repo to gitlab
19+
git config user.name "julian-belina-auto-commit"
20+
git config user.email "j.belina@fz-juelich.de"
21+
echo user name and email are set
22+
git fetch
23+
git switch develop
24+
echo "Checkout complete"
25+
echo start to push
26+
git push --force https://push_to_jugit:${{ secrets.GITLAB_ACCESS_TOKEN }}@jugit.fz-juelich.de/iek-3/shared-code/fine.git develop
27+
echo push done
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Push master to Jugit
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches: ["master"]
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v4
13+
with:
14+
repository: FZJ-IEK3-VSA/FINE
15+
fetch-depth: 0
16+
- name: Push To Gitlab
17+
env:
18+
token: ${{ secrets.GITLAB_ACCESS_TOKEN }}
19+
run: |
20+
echo Starting to push repo to gitlab
21+
git config user.name "julian-belina-auto-commit"
22+
git config user.email "j.belina@fz-juelich.de"
23+
echo user name and email are set
24+
git fetch
25+
git switch master
26+
echo "Checkout complete"
27+
echo start to push
28+
git push --force https://push_to_jugit:${{ secrets.GITLAB_ACCESS_TOKEN }}@jugit.fz-juelich.de/iek-3/shared-code/shared-code/fine.git master
29+
echo push done

.github/workflows/test.yml

Lines changed: 0 additions & 89 deletions
This file was deleted.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Check code formatting and Linter hints
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches: ["**"]
7+
pull_request:
8+
branches: ["develop"]
9+
10+
jobs:
11+
ruff:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v4
15+
- uses: astral-sh/ruff-action@v3
16+
with:
17+
args: "--version"
18+
version: "0.13.1"
19+
- name: Check Linter
20+
run: ruff check --output-format=github --config=pyproject.toml fine
21+
# Needs to be activated to resolve issue https://github.com/FZJ-IEK3-VSA/FINE/issues/100
22+
- name: Check Format
23+
24+
run: ruff format --diff --config pyproject.toml
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
on:
2+
workflow_dispatch:
3+
# push:
4+
# branches: ["485_test_dependency_range_new_release"]
5+
pull_request:
6+
branches: ["master"]
7+
8+
jobs:
9+
TestPushCondaForgeDev:
10+
name: Test conda-forge development version on ${{ matrix.runner_tag }} for geopandas=${{ matrix.geopandas_version }}
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
# runner_tag: ["ubuntu-latest", "windows-latest"]
15+
runner_tag: ["self-hosted"]
16+
geopandas_version: [
17+
"0.12.0",
18+
"0.12.1",
19+
"0.12.2",
20+
# "0.13.0", fails
21+
"0.13.1",
22+
"0.13.2",
23+
"0.14.0",
24+
"0.14.1",
25+
"0.14.2",
26+
"0.14.3",
27+
"0.14.4",
28+
]
29+
uses: FZJ-IEK3-VSA/.github/.github/workflows/_run_single_conda_forge_test.yml@main
30+
with:
31+
runner_tag: ${{ matrix.runner_tag }}
32+
requirements_file_name: requirements_dev.yml
33+
ipynb_example_folder: "examples"
34+
library_name: "geopandas"
35+
library_version: ${{ matrix.geopandas_version }}
36+
dependency_position_env_file: "2"
37+
38+
# We decided not to test old dependency ranges on PyPI as there are many known incompatabilities
39+
# of indirect dependencies. There is no method known to us to automatically test, store share this information
40+
# TestPushPyPIDev:
41+
# name: Test PyPi development version on ${{ matrix.runner_tag }} for numpy=${{ matrix.geopandas_version }}
42+
# strategy:
43+
# fail-fast: false
44+
# matrix:
45+
# runner_tag: ["self-hosted"]
46+
# # rasterio: ["2.3","2.2","2.1","2.0","1.26","1.25","1.24","1.23","1.22"]
47+
# rasterio: ["2.3","2.2"]
48+
# uses: FZJ-IEK3-VSA/.github/.github/workflows/_run_single_pypi_test.yml@main
49+
# with:
50+
# runner_tag: ${{ matrix.runner_tag }}
51+
# ipynb_example_folder: "examples"
52+
# python_version: "3.13"
53+
# optional_dependency_PyPI_tag: "[develop]"
54+
# additional_conda_forge_dependencies: "glpk"
55+
# library_name: "numpy"
56+
# library_version: ${{ matrix.geopandas_version }}
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
on:
2+
workflow_dispatch:
3+
# push:
4+
# branches: ["485_test_dependency_range_new_release"]
5+
pull_request:
6+
branches: ["master"]
7+
8+
jobs:
9+
TestPushCondaForgeDev:
10+
name: Test conda-forge development version on ${{ matrix.runner_tag }} for glpk=${{ matrix.glpk_version }}
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
# runner_tag: ["ubuntu-latest", "windows-latest"]
15+
runner_tag: ["self-hosted"]
16+
glpk_version: ["4.63", "4.65", "5.0"]
17+
uses: FZJ-IEK3-VSA/.github/.github/workflows/_run_single_conda_forge_test.yml@main
18+
with:
19+
runner_tag: ${{ matrix.runner_tag }}
20+
requirements_file_name: requirements_dev.yml
21+
ipynb_example_folder: "examples"
22+
library_name: "glpk"
23+
library_version: ${{ matrix.glpk_version }}
24+
dependency_position_env_file: "3"
25+
26+
# We decided not to test old dependency ranges on PyPI as there are many known incompatabilities
27+
# of indirect dependencies. There is no method known to us to automatically test, store share this information
28+
# TestPushPyPIDev:
29+
# name: Test PyPi development version on ${{ matrix.runner_tag }} for numpy=${{ matrix.glpk_version }}
30+
# strategy:
31+
# fail-fast: false
32+
# matrix:
33+
# runner_tag: ["self-hosted"]
34+
# # rasterio: ["2.3","2.2","2.1","2.0","1.26","1.25","1.24","1.23","1.22"]
35+
# rasterio: ["2.3","2.2"]
36+
# uses: FZJ-IEK3-VSA/.github/.github/workflows/_run_single_pypi_test.yml@main
37+
# with:
38+
# runner_tag: ${{ matrix.runner_tag }}
39+
# ipynb_example_folder: "examples"
40+
# python_version: "3.13"
41+
# optional_dependency_PyPI_tag: "[develop]"
42+
# additional_conda_forge_dependencies: "glpk"
43+
# library_name: "numpy"
44+
# library_version: ${{ matrix.glpk_version }}
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
on:
2+
workflow_dispatch:
3+
# push:
4+
# branches: ["485_test_dependency_range_new_release"]
5+
pull_request:
6+
branches: ["master"]
7+
8+
jobs:
9+
TestPushCondaForgeDev:
10+
name: Test conda-forge development version on ${{ matrix.runner_tag }} for gurobi-logtools=${{ matrix.gurobi_logtools_version }}
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
# runner_tag: ["ubuntu-latest", "windows-latest"]
15+
runner_tag: ["self-hosted"]
16+
gurobi_logtools_version: ["3.0.0", "3.1.0", "3.2.0"]
17+
uses: FZJ-IEK3-VSA/.github/.github/workflows/_run_single_conda_forge_test.yml@main
18+
with:
19+
runner_tag: ${{ matrix.runner_tag }}
20+
requirements_file_name: requirements_dev.yml
21+
ipynb_example_folder: "examples"
22+
library_name: "gurobi-logtools"
23+
library_version: ${{ matrix.gurobi_logtools_version }}
24+
dependency_position_env_file: "18"
25+
26+
# We decided not to test old dependency ranges on PyPI as there are many known incompatabilities
27+
# of indirect dependencies. There is no method known to us to automatically test, store share this information
28+
# TestPushPyPIDev:
29+
# name: Test PyPi development version on ${{ matrix.runner_tag }} for numpy=${{ matrix.gurobi_logtools_version }}
30+
# strategy:
31+
# fail-fast: false
32+
# matrix:
33+
# runner_tag: ["self-hosted"]
34+
# # rasterio: ["2.3","2.2","2.1","2.0","1.26","1.25","1.24","1.23","1.22"]
35+
# rasterio: ["2.3","2.2"]
36+
# uses: FZJ-IEK3-VSA/.github/.github/workflows/_run_single_pypi_test.yml@main
37+
# with:
38+
# runner_tag: ${{ matrix.runner_tag }}
39+
# ipynb_example_folder: "examples"
40+
# python_version: "3.13"
41+
# optional_dependency_PyPI_tag: "[develop]"
42+
# additional_conda_forge_dependencies: "glpk"
43+
# library_name: "numpy"
44+
# library_version: ${{ matrix.gurobi_logtools_version }}
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
on:
2+
workflow_dispatch:
3+
# push:
4+
# branches: ["485_test_dependency_range_new_release"]
5+
pull_request:
6+
branches: ["master"]
7+
8+
jobs:
9+
TestPushCondaForgeDev:
10+
name: Test conda-forge development version on ${{ matrix.runner_tag }} for netcdf4=${{ matrix.netcdf4_version }}
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
# runner_tag: ["ubuntu-latest", "windows-latest"]
15+
runner_tag: ["self-hosted"]
16+
netcdf4_version:
17+
[
18+
"1.5.8",
19+
"1.6.0",
20+
"1.6.1",
21+
"1.6.2",
22+
"1.6.3",
23+
"1.6.4",
24+
"1.6.5",
25+
"1.7.1",
26+
"1.7.2",
27+
"1.7.3",
28+
]
29+
uses: FZJ-IEK3-VSA/.github/.github/workflows/_run_single_conda_forge_test.yml@main
30+
with:
31+
runner_tag: ${{ matrix.runner_tag }}
32+
requirements_file_name: requirements_dev.yml
33+
ipynb_example_folder: "examples"
34+
library_name: "netcdf4"
35+
library_version: ${{ matrix.netcdf4_version }}
36+
dependency_position_env_file: "14"
37+
38+
# We decided not to test old dependency ranges on PyPI as there are many known incompatabilities
39+
# of indirect dependencies. There is no method known to us to automatically test, store share this information
40+
# TestPushPyPIDev:
41+
# name: Test PyPi development version on ${{ matrix.runner_tag }} for numpy=${{ matrix.netcdf4_version }}
42+
# strategy:
43+
# fail-fast: false
44+
# matrix:
45+
# runner_tag: ["self-hosted"]
46+
# # rasterio: ["2.3","2.2","2.1","2.0","1.26","1.25","1.24","1.23","1.22"]
47+
# rasterio: ["2.3","2.2"]
48+
# uses: FZJ-IEK3-VSA/.github/.github/workflows/_run_single_pypi_test.yml@main
49+
# with:
50+
# runner_tag: ${{ matrix.runner_tag }}
51+
# ipynb_example_folder: "examples"
52+
# python_version: "3.13"
53+
# optional_dependency_PyPI_tag: "[develop]"
54+
# additional_conda_forge_dependencies: "glpk"
55+
# library_name: "numpy"
56+
# library_version: ${{ matrix.netcdf4_version }}

0 commit comments

Comments
 (0)