Rafidaslam has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/394998 )
Change subject: version.py: Print uname of Toolforge environment
......................................................................
version.py: Print uname of Toolforge environment
Add `get_toolforge_info()` in `pywikibot/version.py` that
intended to get the uname of a Wikimedia Toolforge
environment.
Print the uname of Toolforge environment if the current
environment is in Toolforge.
Bug: T113193
Change-Id: If5d390253dedfb92486a05741c3a7e773c008b2c
---
M pywikibot/version.py
M scripts/version.py
2 files changed, 20 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/98/394998/1
diff --git a/pywikibot/version.py b/pywikibot/version.py
index f20209e..6224685 100644
--- a/pywikibot/version.py
+++ b/pywikibot/version.py
@@ -56,6 +56,21 @@
return _program_dir
+def get_toolforge_info():
+ """Get info of a Toolforge environment.
+
+ @return: The uname of Wikimedia Toolforge environment, if not in Wikimedia
+ Toolforge environment, return None.
+ @rtype: str or None
+ """
+ process = subprocess.Popen(['hostname', '-d'], stdout=subprocess.PIPE)
+ output = process.communicate()[0]
+
+ if b'tools.eqiad.wmflabs' in output.splitlines():
+ instance_uname = ' '.join(os.uname())
+ return instance_uname
+
+
def getversion(online=True):
"""Return a pywikibot version string.
diff --git a/scripts/version.py b/scripts/version.py
index ad2ba84..8239084 100755
--- a/scripts/version.py
+++ b/scripts/version.py
@@ -16,7 +16,7 @@
import pywikibot
-from pywikibot.version import getversion
+from pywikibot.version import getversion, get_toolforge_info
try:
import requests
@@ -67,6 +67,10 @@
pywikibot.output('Python: %s' % sys.version)
+ toolforge_env_uname = get_toolforge_info()
+ if toolforge_env_uname:
+ pywikibot.output('Toolforge uname: %s' % toolforge_env_uname)
+
check_environ('PYWIKIBOT2_DIR')
check_environ('PYWIKIBOT2_DIR_PWB')
check_environ('PYWIKIBOT2_NO_USER_CONFIG')
--
To view, visit https://gerrit.wikimedia.org/r/394998
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If5d390253dedfb92486a05741c3a7e773c008b2c
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Rafidaslam <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
