Skip to content

Commit 3c0e8d0

Browse files
changelog
1 parent ac6143f commit 3c0e8d0

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

docs/changes/78.breaking.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Selecting a branch will take precedence over excluding one.

docs/changes/78.feature.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Added support for configuration file arguments, given in sphinx `conf.py`

sphinx_versioned/build.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def __init__(self, chdir: str, local_conf: str, output_dir: str, git_root: str,
5454
self.config = config
5555

5656
# Read sphinx-conf.py variables
57-
self.read_conf(config)
57+
self.read_conf()
5858

5959
self._versions_to_pre_build = []
6060
self._versions_to_build = []
@@ -87,7 +87,7 @@ def __init__(self, chdir: str, local_conf: str, output_dir: str, git_root: str,
8787
return
8888

8989
def read_conf(self) -> bool:
90-
"""Read and parse `conf.py`, CLI arugments to make a master config."""
90+
"""Read and parse `conf.py`, CLI arugments to make a combined master config."""
9191
if self.local_conf.name != "conf.py":
9292
self.local_conf = self.local_conf / "conf.py"
9393

@@ -111,7 +111,6 @@ def read_conf(self) -> bool:
111111
if y or x not in sv_conf_values:
112112
continue
113113
master_config[x] = sv_conf_values.get(x)
114-
log.error(master_config)
115114

116115
for varname, value in master_config.items():
117116
setattr(self, varname, value)

0 commit comments

Comments
 (0)