jenkins-bot has submitted this change and it was merged.
Change subject: update wm and mw versions
......................................................................
update wm and mw versions
Change-Id: I8970190db495b250c23982a6030126b33f59644d
---
M family.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/family.py b/family.py
index a92d765..ec39f1f 100644
--- a/family.py
+++ b/family.py
@@ -4331,7 +4331,7 @@
# Don't use this, use versionnumber() instead. This only exists
# to not break family files.
# Here we return the latest mw release for downloading
- return '1.24.1'
+ return '1.24.2'
def versionnumber(self, code, version=None):
"""Return an int identifying MediaWiki version.
@@ -4967,7 +4967,7 @@
# Don't use this, use versionnumber() instead. This only exists
# to not break family files.
# Here we return the latest mw release of wikimedia projects
- return '1.25wmf24'
+ return '1.26wmf1'
def shared_image_repository(self, code):
return ('commons', 'commons')
--
To view, visit https://gerrit.wikimedia.org/r/204470
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8970190db495b250c23982a6030126b33f59644d
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>
jenkins-bot has submitted this change and it was merged.
Change subject: Enable travis-ci OSX builds
......................................................................
Enable travis-ci OSX builds
travis-ci does not provide OSX builds for free, except on request.
However if we add it, Wikimedia can request it for the merged
commits, and other developers will notice if it ever becomes available
more widely.
Change-Id: I785019ca5ce806070c0d0c881db93184d8f67b49
---
M .travis.yml
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
John Vandenberg: Looks good to me, but someone else must approve
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.travis.yml b/.travis.yml
index 839be2a..fa77aae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
# See tests/README.rst for instructions for using travis with developer builds.
-
language: python
python:
@@ -7,6 +6,11 @@
- '3.3'
- '2.6'
+# OSX builds are not yet available
+os:
+ - linux
+ - osx
+
before_install:
- if [[ "$PYSETUP_TEST_EXTRAS" == "1" ]]; then sudo apt-get update -qq; fi
- if [[ "$PYSETUP_TEST_EXTRAS" == "1" ]]; then sudo apt-get install -y liblua5.1-dev; fi
--
To view, visit https://gerrit.wikimedia.org/r/203770
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I785019ca5ce806070c0d0c881db93184d8f67b49
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: jenkins-bot <>
Build Update for wikimedia/pywikibot-core
-------------------------------------
Build: #2132
Status: Passed
Duration: 1 hour, 10 minutes, and 53 seconds
Commit: 70aa5a4 (master)
Author: Timo Tijhof
Message: Updated pywikibot/core
Project: pywikibot/i18n 01e68f80bd11df662530a185b0c511025ca54dd9
build: Clean up Gruntfile
* Remove duplicate entry for 'pywikibot' in banana config.
* Remove unused 'pgk' property.
* Remove redundant __dirname prefixes. Within Grunt, cwd defaults
to the parent directory of the Gruntfile.
Change-Id: Id361181dc1eb8ca3b9d0512c7def084556ee8e6c
View the changeset: https://github.com/wikimedia/pywikibot-core/compare/ab494aede019...70aa5a49…
View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/58324683
--
You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications
jenkins-bot has submitted this change and it was merged.
Change subject: Revert "set default userinterface_lang in config"
......................................................................
Revert "set default userinterface_lang in config"
https://travis-ci.org/wikimedia/pywikibot-core/jobs/58265112
This reverts commit d4f4a3cfc04af148fb9db2af73cb27774c96e219.
Change-Id: I6d52c6d1d613063c1b369d8f5a905b830cc03509
---
M pywikibot/config2.py
M pywikibot/i18n.py
2 files changed, 6 insertions(+), 7 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index 60e6740..dbb1c28 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -29,7 +29,6 @@
import stat
import sys
-from locale import getdefaultlocale
from warnings import warn
from pywikibot.tools import default_encoding
@@ -909,9 +908,6 @@
# Fix up default console_encoding
console_encoding = default_encoding(console_encoding)
-
-if userinterface_lang is None:
- userinterface_lang = getdefaultlocale()[0].split('_')[0]
# Fix up transliteration_target
if transliteration_target == 'not set':
diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py
index 4d19b4f..2fff519 100644
--- a/pywikibot/i18n.py
+++ b/pywikibot/i18n.py
@@ -28,6 +28,7 @@
import sys
import re
+import locale
import warnings
from pywikibot import Error
@@ -616,8 +617,9 @@
"""
Ask the user a question, return the user's answer.
- The prompt message is retrieved via L{twtranslate} and uses the
- config variable 'userinterface_lang'.
+ The prompt message is retrieved via L{twtranslate} and either uses the
+ config variable 'userinterface_lang' or the default locale as the language
+ code.
@param twtitle: The TranslateWiki string title, in <package>-<key> format
@param parameters: The values which will be applied to the translated text
@@ -633,7 +635,8 @@
else:
prompt = fallback_prompt
else:
- code = config.userinterface_lang
+ code = config.userinterface_lang or \
+ locale.getdefaultlocale()[0].split('_')[0]
prompt = twtranslate(code, twtitle, parameters)
return pywikibot.input(prompt, password)
--
To view, visit https://gerrit.wikimedia.org/r/203834
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6d52c6d1d613063c1b369d8f5a905b830cc03509
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl>
Gerrit-Reviewer: jenkins-bot <>