flixopt 2.1.10__tar.gz → 2.2.0__tar.gz

{flixopt-2.1.10 → flixopt-2.2.0}/CHANGELOG.md

@@ -4,6 +4,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 Formatting is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) & [Gitmoji](https://gitmoji.dev).
 For more details regarding the individual PRs and contributors, please refer to our [GitHub releases](https://github.com/flixOpt/flixopt/releases).
 
+---
+
 <!-- This text won't be rendered
 Note: The CI will automatically append a "What's Changed" section to the changelog for github releases.
 This contains all commits, PRs, and contributors.
@@ -58,14 +60,51 @@ Please keep the format of the changelog consistent with the other releases, so t
 ### 📦 Dependencies
 
 ### 📝 Docs
-- Improved CHANGELOG.md formatting by adding better categories and formating by Gitmoji.
-- Added a script to extract the release notes from the CHANGELOG.md file for better organized documentation.
 
 ### 👷 Development
 
 ### 🚧 Known Issues
 
 Until here -->
+
+## [2.2.0] - 2025-10-11
+**Summary:** This release is a Configuration and Logging management release.
+
+### ✨ Added
+- Added `CONFIG.reset()` method to restore configuration to default values
+- Added configurable log file rotation settings: `CONFIG.Logging.max_file_size` and `CONFIG.Logging.backup_count`
+- Added configurable log format settings: `CONFIG.Logging.date_format` and `CONFIG.Logging.format`
+- Added configurable console settings: `CONFIG.Logging.console_width` and `CONFIG.Logging.show_path`
+- Added `CONFIG.Logging.Colors` nested class for customizable log level colors using ANSI escape codes (works with both standard and Rich handlers)
+
+### ♻️ Changed
+- Logging and Configuration management changed
+
+### 🗑️ Deprecated
+- `change_logging_level()` function is now deprecated in favor of `CONFIG.Logging.level` and `CONFIG.apply()`. Will be removed in version 3.0.0.
+
+### 🔥 Removed
+- Removed unused `config.merge_configs` function from configuration module
+
+### 👷 Development
+- Greatly expanded test coverage for `config.py` module
+- Added `@pytest.mark.xdist_group` to `TestConfigModule` tests to prevent global config interference
+
+---
+
+## [2.1.11] - 2025-10-05
+**Summary:** Important bugfix in `Storage` leading to wrong results due to incorrect discharge losses.
+
+### ♻️ Changed
+- Using `h5netcdf` instead of `netCDF4` for dataset I/O operations. This follows the update in `xarray==2025.09.01`
+
+### 🐛 Fixed
+- Fix `charge_state` Constraint in `Storage` leading to incorrect losses in discharge and therefore incorrect charge states and discharge values.
+
+### 📦 Dependencies
+- Updated `renovate.config` to treat CalVer packages (xarray and dask) with more care
+- Updated packaging configuration
+
 ---
 
 ## [2.1.10] - 2025-09-29

flixopt-2.2.0/MANIFEST.in

@@ -0,0 +1,26 @@
+# Include essential files from source distribution
+include LICENSE
+include README.md
+include CHANGELOG.md
+include pyproject.toml
+
+# Include package source and data
+recursive-include flixopt *.py *.yaml
+
+# Exclude everything else
+global-exclude *.pyc *.pyo __pycache__
+prune .github
+prune docs
+prune examples
+prune tests
+prune pics
+prune scripts
+prune build
+prune dist
+prune .venv
+prune venv
+exclude .gitignore
+exclude .pre-commit-config.yaml
+exclude renovate.json
+exclude mkdocs.yml
+exclude test_package.sh

{flixopt-2.1.10/flixopt.egg-info → flixopt-2.2.0}/PKG-INFO

@@ -1,16 +1,15 @@
 Metadata-Version: 2.4
 Name: flixopt
-Version: 2.1.10
+Version: 2.2.0
 Summary: Vector based energy and material flow optimization framework in Python.
 Author-email: "Chair of Building Energy Systems and Heat Supply, TU Dresden" <peter.stange@tu-dresden.de>, Felix Bumann <felixbumann387@gmail.com>, Felix Panitz <baumbude@googlemail.com>, Peter Stange <peter.stange@tu-dresden.de>
 Maintainer-email: Felix Bumann <felixbumann387@gmail.com>, Peter Stange <peter.stange@tu-dresden.de>
-License: MIT License
+License-Expression: MIT
 Project-URL: homepage, https://tu-dresden.de/ing/maschinenwesen/iet/gewv/forschung/forschungsprojekte/flixopt
 Project-URL: repository, https://github.com/flixOpt/flixopt
 Project-URL: documentation, https://flixopt.github.io/flixopt/
 Keywords: optimization,energy systems,numerical analysis
 Classifier: Development Status :: 3 - Alpha
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -18,7 +17,6 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering
-Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -26,7 +24,7 @@ Requires-Dist: numpy<3,>=1.21.5
 Requires-Dist: pandas<3,>=2.0.0
 Requires-Dist: xarray<2026.0,>=2024.2.0
 Requires-Dist: linopy<0.6,>=0.5.1
-Requires-Dist: netcdf4<2,>=1.6.1
+Requires-Dist: h5netcdf<2,>=1.0.0
 Requires-Dist: pyyaml<7,>=6.0.0
 Requires-Dist: rich<15,>=13.0.0
 Requires-Dist: tomli<3,>=2.0.1; python_version < "3.11"
@@ -55,10 +53,10 @@ Provides-Extra: dev
 Requires-Dist: pytest==8.4.2; extra == "dev"
 Requires-Dist: pytest-xdist==3.8.0; extra == "dev"
 Requires-Dist: nbformat==5.10.4; extra == "dev"
-Requires-Dist: ruff==0.13.0; extra == "dev"
+Requires-Dist: ruff==0.13.2; extra == "dev"
 Requires-Dist: pre-commit==4.3.0; extra == "dev"
 Requires-Dist: pyvis==0.3.2; extra == "dev"
-Requires-Dist: tsam==2.3.1; extra == "dev"
+Requires-Dist: tsam==2.3.9; extra == "dev"
 Requires-Dist: scipy==1.15.1; extra == "dev"
 Requires-Dist: gurobipy==12.0.3; extra == "dev"
 Requires-Dist: dash==3.0.0; extra == "dev"
@@ -67,7 +65,7 @@ Requires-Dist: dash-daq==0.6.0; extra == "dev"
 Requires-Dist: networkx==3.0.0; extra == "dev"
 Requires-Dist: werkzeug==3.0.0; extra == "dev"
 Provides-Extra: docs
-Requires-Dist: mkdocs-material==9.6.19; extra == "docs"
+Requires-Dist: mkdocs-material==9.6.20; extra == "docs"
 Requires-Dist: mkdocstrings-python==1.18.2; extra == "docs"
 Requires-Dist: mkdocs-table-reader-plugin==3.1.0; extra == "docs"
 Requires-Dist: mkdocs-gen-files==0.5.0; extra == "docs"

{flixopt-2.1.10 → flixopt-2.2.0}/flixopt/__init__.py

@@ -35,5 +35,3 @@ from .commons import (
     results,
     solvers,
 )
-
-CONFIG.load_config()

{flixopt-2.1.10 → flixopt-2.2.0}/flixopt/calculation.py

@@ -91,13 +91,13 @@ class Calculation:
                     model.label_of_element: float(model.size.solution)
                     for component in self.flow_system.components.values()
                     for model in component.model.all_sub_models
-                    if isinstance(model, InvestmentModel) and float(model.size.solution) >= CONFIG.modeling.EPSILON
+                    if isinstance(model, InvestmentModel) and float(model.size.solution) >= CONFIG.Modeling.epsilon
                 },
                 'Not invested': {
                     model.label_of_element: float(model.size.solution)
                     for component in self.flow_system.components.values()
                     for model in component.model.all_sub_models
-                    if isinstance(model, InvestmentModel) and float(model.size.solution) < CONFIG.modeling.EPSILON
+                    if isinstance(model, InvestmentModel) and float(model.size.solution) < CONFIG.Modeling.epsilon
                 },
             },
             'Buses with excess': [

{flixopt-2.1.10 → flixopt-2.2.0}/flixopt/components.py

@@ -791,7 +791,7 @@ class StorageModel(ComponentModel):
                 charge_state.isel(time=slice(1, None))
                 == charge_state.isel(time=slice(None, -1)) * ((1 - rel_loss) ** hours_per_step)
                 + charge_rate * eff_charge * hours_per_step
-                - discharge_rate * eff_discharge * hours_per_step,
+                - discharge_rate * hours_per_step / eff_discharge,
                 name=f'{self.label_full}|charge_state',
             ),
             'charge_state',