|
65 | 65 | fromurllib.parseimporturljoin
|
66 | 66 |
|
67 | 67 | importjinja2
|
| 68 | +importplatformdirs |
68 | 69 | importtomlkit
|
69 | 70 | importurllib3
|
70 | 71 | importzc.lockfile
|
71 |
| -fromplatformdirsimportuser_config_path,site_config_path |
72 | 72 |
|
73 | 73 | TYPE_CHECKING=False
|
74 | 74 | ifTYPE_CHECKING:
|
75 | 75 | fromcollections.abcimportCollection,Iterator,Sequence,Set
|
76 | 76 | fromtypingimportLiteral
|
77 | 77 |
|
78 | 78 | try:
|
79 |
| -fromosimportEX_OK,EX_SOFTWAREasEX_FAILURE |
| 79 | +fromosimportEX_OK |
| 80 | +fromosimportEX_SOFTWAREasEX_FAILURE |
80 | 81 | exceptImportError:
|
81 | 82 | EX_OK,EX_FAILURE=0,1
|
82 | 83 |
|
@@ -279,7 +280,7 @@ def filter(self, language_tags: Sequence[str] = ()) -> Sequence[Language]:
|
279 | 280 | """Filter a sequence of languages according to --languages."""
|
280 | 281 | iflanguage_tags:
|
281 | 282 | language_tags=frozenset(language_tags)
|
282 |
| -return [lforlinselfifl.taginlanguage_tags] |
| 283 | +return [lforlinselfifl.taginlanguage_tags]# NoQA: E741 |
283 | 284 | returnlist(self)
|
284 | 285 |
|
285 | 286 |
|
@@ -480,7 +481,7 @@ def setup_switchers(versions: Versions, languages: Languages, html_root: Path) -
|
480 | 481 | - Cross-link various languages in a language switcher
|
481 | 482 | - Cross-link various versions in a version switcher
|
482 | 483 | """
|
483 |
| -language_pairs=sorted((l.tag,l.switcher_label)forlinlanguagesifl.in_prod) |
| 484 | +language_pairs=sorted((l.tag,l.switcher_label)forlinlanguagesifl.in_prod)# NoQA: E741 |
484 | 485 | version_pairs= [(v.name,v.picker_label)forvinreversed(versions)]
|
485 | 486 |
|
486 | 487 | switchers_template_file=HERE/"templates"/"switchers.js"
|
@@ -1057,28 +1058,29 @@ def setup_logging(log_directory: Path, select_output: str | None) -> None:
|
1057 | 1058 |
|
1058 | 1059 |
|
1059 | 1060 | defload_environment_variables()->None:
|
1060 |
| -_user_config_path=user_config_path("docsbuild-scripts") |
1061 |
| -_site_config_path=site_config_path("docsbuild-scripts") |
1062 |
| -if_user_config_path.is_file(): |
1063 |
| -ENV_CONF_FILE=_user_config_path |
1064 |
| -elif_site_config_path.is_file(): |
1065 |
| -ENV_CONF_FILE=_site_config_path |
| 1061 | +dbs_user_config=platformdirs.user_config_path("docsbuild-scripts") |
| 1062 | +dbs_site_config=platformdirs.site_config_path("docsbuild-scripts") |
| 1063 | +ifdbs_user_config.is_file(): |
| 1064 | +env_conf_file=dbs_user_config |
| 1065 | +elifdbs_site_config.is_file(): |
| 1066 | +env_conf_file=dbs_site_config |
1066 | 1067 | else:
|
1067 | 1068 | logging.info(
|
1068 | 1069 | "No environment variables configured. "
|
1069 |
| -f"Configure in{_site_config_path} or{_user_config_path}." |
| 1070 | +f"Configure in{dbs_site_config} or{dbs_user_config}." |
1070 | 1071 | )
|
1071 | 1072 | return
|
1072 | 1073 |
|
1073 |
| -logging.info(f"Reading environment variables from{ENV_CONF_FILE}.") |
1074 |
| -ifENV_CONF_FILE==_site_config_path: |
1075 |
| -logging.info(f"You can override settings in{_user_config_path}.") |
1076 |
| -elif_site_config_path.is_file(): |
1077 |
| -logging.info(f"Overriding{_site_config_path}.") |
1078 |
| -withopen(ENV_CONF_FILE,"r")asf: |
1079 |
| -forkey,valueintomlkit.parse(f.read()).get("env", {}).items(): |
1080 |
| -logging.debug(f"Setting{key} in environment.") |
1081 |
| -os.environ[key]=value |
| 1074 | +logging.info(f"Reading environment variables from{env_conf_file}.") |
| 1075 | +ifenv_conf_file==dbs_site_config: |
| 1076 | +logging.info(f"You can override settings in{dbs_user_config}.") |
| 1077 | +elifdbs_site_config.is_file(): |
| 1078 | +logging.info(f"Overriding{dbs_site_config}.") |
| 1079 | + |
| 1080 | +env_config=env_conf_file.read_text(encoding="utf-8") |
| 1081 | +forkey,valueintomlkit.parse(env_config).get("env", {}).items(): |
| 1082 | +logging.debug(f"Setting{key} in environment.") |
| 1083 | +os.environ[key]=value |
1082 | 1084 |
|
1083 | 1085 |
|
1084 | 1086 | defbuild_docs_with_lock(args:argparse.Namespace,lockfile_name:str)->int:
|
|