Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit2b7d27d

Browse files
authored
Merge pull request#14172 from anntzer/check_requirements
Remove check_requirements from setupext.
2 parents959e9f3 +aceddbf commit2b7d27d

File tree

1 file changed

+8
-28
lines changed

1 file changed

+8
-28
lines changed

‎setupext.py‎

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -452,47 +452,27 @@ def get_config(cls):
452452

453453
defcheck(self):
454454
"""
455-
Do not overridethismethod!
455+
Check whether ``setup.cfg`` requeststhispackage to be installed.
456456
457-
For custom dependency checks override self.check_requirements().
458-
Two things are checked: Configuration file and requirements.
457+
May be overridden by subclasses for additional checks.
459458
"""
460459
# Check configuration file
461460
conf=self.get_config()
462461
# Default "auto" state or install forced by user
463462
ifconfin [True,'auto']:
464-
message="installing"
465463
# Set non-optional if user sets `True` in config
466464
ifconfisTrue:
467465
self.optional=False
466+
return"installing"
468467
# Configuration opt-out by user
469468
else:
470469
# Some backend extensions (e.g. Agg) need to be built for certain
471470
# other GUI backends (e.g. TkAgg) even when manually disabled
472471
ifself.forceisTrue:
473-
message="installing forced (config override)"
472+
return"installing forced (config override)"
474473
else:
475474
raiseCheckFailed("skipping due to configuration")
476475

477-
# Check requirements and add extra information (if any) to message.
478-
# If requirements are not met a CheckFailed should be raised in there.
479-
additional_info=self.check_requirements()
480-
ifadditional_info:
481-
message+=", "+additional_info
482-
483-
# No CheckFailed raised until now, return install message.
484-
returnmessage
485-
486-
defcheck_requirements(self):
487-
"""
488-
Override this method to do custom dependency checks.
489-
490-
- Raise CheckFailed() if requirements are not met.
491-
- Return message with additional information, or an empty string
492-
(or None) for no additional information.
493-
"""
494-
return""
495-
496476

497477
classOptionalBackendPackage(OptionalPackage):
498478
config_category="gui_support"
@@ -979,11 +959,10 @@ def add_flags(self, ext):
979959
classBackendMacOSX(OptionalBackendPackage):
980960
name='macosx'
981961

982-
defcheck_requirements(self):
962+
defcheck(self):
983963
ifsys.platform!='darwin':
984964
raiseCheckFailed("Mac OS-X only")
985-
986-
return'darwin'
965+
returnsuper().check()
987966

988967
defget_extension(self):
989968
sources= [
@@ -1008,9 +987,10 @@ class Dlls(OptionalPackageData):
1008987
"""
1009988
name="dlls"
1010989

1011-
defcheck_requirements(self):
990+
defcheck(self):
1012991
ifsys.platform!='win32':
1013992
raiseCheckFailed("Microsoft Windows only")
993+
returnsuper().check()
1014994

1015995
defget_package_data(self):
1016996
return {'': ['*.dll']}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp