Skip to content

Develop 1.1.7 #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jirivrany merged 2 commits into from
Oct 16, 2025
Merged

Develop 1.1.7 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f868a7
debug instance config
jirivrany Oct 16, 2025
24e35b0
v 1.1.7. - fixes instance config loading when installed as a package
jirivrany Oct 16, 2025
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
9 changes: 8 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to ExaFS will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.1.7] - 2025-10-16

### Fixed
- Fixed config loading to use Flask instance folder
- Resolves path issues when package is installed via pip

## [1.1.6] - 2025-10-08

### Fixed
Expand Down Expand Up @@ -268,4 +274,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[0.5.0]: https://github.com/CESNET/exafs/compare/v0.4.8...v0.5.0
[0.4.8]: https://github.com/CESNET/exafs/compare/v0.4.7...v0.4.8
[0.4.7]: https://github.com/CESNET/exafs/compare/v0.4.6...v0.4.7
[0.4.6]: https://github.com/CESNET/exafs/releases/tag/v0.4.6
[0.4.6]: https://github.com/CESNET/exafs/releases/tag/v0.4.6

2 changes: 1 addition & 1 deletion flowapp/__about__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "1.1.6"
__version__ = "1.1.7"
__title__ = "ExaFS"
__description__ = "Tool for creation, validation, and execution of ExaBGP messages."
__author__ = "CESNET / Jiri Vrany, Petr Adamec, Josef Verich, Jakub Man"
Expand Down
10 changes: 7 additions & 3 deletions flowapp/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
import os
from flask import Flask, redirect, render_template, session, url_for

from flask_sso import SSO
Expand All @@ -23,17 +24,20 @@


def create_app(config_object=None):
app = Flask(__name__)
# Enable instance_relative_config to use /app/instance folder
app = Flask(__name__, instance_relative_config=True)

# Load the default configuration for dashboard and main menu
app.config.from_object(InstanceConfig)
if config_object:
app.config.from_object(config_object)

# Allow override of instance config from external file
# This now looks in /app/instance/config_override.py instead of ../instance_config_override.py
try:
app.config.from_pyfile("../instance_config_override.py", silent=False)
except FileNotFoundError:
app.config.from_pyfile("config_override.py", silent=False)
except FileNotFoundError as e:
print(f"Instance config override file not found: {e.filename}, using defaults.")
pass # No override file, use defaults

app.config.setdefault("VERSION", __version__)
Expand Down