Skip to content
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

Jump to bottom

change the config merge/load order #27

Merged
merged 2 commits into from
Mar 1, 2023
Merged

change the config merge/load order #27

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
757350c
change the config merge/load order
emphasize Feb 28, 2023
24f73a3
fix merge test
emphasize Mar 1, 2023
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
2 changes: 1 addition & 1 deletion ovos_config/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ def load_all_configs(system_constraints=None):

configs = [Configuration.default, Configuration.system]
if not skip_remote:
configs.append(Configuration.remote)
configs.insert(1, Configuration.remote)
if not skip_user:
# deprecation warning
if isfile(OLD_USER_CONFIG):
Expand Down
2 changes: 1 addition & 1 deletion test/unittests/config_stack/default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ default_spec:
from_usr: False
test:
default: True
remote: False
system: False
user: False
remote: False
default_only: default
system:
protected_keys:
Expand Down
3 changes: 2 additions & 1 deletion test/unittests/config_stack/remote.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ system_only:
from_rem: True
from_usr: False
test:
user: False
remote: True
system: False
user: False
default_spec:
from_rem: True
remote_only: "remote"
2 changes: 0 additions & 2 deletions test/unittests/config_stack/system.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ default_spec:
test:
system: True
user: False
remote: False

system:
protected_keys:
remote:
Expand Down
1 change: 0 additions & 1 deletion test/unittests/config_stack/user.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ system_only:
from_usr: True
test:
user: True
remote: False
default_spec:
from_usr: True
user_only: True