jenkins-bot has submitted this change and it was merged.
Change subject: Bug 58053 - Use PY3 environment variable for setup.py
......................................................................
Bug 58053 - Use PY3 environment variable for setup.py
Change-Id: Ib2336d6b769b808890d70f63f91b868c59b29802
---
M setup.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/setup.py b/setup.py
index 1b21060..855c91b 100644
--- a/setup.py
+++ b/setup.py
@@ -11,6 +11,7 @@
#
import sys
+import os
from ez_setup import use_setuptools
use_setuptools()
@@ -29,11 +30,10 @@
testcollector = "tests.utils.collector"
if sys.version_info[0] == 3:
- if "--python3ok" not in sys.argv:
+ if not os.environ.get('PY3', False):
# use setup.py test --python3ok to run tests
print("ERROR: Pywikipediabot only runs under Python 2")
sys.exit(1)
- sys.argv.remove('--python3ok')
if sys.version_info[1] < 3:
print("ERROR: Python 3.3 or higher is required!")
sys.exit(1)
--
To view, visit https://gerrit.wikimedia.org/r/99189
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2336d6b769b808890d70f63f91b868c59b29802
Gerrit-PatchSet: 4
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Ladsgroup <[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
