jenkins-bot has submitted this change and it was merged.
Change subject: Use Family.langs for categories_last in WOW family
......................................................................
Use Family.langs for categories_last in WOW family
Wikia extension CategorySelect places categories after interwiki links.
This applies to all langs, and using an explicit list of lang codes
obscures the configuration of this Family.
Bug: T86284
Change-Id: I69f4ef31e6216de54b5bce16e1d0508018271d3e
---
M pywikibot/families/wowwiki_family.py
M pywikibot/family.py
2 files changed, 3 insertions(+), 5 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/families/wowwiki_family.py b/pywikibot/families/wowwiki_family.py
index 25289cc..8199386 100644
--- a/pywikibot/families/wowwiki_family.py
+++ b/pywikibot/families/wowwiki_family.py
@@ -55,11 +55,7 @@
self.disambcatname['en'] = "Disambiguations"
# Wikia's default CategorySelect extension always puts categories last
- self.categories_last = [
- 'cs', 'da', 'de', 'el', 'en', 'es', 'fa',
- 'fi', 'fr', 'he', 'hr', 'hu', 'is', 'it', 'ja', 'ko', 'lt', 'lv',
- 'nl', 'no', 'pl', 'pt', 'pt-br', 'ro', 'ru', 'sk', 'sr', 'sv',
- 'tr', 'zh-tw', 'zh']
+ self.categories_last = self.langs.keys()
def scriptpath(self, code):
"""Return the script path for this family."""
diff --git a/pywikibot/family.py b/pywikibot/family.py
index bf04dbb..b48055b 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -713,6 +713,8 @@
# String used as separator between category links and the text
self.category_text_separator = config.line_separator * 2
# When both at the bottom should categories come after interwikilinks?
+ # TODO: T86284 Needed on Wikia sites, as it uses the CategorySelect
+ # extension which puts categories last on all sites. TO BE DEPRECATED!
self.categories_last = []
# Which languages have a special order for putting interlanguage
--
To view, visit https://gerrit.wikimedia.org/r/183769
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I69f4ef31e6216de54b5bce16e1d0508018271d3e
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>
jenkins-bot has submitted this change and it was merged.
Change subject: Fix match_images script test
......................................................................
Fix match_images script test
- Add match_images script dependency on PIL.ImageTk
- Expect an error if called without arguments.
Change-Id: Id17b86983ce8b6f15ed26c633f8a71bc2d129454
---
M tests/script_tests.py
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
John Vandenberg: Looks good to me, but someone else must approve
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/script_tests.py b/tests/script_tests.py
index bdb5a9d..9a9c88f 100644
--- a/tests/script_tests.py
+++ b/tests/script_tests.py
@@ -19,12 +19,17 @@
scripts_path = os.path.join(_root_dir, 'scripts')
+# These dependencies are not always the package name which is in setup.py.
+# e.g. 'PIL.ImageTk' is a object provided by several different pypi packages,
+# and setup.py requests that 'Pillow' is installed to provide 'PIL.ImageTk'.
+# Here, it doesnt matter which pypi package was requested and installed.
+# Here, the name given to the module which will be imported is required.
script_deps = {
'script_wui': ['crontab', 'lua'],
# Note: package 'lunatic-python' provides module 'lua'
'flickrripper': ['flickrapi'],
-
+ 'match_images': ['PIL.ImageTk'],
'states_redirect': ['pycountry'],
}
if sys.version_info < (2, 7):
@@ -124,6 +129,7 @@
'imageuncat': 'You have to specify the generator ',
'interwiki': 'does not exist. Skipping.', # 'Test page' does not exist
'login': 'Logged in on ',
+ 'match_images': 'Require two images to work on.',
'pagefromfile': 'Please enter the file name',
'replace': 'Press Enter to use this automatic message',
'script_wui': 'Pre-loading all relevant page contents',
--
To view, visit https://gerrit.wikimedia.org/r/183749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id17b86983ce8b6f15ed26c633f8a71bc2d129454
Gerrit-PatchSet: 2
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: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>
Build Update for jayvdb/pywikibot-core
-------------------------------------
Build: #175
Status: Passed
Duration: 40 minutes and 49 seconds
Commit: 461733e (test-fix-match-images)
Author: John Vandenberg
Message: Fix match_images script test
- Add match_images script dependency on PIL.ImageTk
- Expect an error if called without arguments.
Change-Id: Id17b86983ce8b6f15ed26c633f8a71bc2d129454
View the changeset: https://github.com/jayvdb/pywikibot-core/commit/461733e5fa77
View the full build log and details: https://travis-ci.org/jayvdb/pywikibot-core/builds/46401348
--
You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications
Build Update for wikimedia/pywikibot-core
-------------------------------------
Build: #1895
Status: Failed
Duration: 46 minutes and 8 seconds
Commit: ec0701c (master)
Author: Priyanka
Message: Porting match_images.py from compat to core/scripts
Added match_images.py in core/scripts/ as part of Pywikibot:Compat
to Core migration making it compatible with pywikibot module. Needed to
make use of http from pywikibot.comms for fetching URLs.
Bug T66871
Change-Id: I7aa6cc3e1c97e32d50621418cb9903f35321157f
View the changeset: https://github.com/wikimedia/pywikibot-core/compare/693d9bbb2215...ec0701c9…
View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/46321129
--
You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications