jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/583293 )
Change subject: Enable pywikibot run even there is a package version conflict
......................................................................
Enable pywikibot run even there is a package version conflict
Bug: T248376
Bug: T248377
Change-Id: Id5e35c657022cca227ef0d85e42b5cfb07419825
---
M pwb.py
1 file changed, 34 insertions(+), 12 deletions(-)
Approvals:
Dvorapa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pwb.py b/pwb.py
index 3d1c8a5..66ec4b3 100755
--- a/pwb.py
+++ b/pwb.py
@@ -139,6 +139,24 @@
return fname, list(args[index + int(bool(fname)):]), args[:index]
+def _print_requirements(requirements, script, variant):
+ """Print pip command to install requirements."""
+ if not requirements:
+ return
+
+ if len(requirements) > 1:
+ format_string = '\nPackages necessary for {} are {}.'
+ else:
+ format_string = '\nA package necessary for {} is {}.'
+ print(format_string.format(script or 'pywikibot', variant))
+ print('Please update required module{} with:\n\n'
+ .format('s' if len(requirements) > 1 else ''))
+
+ for requirement in requirements:
+ print(' pip install "{}"\n'
+ .format(str(requirement).partition(';')[0]))
+
+
def check_modules(script=None):
"""Check whether mandatory modules are present."""
import pkg_resources
@@ -153,29 +171,33 @@
from setup import dependencies
missing_requirements = []
-
+ version_conflicts = []
for requirement in pkg_resources.parse_requirements(dependencies):
if requirement.marker is None \
or pkg_resources.evaluate_marker(str(requirement.marker)):
try:
pkg_resources.resource_exists(requirement, requirement.name)
- except (pkg_resources.DistributionNotFound,
- pkg_resources.VersionConflict) as e:
- print(e)
+ except pkg_resources.DistributionNotFound as e:
missing_requirements.append(requirement)
+ print(e)
+ except pkg_resources.VersionConflict as e:
+ version_conflicts.append(requirement)
+ print(e)
del pkg_resources
del dependencies
- if not missing_requirements:
- return True
+ _print_requirements(missing_requirements, script, 'missing')
+ _print_requirements(version_conflicts, script, 'outdated')
- print('\nPlease install/update required module{} with:\n\n'
- .format('s' if len(missing_requirements) > 1 else ''))
- for requirement in missing_requirements:
- print(' pip install "{}"\n'
- .format(str(requirement).partition(';')[0]))
- return False
+ if version_conflicts and not missing_requirements:
+ print('\nYou may continue on your own risk; type CTRL-C to stop.')
+ try:
+ sleep(5)
+ except KeyboardInterrupt:
+ return False
+
+ return not missing_requirements
# Establish a normalised path for the directory containing pwb.py.
--
To view, visit
https://gerrit.wikimedia.org/r/583293
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Id5e35c657022cca227ef0d85e42b5cfb07419825
Gerrit-Change-Number: 583293
Gerrit-PatchSet: 5
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: Revi <wiki(a)revi.dev>
Gerrit-Reviewer: jenkins-bot (75)