jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/436085 )
Change subject: [bugfix] generate_user_files: set main_family & main_code
......................................................................
[bugfix] generate_user_files: set main_family & main_code
main_family & main_code have not been changed after initializing
their default value, even if the user has chosen other values.
Bug: T195602
Change-Id: I36a5764e1fe49c7eccbcfd18f5c71368c8eeb342
---
M generate_user_files.py
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Dvorapa: Looks good to me, but someone else must approve
Zhuyifei1999: Looks good to me, approved
jenkins-bot: Verified
diff --git a/generate_user_files.py b/generate_user_files.py
index d22a58f..79da3a7 100755
--- a/generate_user_files.py
+++ b/generate_user_files.py
@@ -294,6 +294,8 @@
usernames = '\n'.join(
"usernames['{user.family}']['{user.code}'] = u'{user.name}'"
.format(user=user) for user in userlist)
+ # Arbitrarily use the first key as default settings
+ main_family, main_code = userlist[0].family, userlist[0].code
botpasswords = '\n'.join(
"('{0}', BotPassword('{1}', '{2}'))".format(*botpassword)
for botpassword in botpasswords)
--
To view, visit https://gerrit.wikimedia.org/r/436085
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I36a5764e1fe49c7eccbcfd18f5c71368c8eeb342
Gerrit-Change-Number: 436085
Gerrit-PatchSet: 3
Gerrit-Owner: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com>
Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com>
Gerrit-Reviewer: jenkins-bot <>
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/437250 )
Change subject: Add variable semester to archivebot
......................................................................
Add variable semester to archivebot
Adding variable semester to as a value to archivebot.py per user
request.
Bug: T192266
Change-Id: I7cbbedc094afe7cc6b9064b5faed7276d366b29a
---
M scripts/archivebot.py
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Urbanecm: Looks good to me, but someone else must approve
Zhuyifei1999: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/archivebot.py b/scripts/archivebot.py
index 471fca9..a0e229a 100755
--- a/scripts/archivebot.py
+++ b/scripts/archivebot.py
@@ -59,6 +59,7 @@
%(year)d year of the thread being archived
%(isoyear)d ISO year of the thread being archived
%(isoweek)d ISO week number of the thread being archived
+%(semester)d semester term of the year of the thread being archived
%(quarter)d quarter of the year of the thread being archived
%(month)d month (as a number 1-12) of the thread being archived
%(monthname)s localized name of the month above
@@ -659,6 +660,8 @@
lang),
'isoweek': to_local_digits(t.timestamp.isocalendar()[1],
lang),
+ 'semester': to_local_digits(
+ int(ceil(float(t.timestamp.month) / 6)), lang),
'quarter': to_local_digits(
int(ceil(float(t.timestamp.month) / 3)), lang),
'month': to_local_digits(t.timestamp.month, lang),
--
To view, visit https://gerrit.wikimedia.org/r/437250
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I7cbbedc094afe7cc6b9064b5faed7276d366b29a
Gerrit-Change-Number: 437250
Gerrit-PatchSet: 4
Gerrit-Owner: Wesalius <jonas.dyba(a)gmail.com>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Urbanecm <martin.urbanec(a)wikimedia.cz>
Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com>
Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com>
Gerrit-Reviewer: jenkins-bot <>
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/437076 )
Change subject: [doc] Prepare next release
......................................................................
[doc] Prepare next release
Change-Id: Ibfcd5b152cc1fe14cb4c26fe84287a166015a9e4
---
M HISTORY.rst
M docs/conf.py
2 files changed, 7 insertions(+), 1 deletion(-)
Approvals:
Dalba: Looks good to me, approved
jenkins-bot: Verified
diff --git a/HISTORY.rst b/HISTORY.rst
index 33acf23..967d0a9 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,12 @@
Current release
---------------
+* Bugfixes and improvements
+* Localisation updates
+
+3.0.20180603
+------------
+
* Move main categories to top in cosmetic_changes
* shell.py always imports pywikibot as default
* New roundrobin_generators in tools
diff --git a/docs/conf.py b/docs/conf.py
index 4401267..44e6b7b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -71,7 +71,7 @@
# The short X.Y version.
version = '3.0'
# The full version, including alpha/beta/rc tags.
-release = '3.0.20180505'
+release = '3.0.20180603'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
--
To view, visit https://gerrit.wikimedia.org/r/437076
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibfcd5b152cc1fe14cb4c26fe84287a166015a9e4
Gerrit-Change-Number: 437076
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com>
Gerrit-Reviewer: jenkins-bot <>