mirror of
https://github.com/Akkudoktor-EOS/EOS.git
synced 2026-08-25 17:56:37 +00:00
fix: default server settings prevent env var config (#1234)
Change configuration source priorities to: - cli - environment vars - dotenv settings - config file settings - init settings By this the environment vars supersede any configuration var provided by the configuration file or by the initialisation with pydantic. The test_config.py::test_computed_path was fixed to to not use the defaul env var overwrite defined by conftest.py. This seemed to indicate non working env vars, but in fact was a test setupt fault. Besides this fix there are other fixes and changes added: * fix: exclude computed fields when merging settings Pydantic may overwrite settings by values given for computed fields and use these values instead of re-computing the field. Avoid computed fields in merging settings. * chore: improve Windows compatability of development setup Improve scripts to better run also on Windows. When doing path checks keep compatibility also to Windows pathes. A lot of changes to avoid the famous Windows CRLF handling and keep line endings to LF. * chore: add development hint for Windows Windows developers should set core.autocrlf to false. * chore: update version Signed-off-by: b0661 <b0661n0e17e@gmail.com>
This commit is contained in:
@@ -45,15 +45,15 @@ help:
|
||||
@echo " prepare-version - Prepare a version defined in setup.py."
|
||||
|
||||
# Target to create a version.txt
|
||||
# Uses pure python write to version.txt to circumvent Windows specific echo handling (which fails).
|
||||
.PHONY: version-txt
|
||||
version-txt:
|
||||
# Get the version from the package for setuptools (and pip)
|
||||
VERSION=$$(${PYTHON} scripts/get_version.py)
|
||||
@echo "$(VERSION)" > version.txt
|
||||
@$(PYTHON) -c "from pathlib import Path; Path('version.txt').write_text('$(VERSION)', encoding='utf-8')"
|
||||
@echo "version.txt set to '$(VERSION)'."
|
||||
|
||||
# Target to install EOS in editable form (development mode) into virtual environment.
|
||||
# Upgrades installation and dependencies
|
||||
install: version-txt
|
||||
# Upgrade installation and dependencies
|
||||
$(UV) sync --extra dev
|
||||
@echo "EOS version $(VERSION) installed in editable form (development mode)."
|
||||
|
||||
|
||||
Reference in New Issue
Block a user