Skip to content

fix: update Config.read() signature (overrides, tags) #202

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

Open
kimbyungnam wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: update Config.read() signature (overrides, tags) #202

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
8ccda58
fix: update Config.read() signature (overrides, tags)
kimbyungnam Jan 14, 2026
450b00d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 14, 2026
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 .pre-commit/version_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Copyright (c) 2025 Jan Holthuis <jan.holthuis@rub.de>
# Copyright (c) 2026 Jan Holthuis <jan.holthuis@rub.de>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2025 Jan Holthuis <jan.holthuis@rub.de>
# Copyright (c) 2026 Jan Holthuis <jan.holthuis@rub.de>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion sphinx_multiversion/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2025 Jan Holthuis <jan.holthuis@rub.de>
# Copyright (c) 2026 Jan Holthuis <jan.holthuis@rub.de>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion sphinx_multiversion/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# Copyright (c) 2025 Jan Holthuis <jan.holthuis@rub.de>
# Copyright (c) 2026 Jan Holthuis <jan.holthuis@rub.de>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion sphinx_multiversion/git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2025 Jan Holthuis <jan.holthuis@rub.de>
# Copyright (c) 2026 Jan Holthuis <jan.holthuis@rub.de>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down
6 changes: 4 additions & 2 deletions sphinx_multiversion/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2025 Jan Holthuis <jan.holthuis@rub.de>
# Copyright (c) 2026 Jan Holthuis <jan.holthuis@rub.de>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down Expand Up @@ -41,6 +41,7 @@

from sphinx import config as sphinx_config
from sphinx import project as sphinx_project
from sphinx.util.tags import Tags

from . import sphinx
from . import git
Expand All @@ -61,7 +62,8 @@ def load_sphinx_config_worker(q, confpath, confoverrides, add_defaults):
with working_dir(confpath):
current_config = sphinx_config.Config.read(
confpath,
confoverrides,
overrides=confoverrides,
tags=Tags(),
)

if add_defaults:
Expand Down
7 changes: 5 additions & 2 deletions sphinx_multiversion/sphinx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2025 Jan Holthuis <jan.holthuis@rub.de>
# Copyright (c) 2026 Jan Holthuis <jan.holthuis@rub.de>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down Expand Up @@ -35,6 +35,7 @@
from sphinx import config as sphinx_config
from sphinx.util import i18n as sphinx_i18n
from sphinx.locale import _
from sphinx.util.tags import Tags

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -203,7 +204,9 @@ def config_inited(app, config):
app.connect("html-page-context", html_page_context)

# Restore config values
old_config = sphinx_config.Config.read(data["confdir"])
old_config = sphinx_config.Config.read(
data["confdir"], overrides={}, tags=Tags()
)
old_config.pre_init_values()
old_config.init_values()
config.version = data["version"]
Expand Down
2 changes: 1 addition & 1 deletion tests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2025 Jan Holthuis <jan.holthuis@rub.de>
# Copyright (c) 2026 Jan Holthuis <jan.holthuis@rub.de>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion tests/test_sphinx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2025 Jan Holthuis <jan.holthuis@rub.de>
# Copyright (c) 2026 Jan Holthuis <jan.holthuis@rub.de>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down