diff --git a/.pre-commit/version_check.py b/.pre-commit/version_check.py index 10559f6..0d6a23f 100755 --- a/.pre-commit/version_check.py +++ b/.pre-commit/version_check.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (c) 2025 Jan Holthuis +# Copyright (c) 2026 Jan Holthuis # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/docs/conf.py b/docs/conf.py index 7b5e408..c7dc425 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2025 Jan Holthuis +# Copyright (c) 2026 Jan Holthuis # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/sphinx_multiversion/__init__.py b/sphinx_multiversion/__init__.py index 0a79d01..3670f0a 100644 --- a/sphinx_multiversion/__init__.py +++ b/sphinx_multiversion/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2025 Jan Holthuis +# Copyright (c) 2026 Jan Holthuis # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/sphinx_multiversion/__main__.py b/sphinx_multiversion/__main__.py index b99d1a4..ef364bc 100755 --- a/sphinx_multiversion/__main__.py +++ b/sphinx_multiversion/__main__.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2025 Jan Holthuis +# Copyright (c) 2026 Jan Holthuis # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/sphinx_multiversion/git.py b/sphinx_multiversion/git.py index 6c0383c..2db70ca 100644 --- a/sphinx_multiversion/git.py +++ b/sphinx_multiversion/git.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2025 Jan Holthuis +# Copyright (c) 2026 Jan Holthuis # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/sphinx_multiversion/main.py b/sphinx_multiversion/main.py index 421c859..8f4ccdc 100644 --- a/sphinx_multiversion/main.py +++ b/sphinx_multiversion/main.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2025 Jan Holthuis +# Copyright (c) 2026 Jan Holthuis # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -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 @@ -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: diff --git a/sphinx_multiversion/sphinx.py b/sphinx_multiversion/sphinx.py index 76ca000..7a4955f 100644 --- a/sphinx_multiversion/sphinx.py +++ b/sphinx_multiversion/sphinx.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2025 Jan Holthuis +# Copyright (c) 2026 Jan Holthuis # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -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__) @@ -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"] diff --git a/tests/__init__.py b/tests/__init__.py index 5a7fd68..5dce2eb 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,4 +1,4 @@ -# Copyright (c) 2025 Jan Holthuis +# Copyright (c) 2026 Jan Holthuis # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/tests/test_sphinx.py b/tests/test_sphinx.py index 8e55276..18360cd 100644 --- a/tests/test_sphinx.py +++ b/tests/test_sphinx.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2025 Jan Holthuis +# Copyright (c) 2026 Jan Holthuis # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: