Skip to content

Commit 2fa3ba9

Browse files
julian-belinaJohannesBehrensNilsLudwigjenszimmertLana535
authored
Prepare Release v2.6.0
* Update push_master_to_gitlab.yml * correct link to JuGit repository * Use pathlib in example 8b instead of os * path os * ruff format * remove deprecated methods Removed: * exploitOutput * storage.intraSOCstart * utils.checkParamInput * utils.setFormattedTimeSeries * utils.checkInvestmentPeriodsCommodityConversion * utils.checkTimeUnit * utils.equalStrings * fixed warning in tests * adjust ruff check in pipeline and readme (#508) * fixed indexing * ruff * ruff 2.0 * updated to geopandas >= 1 (#524) Co-authored-by: h.wenzel <you@example.com> * Update macOS Version in CI Pipelines * Update ci * Test for new dependency ranges * Update minimum dependency ranges * Remove comma * Remove xarray * increment netcdf4 dependency * Bug fix for binaryOperation2_ Constraint (#522) * include bigM into binaryOperation2_ constraint * ruff formatting * Replace division by bigM with multiplication of binary variable with 1e-4 to ensure numeric feasibility for high bigMs --------- Co-authored-by: Julian Belina <56728940+julian-belina@users.noreply.github.com> * 499 docstring of balancelimit (#523) * Improved documentation of balanceLimit * ruff formatting * Update docstring --------- Co-authored-by: Jonas <jonasbecker0708@gmail.com> Co-authored-by: Julian Belina <56728940+julian-belina@users.noreply.github.com> Co-authored-by: j.behrens <j.behrens@fz-juelich.de> * Add code badge * fix read the docs build (#537) * fix read the docs build * ruff * 95 clean up codebase (#553) * started revision of TODOs in codebase. the checking and setting of locationalEligibility does not work at the moment - needs revision! * closed further ToDos. 7 which are not totally clear are missing * deleted outcommented unnecessary code * further clean up * revised none comparisons and type checks (replaced type== by isinstance) --------- Co-authored-by: h.wenzel <you@example.com> * Xarray517 (#542) * two different operation types (total and annual) correctly implemented, tests remaining * added operation_annual to each component class, tests run, issue should be solved * all tests run through * ruff check * ruff check complete * deleted comments in xarryIO * removed the commented out codes --------- Co-authored-by: Bernhard Wortmann <b.wortmann@fz-juelich.de> Co-authored-by: p.dunkel <p.dunkel@fz-juelich.de> Co-authored-by: Philipp Dunkel <89200680+phil-fzj@users.noreply.github.com> * fixed wrong coordinates in xarray output of transmission components (#543) * fixed wrong coordinates in xarray output of transmission components * added a test that checks the dimension names of the xarray output and confirms that they are as expected & adapted output path handling for text_xarrayio * changed dimension naming convention in xarray to make it more understandable: location, time (previously space, time) for all non-transmission components; locationIn, locationOut, time (previously space, space_2, time) for transmission components --------- Co-authored-by: Philipp Dunkel <89200680+phil-fzj@users.noreply.github.com> Co-authored-by: p.dunkel <p.dunkel@fz-juelich.de> * 213 ramping (#511) * Add inter-period ramping constraints to Conversion class and tests * Ramping now works when using time series aggregation --------- Co-authored-by: Nils Ludwig <n.ludwig@fz-juelich.de> Co-authored-by: Bernhard Wortmann <b.wortmann@fz-juelich.de> Co-authored-by: Julian Belina <56728940+julian-belina@users.noreply.github.com> Co-authored-by: Philipp Dunkel <89200680+phil-fzj@users.noreply.github.com> Co-authored-by: p.dunkel <p.dunkel@fz-juelich.de> * 507 extend ruff coverage and create missing docstrings (#527) * extended ruff coverage to all relevant files * removed noqua statements where possible * extended docstrings --------- Co-authored-by: Jonas <jonasbecker0708@gmail.com> Co-authored-by: Julian Belina <56728940+julian-belina@users.noreply.github.com> Co-authored-by: Jonas-fzj <j.becker@fz-juelich.de> Co-authored-by: Philipp Dunkel <89200680+phil-fzj@users.noreply.github.com> * Simplify CI testing, test from single source of truth, implement renovate * Update requirement file name * Update python version extraction * Try to make fewer skipped jobs * Ignore some dependencies * Update renovate * Update geopandas version constraints and add package rules for dependency management * add branch selection explicitly * Update renovate configuration to widen range strategy and disable vulnerability alerts * Update dependency matplotlib to <=3.10.8 (#573) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency pandas to v2.3.3 (#575) * Update dependency pandas to v2.3.3 * Update pandas version constraint in requirements_dev.yml --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: JohannesBehrens <120372257+JohannesBehrens@users.noreply.github.com> * Update dependency numpy to v2.4.2 (#574) * Update dependency numpy to v2.4.2 * Update numpy version and fix documentation typo --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: JohannesBehrens <120372257+JohannesBehrens@users.noreply.github.com> * Update dependency pyomo to v6.10.0 * Update dependency xarray to v2026 (#579) * Update dependency xarray to v2026 * Fix xarray version and typos in pyproject.toml configuration * Update xarray version constraints in requirements_dev.yml --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: JohannesBehrens <120372257+JohannesBehrens@users.noreply.github.com> * Update dependency scikit-learn to v1.8.0 * Update dependency psutil to v7.2.2 (#576) * Update dependency psutil to v7.2.2 * Update psutil version range in requirements_dev.yml --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: JohannesBehrens <120372257+JohannesBehrens@users.noreply.github.com> * Update dependency netcdf4 to v1.7.4 (#580) * Update dependency netcdf4 to v1.7.4 * Update netcdf4 version constraint in requirements_dev.yml --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: JohannesBehrens <120372257+JohannesBehrens@users.noreply.github.com> * Update dependency rasterio to v1.5.0 * Update scikit-learn version in requirements_dev.yml * Update pyomo version range in requirements_dev.yml * Update rasterio version constraint in pyproject.toml * Update rasterio version constraint in requirements_dev.yml * Update dependency scipy to v1.17.1 * Update requirements_dev.yml * Migrate config .github/renovate.json * Update renovate.json to modify ignored dependencies Removed several dependencies from the ignore list. * Update regex match string in renovate.json for dependency versioning * Update dependency pytest to <=8.4.2 * Update dependency pytest-xdist to <=3.8.0 * Update dependency ipykernel to v7 * Update dependency pytest to v9 * Add multiprocessing to all workflows * Update dependency pytest-cov to v7 * Update dependency pwlf to v2.5.2 * Update dependency python to v3.14.3 * Update dependency python to v3.14.3 * Switch to uv in testing * lower maximum python version due to tsam incompatability * Bump version from 2.5.0 to 2.6.0 --------- Co-authored-by: JohannesBehrens <120372257+JohannesBehrens@users.noreply.github.com> Co-authored-by: NilsLudwig <80832724+NilsLudwig@users.noreply.github.com> Co-authored-by: jenszimmert <j.zimmert@fz-juelich.de> Co-authored-by: Lana Söltzer <l.soeltzer@fz-juelich.de> Co-authored-by: Philipp Dunkel <89200680+phil-fzj@users.noreply.github.com> Co-authored-by: h.wenzel <you@example.com> Co-authored-by: H-Wenzel <146360304+H-Wenzel@users.noreply.github.com> Co-authored-by: Jonas-fzj <j.becker@fz-juelich.de> Co-authored-by: Jonas <jonasbecker0708@gmail.com> Co-authored-by: j.behrens <j.behrens@fz-juelich.de> Co-authored-by: k-okosun <k.okosun@fz-juelich.de> Co-authored-by: Bernhard Wortmann <b.wortmann@fz-juelich.de> Co-authored-by: p.dunkel <p.dunkel@fz-juelich.de> Co-authored-by: Nils Ludwig <n.ludwig@fz-juelich.de> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 parent 7ca955f commit 2fa3ba9

File tree

82 files changed

+5884
-3582
lines changed

Some content is hidden

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

82 files changed

+5884
-3582
lines changed

.github/renovate.json

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"config:recommended"
5+
],
6+
"schedule": [
7+
"after 10pm on tuesday",
8+
"before 6am on wednesday"
9+
],
10+
"rangeStrategy": "widen",
11+
"vulnerabilityAlerts": {
12+
"enabled": false
13+
},
14+
"osvVulnerabilityAlerts": false,
15+
"enabledManagers": [
16+
"pep621",
17+
"custom.regex"
18+
],
19+
"pep621": {
20+
"managerFilePatterns": [
21+
"/(^|/)pyproject\\.toml$/"
22+
]
23+
},
24+
"customManagers": [
25+
{
26+
"customType": "regex",
27+
"managerFilePatterns": [
28+
"/(^|/)requirements_dev\\.yml$/"
29+
],
30+
"matchStrings": [
31+
"- (?<depName>[a-zA-Z0-9_.-]+)[^\\n]*?(?<currentValue><=\\d[^\\n,]*)"
32+
],
33+
"packageNameTemplate": "conda-forge/{{{depName}}}",
34+
"datasourceTemplate": "conda",
35+
"versioningTemplate": "pep440"
36+
}
37+
],
38+
"ignoreDeps": [
39+
"sphinx",
40+
"sphinx_rtd_theme",
41+
"myst-parser",
42+
"sphinx-rtd-theme",
43+
"ruff",
44+
],
45+
"packageRules": [
46+
{
47+
"matchManagers": [
48+
"pep621",
49+
"custom.regex"
50+
],
51+
"groupName": "{{depName}}"
52+
}
53+
]
54+
}

.github/workflows/push_master_to_gitlab.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ jobs:
2525
git switch master
2626
echo "Checkout complete"
2727
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
28+
git push --force https://push_to_jugit:${{ secrets.GITLAB_ACCESS_TOKEN }}@jugit.fz-juelich.de/iek-3/shared-code/fine.git master
2929
echo push done

.github/workflows/test_code_formatting.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,12 @@ jobs:
1111
ruff:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v6
1515
- uses: astral-sh/ruff-action@v3
1616
with:
1717
args: "--version"
1818
version: "0.13.1"
1919
- 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
20+
run: ruff check --output-format=github --config=pyproject.toml
2221
- name: Check Format
23-
24-
run: ruff format --diff --config pyproject.toml
22+
run: ruff format --diff --config=pyproject.toml

.github/workflows/test_geopandas_versions.yml

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

.github/workflows/test_glpk_versions.yml

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

.github/workflows/test_gurobi_logtools_versions.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
on:
2+
workflow_dispatch:
3+
inputs:
4+
library:
5+
description: "Dependency library name to test (e.g. numpy)"
6+
required: true
7+
type: string
8+
min_version:
9+
description: "Minimum (lower-bound) version to test (optional)"
10+
required: false
11+
type: string
12+
default: ""
13+
max_version:
14+
description: "Maximum (upper-bound) version to test (optional)"
15+
required: false
16+
type: string
17+
default: ""
18+
runner_tag:
19+
description: "Runner to execute the tests on (e.g. self-hosted, ubuntu-latest)"
20+
required: true
21+
type: string
22+
default: "self-hosted"
23+
ref:
24+
description: "Branch to check out and use for workflows"
25+
required: false
26+
type: string
27+
default: "develop"
28+
29+
jobs:
30+
# Resolve the line position of the library inside requirements_dev.yml so
31+
# the test workflow knows which entry to override.
32+
extract-position:
33+
uses: FZJ-IEK3-VSA/.github/.github/workflows/_extract_env_versions.yml@main
34+
with:
35+
library_name: ${{ inputs.library }}
36+
env_file: requirements_dev.yml
37+
38+
# Query conda-forge for all versions of the library within the given bounds
39+
# and produce a matrix ready for _run_single_conda_forge_test.yml.
40+
query-versions:
41+
needs: extract-position
42+
uses: FZJ-IEK3-VSA/.github/.github/workflows/_query_conda_forge_versions.yml@main
43+
with:
44+
package_name: ${{ inputs.library }}
45+
min_version: ${{ inputs.min_version }}
46+
max_version: ${{ inputs.max_version }}
47+
dependency_position_env_file: ${{ needs.extract-position.outputs.dependency_position }}
48+
requirements_file_name: requirements_dev.yml
49+
50+
TestManualVersions:
51+
name: "Test ${{ matrix.library_name }} ${{ matrix.library_version }}"
52+
needs: query-versions
53+
if: needs.query-versions.outputs.matrix_json != '[]'
54+
strategy:
55+
fail-fast: false
56+
matrix:
57+
include: ${{ fromJSON(needs.query-versions.outputs.matrix_json) }}
58+
uses: FZJ-IEK3-VSA/.github/.github/workflows/_run_single_conda_forge_test.yml@main
59+
with:
60+
runner_tag: ${{ inputs.runner_tag }}
61+
requirements_file_name: ${{ matrix.requirements_file_name }}
62+
ipynb_example_folder: "examples"
63+
library_name: ${{ matrix.library_name }}
64+
library_version: ${{ matrix.library_version }}
65+
dependency_position_env_file: ${{ matrix.dependency_position_env_file }}
66+
multiprocessing_pytest_string: "-n auto"
67+
multiprocessing_example_string: "-n auto"

.github/workflows/test_netcdf4_versions.yml

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

.github/workflows/test_numpy_versions.yml

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

0 commit comments

Comments
 (0)