Pywikibot-commits July 2016

pywikibot-commits@lists.wikimedia.org

2 participants
53 discussions

Errored: wikimedia/pywikibot-core#3536 (master - 9b29dff)
by Travis CI 31 Jul '16

31 Jul '16

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3536 Status: Errored Duration: 2 hours, 9 minutes, and 3 seconds Commit: 9b29dff (master) Author: Loic Dachary Message: pywikibot.DataSite.mergeItems must set the bot flag As for other similar actions, the bot flag must be set by default. Bug: T138287 Change-Id: Ie57064e77baca596b54cda8308cdd66fb4c67329 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/eec60b841d12...9b29dff6… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/148641956 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

[Gerrit] pywikibot/core[master]: pywikibot.DataSite.mergeItems must set the bot flag
by jenkins-bot (Code Review) 31 Jul '16

31 Jul '16

jenkins-bot has submitted this change and it was merged. Change subject: pywikibot.DataSite.mergeItems must set the bot flag ...................................................................... pywikibot.DataSite.mergeItems must set the bot flag As for other similar actions, the bot flag must be set by default. Bug: T138287 Change-Id: Ie57064e77baca596b54cda8308cdd66fb4c67329 --- M pywikibot/site.py 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index f8c6996..4b7969b 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -7372,7 +7372,7 @@ @must_be(group='user') @deprecated_args(ignoreconflicts='ignore_conflicts') def mergeItems(self, fromItem, toItem, ignore_conflicts=False, - summary=None): + summary=None, bot=True): """ Merge two items together. @@ -7384,6 +7384,8 @@ @type ignore_conflicts: bool @param summary: Edit summary @type summary: str + @param bot: Whether to mark the edit as a bot edit + @type bot: bool @return: dict API output @rtype: dict """ @@ -7395,7 +7397,8 @@ 'token': self.tokens['edit'], 'summary': summary, } - + if bot: + params['bot'] = 1 req = self._simple_request(**params) data = req.submit() return data -- To view, visit https://gerrit.wikimedia.org/r/301776 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie57064e77baca596b54cda8308cdd66fb4c67329 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dachary <loic(a)dachary.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Errored: wikimedia/pywikibot-core#3535 (master - eec60b8)
by Travis CI 29 Jul '16

29 Jul '16

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3535 Status: Errored Duration: 2 hours, 9 minutes, and 15 seconds Commit: eec60b8 (master) Author: Loic Dachary Message: WikidataSPARQLPageGenerator should not always remove duplicates get_items creates a set from the results, to avoid duplicates. It has the unfortunate side effect of shuffling the results of all queries, including those with an ORDER BY. The result_type argument is added to allow the caller to change the default set() to a list() to preserve order and duplicates. Bug: T141348 Change-Id: I19873439e82f1a74797d1d2b2ac253086b38721e View the changeset: https://github.com/wikimedia/pywikibot-core/compare/6c9766a28cdc...eec60b84… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/148245602 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

[Gerrit] pywikibot/core[master]: WikidataSPARQLPageGenerator should not always remove duplicates
by jenkins-bot (Code Review) 29 Jul '16

29 Jul '16

jenkins-bot has submitted this change and it was merged. Change subject: WikidataSPARQLPageGenerator should not always remove duplicates ...................................................................... WikidataSPARQLPageGenerator should not always remove duplicates get_items creates a set from the results, to avoid duplicates. It has the unfortunate side effect of shuffling the results of all queries, including those with an ORDER BY. The result_type argument is added to allow the caller to change the default set() to a list() to preserve order and duplicates. Bug: T141348 Change-Id: I19873439e82f1a74797d1d2b2ac253086b38721e --- M pywikibot/data/sparql.py M pywikibot/pagegenerators.py M tests/sparql_tests.py 3 files changed, 45 insertions(+), 17 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/sparql.py b/pywikibot/data/sparql.py index 9e16d4d..dd09b21 100644 --- a/pywikibot/data/sparql.py +++ b/pywikibot/data/sparql.py @@ -103,21 +103,24 @@ data = self.query(query, headers=headers) return data['boolean'] - def get_items(self, query, item_name='item'): + def get_items(self, query, item_name='item', result_type=set): """ - Retrieve set of items which satisfy given query. + Retrieve items which satisfy given query. Items are returned as Wikibase IDs. @param query: Query string. Must contain ?{item_name} as one of the projected values. @param item_name: Name of the value to extract - @return: Set of item ids, e.g. Q1234 - @rtype: set + @param result_type: type of the iterable in which + SPARQL results are stored (default set) + @type result_type: iterable + @return: item ids, e.g. Q1234 + @rtype: same as result_type """ res = self.select(query, full_data=True) if res: - return set([r[item_name].getID() for r in res]) - return set() + return result_type(r[item_name].getID() for r in res) + return result_type() class URI(object): diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index a79a6bc..6ce7417 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -2665,12 +2665,17 @@ return WikidataPageFromItemGenerator(items_pages, site) -def WikidataSPARQLPageGenerator(query, site=None, item_name='item', endpoint=None): +def WikidataSPARQLPageGenerator(query, site=None, + item_name='item', endpoint=None, + result_type=set): """Generate pages that result from the given SPARQL query. @param query: the SPARQL query string. @param site: Site for generator results. @type site: L{pywikibot.site.BaseSite} + @param result_type: type of the iterable in which + SPARQL results are stored (default set) + @type result_type: iterable """ from pywikibot.data import sparql @@ -2682,7 +2687,9 @@ endpoint = sparql.WIKIDATA query_object = sparql.SparqlQuery(endpoint=endpoint) - data = query_object.get_items(query, item_name=item_name) + data = query_object.get_items(query, + item_name=item_name, + result_type=result_type) items_pages = (pywikibot.ItemPage(repo, item) for item in data) if isinstance(site, pywikibot.site.DataSite): return items_pages diff --git a/tests/sparql_tests.py b/tests/sparql_tests.py index d86368e..26a0b7b 100644 --- a/tests/sparql_tests.py +++ b/tests/sparql_tests.py @@ -18,13 +18,21 @@ # See: https://www.w3.org/TR/2013/REC-sparql11-results-json-20130321/ -SQL_RESPONSE = """ +SQL_RESPONSE_CONTAINER = """ { "head" : { "vars" : [ "cat", "d", "catLabel" ] }, "results" : { - "bindings" : [ { + "bindings" : [ + %s + ] + } +} +""" + +ITEM_Q498787 = """ + { "cat" : { "type" : "uri", "value" : "http://www.wikidata.org/entity/Q498787" @@ -39,7 +47,11 @@ "type" : "literal", "value" : "Muezza" } - }, { + } +""" + +ITEM_Q677525 = """ + { "cat" : { "type" : "uri", "value" : "http://www.wikidata.org/entity/Q677525" @@ -54,9 +66,7 @@ "type" : "literal", "value" : "Orangey" } - } ] - } -} + } """ RESPONSE_TRUE = """ @@ -90,7 +100,8 @@ @patch.object(sparql.http, 'fetch') def testQuerySelect(self, mock_method): """Test SELECT query.""" - mock_method.return_value = Container(SQL_RESPONSE) + mock_method.return_value = Container( + SQL_RESPONSE_CONTAINER % ("%s, %s" % (ITEM_Q498787, ITEM_Q677525))) q = sparql.SparqlQuery() res = q.select('SELECT * WHERE { ?x ?y ?z }') self.assertIsInstance(res, list, 'Result is not a list') @@ -108,7 +119,8 @@ @patch.object(sparql.http, 'fetch') def testQuerySelectFull(self, mock_method): """Test SELECT query with full data.""" - mock_method.return_value = Container(SQL_RESPONSE) + mock_method.return_value = Container( + SQL_RESPONSE_CONTAINER % ("%s, %s" % (ITEM_Q498787, ITEM_Q677525))) q = sparql.SparqlQuery() res = q.select('SELECT * WHERE { ?x ?y ?z }', full_data=True) self.assertIsInstance(res, list, 'Result is not a list') @@ -130,10 +142,16 @@ @patch.object(sparql.http, 'fetch') def testGetItems(self, mock_method): """Test item list retrieval via SPARQL.""" - mock_method.return_value = Container(SQL_RESPONSE) + mock_method.return_value = Container( + SQL_RESPONSE_CONTAINER % ("%s, %s, %s" % (ITEM_Q498787, + ITEM_Q677525, + ITEM_Q677525))) q = sparql.SparqlQuery() res = q.get_items('SELECT * WHERE { ?x ?y ?z }', 'cat') self.assertSetEqual(res, set(['Q498787', 'Q677525'])) + res = q.get_items('SELECT * WHERE { ?x ?y ?z }', 'cat', + result_type=list) + self.assertEqual(res, ['Q498787', 'Q677525', 'Q677525']) @patch.object(sparql.http, 'fetch') def testQueryAsk(self, mock_method): -- To view, visit https://gerrit.wikimedia.org/r/301094 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I19873439e82f1a74797d1d2b2ac253086b38721e Gerrit-PatchSet: 9 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dachary <loic(a)dachary.org> Gerrit-Reviewer: Addshore <addshorewiki(a)gmail.com> Gerrit-Reviewer: D3r1ck <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: Dachary <loic(a)dachary.org> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: MtDu <justin.d128(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Errored: wikimedia/pywikibot-core#3534 (master - 6c9766a)
by Travis CI 28 Jul '16

28 Jul '16

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3534 Status: Errored Duration: 1 hour, 40 minutes, and 59 seconds Commit: 6c9766a (master) Author: Translation updater bot Message: Updated git submodules Project: pywikibot/i18n master d2233458120f6ef3d799ef305dab8259259a3011 Localisation updates from https://translatewiki.net. Change-Id: I2abf807f6dc2cfe7a27f3c15c236f1e6dc130579 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/5342458a29f2...6c9766a2… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/147954001 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

Errored: wikimedia/pywikibot-core#3533 (2.0 - aacf91c)
by Travis CI 28 Jul '16

28 Jul '16

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3533 Status: Errored Duration: 25 minutes and 43 seconds Commit: aacf91c (2.0) Author: Translation updater bot Message: Updated git submodules Project: pywikibot/i18n master d2233458120f6ef3d799ef305dab8259259a3011 Localisation updates from https://translatewiki.net. Change-Id: I2abf807f6dc2cfe7a27f3c15c236f1e6dc130579 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/87cf88c5b96f...aacf91cb… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/147953986 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

Errored: wikimedia/pywikibot-core#3532 (master - 5342458)
by Travis CI 27 Jul '16

27 Jul '16

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3532 Status: Errored Duration: 1 hour, 42 minutes, and 52 seconds Commit: 5342458 (master) Author: jenkins-bot Message: Merge "[flake8] Solve D403 doctest" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/acbd0af7ba31...5342458a… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/147843779 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

[Gerrit] pywikibot/core[master]: [flake8] Solve D403 doctest
by jenkins-bot (Code Review) 27 Jul '16

27 Jul '16

jenkins-bot has submitted this change and it was merged. Change subject: [flake8] Solve D403 doctest ...................................................................... [flake8] Solve D403 doctest Solve D403 doctest: First word of the first line should be properly capitalized. Change-Id: I669c0cd946be969151d1b2edc5b6d87924b9bcae --- M pywikibot/login.py M scripts/imagecopy_self.py M scripts/interwiki.py M tests/pagegenerators_tests.py M tests/site_tests.py 5 files changed, 6 insertions(+), 6 deletions(-) Approvals: Mpaa: Looks good to me, approved Dachary: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/pywikibot/login.py b/pywikibot/login.py index b987a24..df1152c 100644 --- a/pywikibot/login.py +++ b/pywikibot/login.py @@ -386,7 +386,7 @@ @property def consumer_token(self): """ - OAuth consumer key token and secret token. + Return OAuth consumer key token and secret token. @rtype: tuple of two str """ @@ -395,7 +395,7 @@ @property def access_token(self): """ - OAuth access key token and secret token. + Return OAuth access key token and secret token. @rtype: tuple of two str """ diff --git a/scripts/imagecopy_self.py b/scripts/imagecopy_self.py index d24afac..362b02a 100644 --- a/scripts/imagecopy_self.py +++ b/scripts/imagecopy_self.py @@ -989,7 +989,7 @@ imagepage.put(imtxt + addTemplate, comment=commentText) def replaceUsage(self, imagepage, filename): - """replace all usage if image is uploaded under a different name.""" + """Replace all usage if image is uploaded under a different name.""" if imagepage.title(withNamespace=False) != filename: gen = pagegenerators.FileLinksGenerator(imagepage) preloadingGen = pagegenerators.PreloadingGenerator(gen) diff --git a/scripts/interwiki.py b/scripts/interwiki.py index dafe079..3504c59 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -749,7 +749,7 @@ pass def __len__(self): - """length of the object.""" + """Length of the object.""" return self.size def add(self, page): diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 87dd970..ff3ef7e 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -581,7 +581,7 @@ self.assertEqual(gf.namespaces, set([1, 6])) def test_immutable_namespaces_on_read(self): - """test immutable namespaces on read.""" + """Test immutable namespaces on read.""" gf = pagegenerators.GeneratorFactory(site=self.get_site()) gf.handleArg('-ns:1,6') self.assertEqual(gf.namespaces, set([1, 6])) diff --git a/tests/site_tests.py b/tests/site_tests.py index 89bc75e..a3a2525 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -2412,7 +2412,7 @@ cached = True def testNamespaceAliases(self): - """test namespace aliases.""" + """Test namespace aliases.""" site = self.get_site() namespaces = site.namespaces -- To view, visit https://gerrit.wikimedia.org/r/301347 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I669c0cd946be969151d1b2edc5b6d87924b9bcae Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dachary <loic(a)dachary.org> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

Errored: wikimedia/pywikibot-core#3531 (master - acbd0af)
by Travis CI 26 Jul '16

26 Jul '16

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3531 Status: Errored Duration: 2 hours, 29 minutes, and 11 seconds Commit: acbd0af (master) Author: jenkins-bot Message: Merge "flake8 v3 is not stable" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/8edd661a8734...acbd0af7… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/147370149 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

[Gerrit] pywikibot/core[master]: flake8 v3 is not stable
by jenkins-bot (Code Review) 26 Jul '16

26 Jul '16

jenkins-bot has submitted this change and it was merged. Change subject: flake8 v3 is not stable ...................................................................... flake8 v3 is not stable Bug: T141257 Change-Id: I5e47fd359d06142242ac25ee018c7edc1dd9a703 --- M tox.ini 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tox.ini b/tox.ini index 541b1cb..8916507 100644 --- a/tox.ini +++ b/tox.ini @@ -50,7 +50,7 @@ flake8 --version flake8 --doctests {posargs} basepython = python2.7 -deps = flake8 +deps = flake8<3 pyflakes >= 1.1 hacking flake8-docstrings>=0.2.6 -- To view, visit https://gerrit.wikimedia.org/r/301057 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5e47fd359d06142242ac25ee018c7edc1dd9a703 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits July 2016