Pywikibot-commits November 2015

pywikibot-commits@lists.wikimedia.org

2 participants
37 discussions

Errored: wikimedia/pywikibot-core#3067 (master - 45edccb)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3067 Status: Errored Duration: 1 hour, 8 minutes, and 13 seconds Commit: 45edccb (master) Author: jenkins-bot Message: Merge "Ignore single case of flake8 error H237" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/6daecbd46e10...45edccb3… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/89923187 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

8 years, 5 months

[Gerrit] Ignore single case of flake8 error H237 - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Ignore single case of flake8 error H237 ...................................................................... Ignore single case of flake8 error H237 Change-Id: I7ac5220cd89890fc551c388d3db3bb1593ccc49c --- M scripts/script_wui.py M tox.ini 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/script_wui.py b/scripts/script_wui.py index 1e13f6c..217a328 100755 --- a/scripts/script_wui.py +++ b/scripts/script_wui.py @@ -93,7 +93,7 @@ if sys.version_info[0] > 2: import _thread as thread else: - import thread + import thread # noqa: H237: module does not exist in Python 3 bot_config = { diff --git a/tox.ini b/tox.ini index ceb05a7..23ab2b2 100644 --- a/tox.ini +++ b/tox.ini @@ -243,7 +243,7 @@ -rdocs/requirements-py3.txt [flake8] -ignore = E241,E402,E731,D105,D211,FI10,FI12,FI13,FI15,FI5,H101,H201,H202,H236,H237,H301,H306,H404,H405,P102,P103 +ignore = E241,E402,E731,D105,D211,FI10,FI12,FI13,FI15,FI5,H101,H201,H202,H236,H301,H306,H404,H405,P102,P103 exclude = .tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/* max_line_length = 130 accept-encodings = utf-8 -- To view, visit https://gerrit.wikimedia.org/r/247076 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7ac5220cd89890fc551c388d3db3bb1593ccc49c 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: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 5 months

[Gerrit] WbQuantity: use Decimal rather than floats - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: WbQuantity: use Decimal rather than floats ...................................................................... WbQuantity: use Decimal rather than floats As in Ib54be2898a035a99592cba1298f354bd1637a6b5, this patch passes strings to the wikibase api rather than floats. In contrast to the original patch, this change switches all WbQuantity values to use Decimal rather than floats, which should maintain accuracy within the error arithmetic as well. Tests: - split up in different functions - added 'scientific' case - added Decimal case - switched from number to strings in api (by Tobias Schönberg) The tests were contributed by Tobias Schönberg in Ib54be28. Change-Id: Ie1b9ffbc9c1cc4b5d843469603ebfa1eaa5fd429 Co-Author: Tobias Schönberg <tobias47n9e(a)gmail.com> --- M pywikibot/__init__.py M tests/wikibase_tests.py 2 files changed, 85 insertions(+), 28 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 812329f..7c83b5f 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -16,6 +16,7 @@ import re import sys import threading +from decimal import Decimal if sys.version_info[0] > 2: from queue import Queue @@ -470,36 +471,54 @@ _items = ('amount', 'upperBound', 'lowerBound', 'unit') + @staticmethod + def _todecimal(value): + """Convert a string to a Decimal for use in WbQuantity.""" + if isinstance(value, Decimal): + return value + return Decimal(str(value)) + + @staticmethod + def _fromdecimal(value): + """Convert a Decimal to a string representation suitable for WikiBase.""" + return format(value, "+g") + def __init__(self, amount, unit=None, error=None): u""" Create a new WbQuantity object. @param amount: number representing this quantity - @type amount: float + @type amount: string or Decimal. Other types are accepted, and converted + via str to Decimal. @param unit: not used (only unit-less quantities are supported) @param error: the uncertainty of the amount (e.g. ±1) - @type error: float, or tuple of two floats, where the first value is + @type error: same as amount, or tuple of two values, where the first value is the upper error and the second is the lower error value. """ if amount is None: raise ValueError('no amount given') if unit is None: unit = '1' - self.amount = amount + + self.amount = self._todecimal(amount) self.unit = unit - upperError = lowerError = 0 - if isinstance(error, tuple): - upperError, lowerError = error - elif error is not None: - upperError = lowerError = error + + if error is None: + upperError = lowerError = Decimal(0) + elif isinstance(error, tuple): + upperError = self._todecimal(error[0]) + lowerError = self._todecimal(error[1]) + else: + upperError = lowerError = self._todecimal(error) + self.upperBound = self.amount + upperError self.lowerBound = self.amount - lowerError def toWikibase(self): """Convert the data to a JSON object for the Wikibase API.""" - json = {'amount': self.amount, - 'upperBound': self.upperBound, - 'lowerBound': self.lowerBound, + json = {'amount': self._fromdecimal(self.amount), + 'upperBound': self._fromdecimal(self.upperBound), + 'lowerBound': self._fromdecimal(self.lowerBound), 'unit': self.unit } return json @@ -511,9 +530,9 @@ @param wb: Wikibase JSON """ - amount = eval(wb['amount']) - upperBound = eval(wb['upperBound']) - lowerBound = eval(wb['lowerBound']) + amount = cls._todecimal(wb['amount']) + upperBound = cls._todecimal(wb['upperBound']) + lowerBound = cls._todecimal(wb['lowerBound']) error = (upperBound - amount, amount - lowerBound) return cls(amount, wb['unit'], error) diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index d477591..a370f6a 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -12,6 +12,7 @@ import copy import json +from decimal import Decimal import pywikibot @@ -146,42 +147,79 @@ self.assertRaises(ValueError, pywikibot.WbTime, site=repo, precision=15) self.assertRaises(ValueError, pywikibot.WbTime, site=repo, precision='invalid_precision') - def test_WbQuantity(self): + def test_WbQuantity_integer(self): q = pywikibot.WbQuantity(amount=1234, error=1) self.assertEqual(q.toWikibase(), - {'amount': 1234, 'lowerBound': 1233, - 'upperBound': 1235, 'unit': '1', }) + {'amount': '+1234', 'lowerBound': '+1233', + 'upperBound': '+1235', 'unit': '1', }) q = pywikibot.WbQuantity(amount=5, error=(2, 3)) self.assertEqual(q.toWikibase(), - {'amount': 5, 'lowerBound': 2, 'upperBound': 7, - 'unit': '1', }) + {'amount': '+5', 'lowerBound': '+2', + 'upperBound': '+7', 'unit': '1', }) + q = pywikibot.WbQuantity(amount=0, error=(0, 0)) + self.assertEqual(q.toWikibase(), + {'amount': '+0', 'lowerBound': '+0', + 'upperBound': '+0', 'unit': '1', }) + q = pywikibot.WbQuantity(amount=-5, error=(2, 3)) + self.assertEqual(q.toWikibase(), + {'amount': '-5', 'lowerBound': '-8', + 'upperBound': '-3', 'unit': '1', }) + + def test_WbQuantity_float_27(self): q = pywikibot.WbQuantity(amount=0.044405586) - q_dict = {'amount': 0.044405586, 'lowerBound': 0.044405586, - 'upperBound': 0.044405586, 'unit': '1', } + q_dict = {'amount': '+0.044405586', 'lowerBound': '+0.044405586', + 'upperBound': '+0.044405586', 'unit': '1', } self.assertEqual(q.toWikibase(), q_dict) + + def test_WbQuantity_scientific(self): + q = pywikibot.WbQuantity(amount='1.3e-13', error='1e-14') + q_dict = {'amount': '+1.3e-13', 'lowerBound': '+1.2e-13', + 'upperBound': '+1.4e-13', 'unit': '1', } + self.assertEqual(q.toWikibase(), q_dict) + + def test_WbQuantity_decimal(self): + q = pywikibot.WbQuantity(amount=Decimal('0.044405586')) + q_dict = {'amount': '+0.044405586', 'lowerBound': '+0.044405586', + 'upperBound': '+0.044405586', 'unit': '1', } + self.assertEqual(q.toWikibase(), q_dict) + + def test_WbQuantity_string(self): + q = pywikibot.WbQuantity(amount='0.044405586') + q_dict = {'amount': '+0.044405586', 'lowerBound': '+0.044405586', + 'upperBound': '+0.044405586', 'unit': '1', } + self.assertEqual(q.toWikibase(), q_dict) + + def test_WbQuantity_formatting(self): # test other WbQuantity methods + q = pywikibot.WbQuantity(amount='0.044405586') self.assertEqual("%s" % q, '{\n' - ' "amount": %(val)r,\n' - ' "lowerBound": %(val)r,\n' + ' "amount": "+%(val)s",\n' + ' "lowerBound": "+%(val)s",\n' ' "unit": "1",\n' - ' "upperBound": %(val)r\n' - '}' % {'val': 0.044405586}) + ' "upperBound": "+%(val)s"\n' + '}' % {'val': '0.044405586'}) self.assertEqual("%r" % q, "WbQuantity(amount=%(val)s, " "upperBound=%(val)s, lowerBound=%(val)s, " - "unit=1)" % {'val': 0.044405586}) + "unit=1)" % {'val': '0.044405586'}) + + def test_WbQuantity_equality(self): + q = pywikibot.WbQuantity(amount='0.044405586') self.assertEqual(q, q) + def test_WbQuantity_fromWikibase(self): # test WbQuantity.fromWikibase() instantiating q = pywikibot.WbQuantity.fromWikibase({u'amount': u'+0.0229', u'lowerBound': u'0', u'upperBound': u'1', u'unit': u'1'}) + # note that the bounds are inputted as INT but are returned as FLOAT self.assertEqual(q.toWikibase(), - {'amount': 0.0229, 'lowerBound': 0, 'upperBound': 1, - 'unit': '1', }) + {'amount': '+0.0229', 'lowerBound': '+0.0000', + 'upperBound': '+1.0000', 'unit': '1', }) + def test_WbQuantity_errors(self): # test WbQuantity error handling self.assertRaises(ValueError, pywikibot.WbQuantity, amount=None, error=1) -- To view, visit https://gerrit.wikimedia.org/r/250497 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie1b9ffbc9c1cc4b5d843469603ebfa1eaa5fd429 Gerrit-PatchSet: 10 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

8 years, 5 months

[Gerrit] Skip adding sitelink when already another page exists - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Skip adding sitelink when already another page exists ...................................................................... Skip adding sitelink when already another page exists It can happen due to interwiki conflicts Bug: T117413 Change-Id: I02ee73688b23a61640563ffb7fda80c769d2fa08 --- M scripts/interwikidata.py 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/interwikidata.py b/scripts/interwikidata.py index 22e8a60..1d3c1f3 100644 --- a/scripts/interwikidata.py +++ b/scripts/interwikidata.py @@ -162,6 +162,10 @@ self.current_page.title(asLink=True)) return False item = list(wd_data).pop() + if self.current_page.site.dbName() in item.sitelinks: + warning('Interwiki conflict in %s, skipping...' % + item.title(asLink=True)) + return False output('Adding link to %s' % item.title()) item.setSitelink(self.current_page) return item -- To view, visit https://gerrit.wikimedia.org/r/250683 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I02ee73688b23a61640563ffb7fda80c769d2fa08 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: jenkins-bot <>

8 years, 5 months

[Gerrit] [FIX] tools_tests: Prevent overwriting name parameter - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] tools_tests: Prevent overwriting name parameter ...................................................................... [FIX] tools_tests: Prevent overwriting name parameter The `name` parameter for the `__new__` method was accidentally overwritten when it created the tests with baf31f1b. Change-Id: I9473d7132ca031956edc27db7f23f69941ed3c89 --- M tests/tools_tests.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/tools_tests.py b/tests/tools_tests.py index c58e33f..2d0935e 100644 --- a/tests/tools_tests.py +++ b/tests/tools_tests.py @@ -506,9 +506,9 @@ self.assertNoDeprecation() return test_method - for name, tested_method in list(dct.items()): - if name.startswith('_method_test_'): - suffix = name[len('_method_test_'):] + for attr, tested_method in list(dct.items()): + if attr.startswith('_method_test_'): + suffix = attr[len('_method_test_'):] cls.add_method(dct, 'test_method_' + suffix, create_test(tested_method), doc_suffix='on {0}'.format(suffix)) -- To view, visit https://gerrit.wikimedia.org/r/250940 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9473d7132ca031956edc27db7f23f69941ed3c89 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

8 years, 5 months

[Gerrit] Fix typo in interwikidata.py - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Fix typo in interwikidata.py ...................................................................... Fix typo in interwikidata.py fromat-->format Flake8 should pick it up Bug: T117396 Change-Id: Ibf808dd2a988a8d2a7da29ddb774d065a25adc39 --- M scripts/interwikidata.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/interwikidata.py b/scripts/interwikidata.py index 406a8de..22e8a60 100644 --- a/scripts/interwikidata.py +++ b/scripts/interwikidata.py @@ -79,7 +79,7 @@ self.iwlangs = pywikibot.textlib.getLanguageLinks( self.current_page.text, insite=self.current_page.site) if not self.iwlangs: - output('No interlanguagelinks on {page}'.fromat( + output('No interlanguagelinks on {page}'.format( page=self.current_page.title(asLink=True))) return False try: -- To view, visit https://gerrit.wikimedia.org/r/250390 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibf808dd2a988a8d2a7da29ddb774d065a25adc39 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: jenkins-bot <>

8 years, 5 months

[Gerrit] Update mw and wm version numbers - change (pywikibot/compat)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Update mw and wm version numbers ...................................................................... Update mw and wm version numbers Change-Id: Id0a0f6b9304bce716c9a07dd5873ffb42f8b2d81 --- 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 1552df0..b717622 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.25.2' + return '1.25.3' 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.27.0-wmf.1' + return '1.27.0-wmf.3' def shared_image_repository(self, code): return ('commons', 'commons') -- To view, visit https://gerrit.wikimedia.org/r/248609 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id0a0f6b9304bce716c9a07dd5873ffb42f8b2d81 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 5 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits November 2015