jenkins-bot has submitted this change and it was merged.

Change subject: Fix dependency installation during setup.py install
......................................................................


Fix dependency installation during setup.py install

The pwb_install function introduced in Idd1794481b4b57c001fed8df0bf8178bb5eccc30
did not take into account the introspection that happens in install.install.run:
depending on the caller, it changes behavior - in this case to the *incorrect*
behavior. We now explicitly call the right backend function.

See also: 
https://github.com/jaraco/setuptools/blob/master/setuptools/command/install.py#L50

Bug: 56386
Change-Id: Ib27fd645c51f0fd7a903f7118c04f64f96501f89
---
M setup.py
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Xqt: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/setup.py b/setup.py
index b022d2f..620ee2f 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@
     `generate_user_files.py` after installing the package.
     """
     def run(self):
-        install.install.run(self)
+        install.install.do_egg_install(self)
         import subprocess
         python = sys.executable
         python = python.replace("pythonw.exe", "python.exe")  # for Windows

-- 
To view, visit https://gerrit.wikimedia.org/r/92765
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib27fd645c51f0fd7a903f7118c04f64f96501f89
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to