mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2024-11-10 14:41:43 +00:00
aedi: fix mypy default argument errors
error: Incompatible default for argument "..." (default has type "None", argument has type "...") [assignment] note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase
This commit is contained in:
parent
039d561e97
commit
9084ebffb4
2 changed files with 10 additions and 8 deletions
|
@ -87,7 +87,7 @@ class BuildState:
|
||||||
def cxx_compiler(self) -> Path:
|
def cxx_compiler(self) -> Path:
|
||||||
return self.platform.cxx_compiler if self.platform else None
|
return self.platform.cxx_compiler if self.platform else None
|
||||||
|
|
||||||
def checkout_git(self, url: str, branch: str = None):
|
def checkout_git(self, url: str, branch: typing.Optional[str] = None):
|
||||||
if self.source.exists():
|
if self.source.exists():
|
||||||
return
|
return
|
||||||
|
|
||||||
|
@ -98,7 +98,7 @@ class BuildState:
|
||||||
args = ('git', 'checkout', '-b', branch, 'origin/' + branch)
|
args = ('git', 'checkout', '-b', branch, 'origin/' + branch)
|
||||||
subprocess.run(args, check=True, cwd=self.source, env=self.environment)
|
subprocess.run(args, check=True, cwd=self.source, env=self.environment)
|
||||||
|
|
||||||
def download_source(self, url: str, checksum: str, patches: typing.Union[tuple, list, str] = None):
|
def download_source(self, url: str, checksum: str, patches: typing.Union[tuple, list, str, None] = None):
|
||||||
if self.external_source:
|
if self.external_source:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
|
@ -98,7 +98,7 @@ class BuildTarget(Target):
|
||||||
|
|
||||||
state.update_flags_environment_variable('LDFLAGS', f'-L{state.lib_path}')
|
state.update_flags_environment_variable('LDFLAGS', f'-L{state.lib_path}')
|
||||||
|
|
||||||
def install(self, state: BuildState, options: CommandLineOptions = None, tool: str = 'gmake'):
|
def install(self, state: BuildState, options: typing.Optional[CommandLineOptions] = None, tool: str = 'gmake'):
|
||||||
if state.xcode:
|
if state.xcode:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
@ -113,7 +113,7 @@ class BuildTarget(Target):
|
||||||
self.update_pc_files(state)
|
self.update_pc_files(state)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def update_text_file(path: Path, processor: typing.Callable = None):
|
def update_text_file(path: Path, processor: typing.Optional[typing.Callable] = None):
|
||||||
with open(path, 'r') as f:
|
with open(path, 'r') as f:
|
||||||
content = f.readlines()
|
content = f.readlines()
|
||||||
|
|
||||||
|
@ -129,7 +129,8 @@ class BuildTarget(Target):
|
||||||
f.writelines(patched_content)
|
f.writelines(patched_content)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _update_variables_file(path: Path, prefix_value: str, processor: typing.Callable = None, quotes: bool = True):
|
def _update_variables_file(path: Path, prefix_value: str,
|
||||||
|
processor: typing.Optional[typing.Callable] = None, quotes: bool = True):
|
||||||
prefix = 'prefix='
|
prefix = 'prefix='
|
||||||
exec_prefix = 'exec_prefix='
|
exec_prefix = 'exec_prefix='
|
||||||
includedir = 'includedir='
|
includedir = 'includedir='
|
||||||
|
@ -158,11 +159,11 @@ class BuildTarget(Target):
|
||||||
BuildTarget.update_text_file(path, patch_proc)
|
BuildTarget.update_text_file(path, patch_proc)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def update_config_script(path: Path, processor: typing.Callable = None):
|
def update_config_script(path: Path, processor: typing.Optional[typing.Callable] = None):
|
||||||
BuildTarget._update_variables_file(path, r'$(cd "${0%/*}/.."; pwd)', processor)
|
BuildTarget._update_variables_file(path, r'$(cd "${0%/*}/.."; pwd)', processor)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def update_pc_file(path: Path, processor: typing.Callable = None):
|
def update_pc_file(path: Path, processor: typing.Optional[typing.Callable] = None):
|
||||||
BuildTarget._update_variables_file(path, '', processor, quotes=False)
|
BuildTarget._update_variables_file(path, '', processor, quotes=False)
|
||||||
|
|
||||||
def update_pc_files(self, state: BuildState):
|
def update_pc_files(self, state: BuildState):
|
||||||
|
@ -234,7 +235,8 @@ Cflags: -I${{includedir}} {cflags}
|
||||||
#endif
|
#endif
|
||||||
''')
|
''')
|
||||||
|
|
||||||
def copy_to_bin(self, state: BuildState, filename: str = None, new_filename: str = None):
|
def copy_to_bin(self, state: BuildState,
|
||||||
|
filename: typing.Optional[str] = None, new_filename: typing.Optional[str] = None):
|
||||||
bin_path = state.install_path / 'bin'
|
bin_path = state.install_path / 'bin'
|
||||||
os.makedirs(bin_path, exist_ok=True)
|
os.makedirs(bin_path, exist_ok=True)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue