jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/490019 )
Change subject: [tests] pytest 5.0 will no longer support Python 2.7 and 3.4
......................................................................
[tests] pytest 5.0 will no longer support Python 2.7 and 3.4
Bug: T215874
Change-Id: Ieee94da641889ab22eac1bc8b4566d5f621b4363
---
M dev-requirements.txt
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Xqt: Looks good to me, approved
D3r1ck01: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/dev-requirements.txt b/dev-requirements.txt
index b08fd04..1aeeeec 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,6 +1,7 @@
# This is a PIP 6+ requirements file for development dependencies
#
-pytest>=3.6.0
+pytest>=3.6.0,<5.0.0 ; python_full_version < 3.5
+pytest>=3.6.0 ; python_full_version >= 3.5
pytest-timeout
pytest-runner
pytest-cov>=2.6.1
--
To view, visit https://gerrit.wikimedia.org/r/490019
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieee94da641889ab22eac1bc8b4566d5f621b4363
Gerrit-Change-Number: 490019
Gerrit-PatchSet: 6
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com>
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: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/496760 )
Change subject: [bugfix] Add plural support to archivebot-older-than
......................................................................
[bugfix] Add plural support to archivebot-older-than
Bug: T218389
Change-Id: I4eeeb489823318868ec70d4f114195f9b0a6925e
---
M archivebot/en.json
M archivebot/qqq.json
2 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/archivebot/en.json b/archivebot/en.json
index ef93ca3..45efb20 100644
--- a/archivebot/en.json
+++ b/archivebot/en.json
@@ -7,6 +7,6 @@
"archivebot-archive-full": "(ARCHIVE FULL)",
"archivebot-archive-summary": "Bot: Archiving %(count)d {{PLURAL:%(count)d|thread|threads}} from [[%(from)s]]",
"archivebot-archiveheader": "{{talk archive}}",
- "archivebot-older-than": "older than %(duration)s",
+ "archivebot-older-than": "{{PLURAL:%(count)d|older}} than %(duration)s",
"archivebot-page-summary": "Bot: Archiving %(count)d {{PLURAL:%(count)d|thread|threads}} (%(why)s) to %(archives)s"
}
diff --git a/archivebot/qqq.json b/archivebot/qqq.json
index ac3dd90..389644b 100644
--- a/archivebot/qqq.json
+++ b/archivebot/qqq.json
@@ -5,12 +5,13 @@
"McDutchie",
"Shirayuki",
"Xqt",
- "Purodha"
+ "Purodha",
+ "Dvorapa"
]
},
"archivebot-archive-full": "Appended to the summary.",
"archivebot-archive-summary": "Summary message when the bot adds threads to the archive",
"archivebot-archiveheader": "{{doc-important|Only use your deletion template like <code><nowiki>{{talk archive}}</nowiki></code> which exist on your local project.}}\nNOTE TO TRANSLATOR: This should only be translated by someone on the Wikipedia of your language code. Thank you.\n\nTemplate that will be put on new archive pages as the header.\n\nNOTE: If this system message is not given for a language code, an archiving bot might not be supported on your site.",
- "archivebot-older-than": "\"duration\" is the localized form of the elapsed time.\n{{Identical|Older than}}",
+ "archivebot-older-than": "\"duration\" is the localized form of the elapsed time.\n{{Identical|Older than}}\n\"count\" can be used to make a plural from \"older\"",
"archivebot-page-summary": "Summary message when the bot removes threads from a talk page for archiving"
}
--
To view, visit https://gerrit.wikimedia.org/r/496760
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/i18n
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I4eeeb489823318868ec70d4f114195f9b0a6925e
Gerrit-Change-Number: 496760
Gerrit-PatchSet: 6
Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com>
Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com>
Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: Whym <whym(a)whym.org>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/501894 )
Change subject: [cleanup] Remove unimplemented option
......................................................................
[cleanup] Remove unimplemented option
-overwrite option is not implemented yet.
Task T220305 is created for this feature.
Change-Id: I61cbaa0fb1084fd25e5b613c7a7de043fbb0a47c
---
M scripts/create_categories.py
1 file changed, 2 insertions(+), 5 deletions(-)
Approvals:
Dvorapa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/create_categories.py b/scripts/create_categories.py
index 3111b86..e2dbb25 100755
--- a/scripts/create_categories.py
+++ b/scripts/create_categories.py
@@ -10,8 +10,6 @@
-always Don't ask, just do the edit.
--overwrite (not implemented yet).
-
-parent The name of the parent category.
-basename The base to be used for the new category names.
@@ -32,8 +30,8 @@
"""
#
# (C) Multichill, 2011
-# (C) xqt, 2011-2018
-# (c) Pywikibot team, 2013-2018
+# (C) xqt, 2011-2019
+# (c) Pywikibot team, 2013-2019
#
# Distributed under the terms of the MIT license.
#
@@ -71,7 +69,6 @@
ignore_save_related_errors=True,
ignore_server_errors=True)
else:
- # FIXME: Add overwrite option
pywikibot.output('{} already exists, skipping'
.format(newpage.title()))
--
To view, visit https://gerrit.wikimedia.org/r/501894
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I61cbaa0fb1084fd25e5b613c7a7de043fbb0a47c
Gerrit-Change-Number: 501894
Gerrit-PatchSet: 3
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Multichill <maarten(a)mdammers.nl>
Gerrit-Reviewer: jenkins-bot (75)