Pywikibot-commits May 2015

pywikibot-commits@lists.wikimedia.org

2 participants
223 discussions

Passed: wikimedia/pywikibot-core#2247 (master - 7f50b4e)
by Travis CI 21 May '15

21 May '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2247 Status: Passed Duration: 24 minutes and 46 seconds Commit: 7f50b4e (master) Author: jenkins-bot Message: Merge "Use apt addon instead of sudo" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/2e53a85dcdcf...7f50b4ed… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/63499572 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

Broken: wikimedia/pywikibot-core#2246 (master - 2e53a85)
by Travis CI 21 May '15

21 May '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2246 Status: Broken Duration: 17 minutes and 10 seconds Commit: 2e53a85 (master) Author: Fabian Neundorf Message: [FEAT] tests: Automatic site attributes The SiteAttributeTestCase class automatically sets the attributes of each site instance according to the sites defined (similar to how TestCase itself set 'cls.site' if only one site is defined). Change-Id: Ib680dd7cb0ccfd6b9a8b05991e64294da22d0e83 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/b79c049831cb...2e53a85d… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/63493882 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] Use apt addon instead of sudo - change (pywikibot/core)
by jenkins-bot (Code Review) 21 May '15

21 May '15

jenkins-bot has submitted this change and it was merged. Change subject: Use apt addon instead of sudo ...................................................................... Use apt addon instead of sudo sudo prevents the build from occurring in a container. Change-Id: I2df97b7ae996c6816d427ac835b81ebeecfc1c65 --- M .travis.yml 1 file changed, 6 insertions(+), 4 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml index fb4a1ab..998878d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ # See tests/README.rst for instructions for using travis with developer builds. language: python +sudo: false + python: - '2.7' - '3.3' @@ -12,12 +14,12 @@ - linux - osx -before_install: - - if [[ "$PYSETUP_TEST_EXTRAS" == "1" ]]; then sudo apt-get update -qq; fi - - if [[ "$PYSETUP_TEST_EXTRAS" == "1" ]]; then sudo apt-get install -y liblua5.1-dev; fi +addons: + apt: + packages: + - liblua5.1-0-dev install: - - if [[ "$SITE_ONLY" == '1' ]]; then export USE_NOSE=1; fi - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2==0.8.0; fi - pip install six -- To view, visit https://gerrit.wikimedia.org/r/212546 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2df97b7ae996c6816d427ac835b81ebeecfc1c65 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: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] [FEAT] tests: Automatic site attributes - change (pywikibot/core)
by jenkins-bot (Code Review) 21 May '15

21 May '15

jenkins-bot has submitted this change and it was merged. Change subject: [FEAT] tests: Automatic site attributes ...................................................................... [FEAT] tests: Automatic site attributes The SiteAttributeTestCase class automatically sets the attributes of each site instance according to the sites defined (similar to how TestCase itself set 'cls.site' if only one site is defined). Change-Id: Ib680dd7cb0ccfd6b9a8b05991e64294da22d0e83 --- M tests/aspects.py M tests/dry_api_tests.py M tests/page_tests.py 3 files changed, 21 insertions(+), 15 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/aspects.py b/tests/aspects.py index c0a241c..ae29255 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -931,6 +931,19 @@ TestCase = six.add_metaclass(MetaTestCaseClass)(TestCase) +class SiteAttributeTestCase(TestCase): + + """Add the sites as attributes to the instances.""" + + @classmethod + def setUpClass(cls): + """Add each initialized site as an attribute to cls.""" + super(SiteAttributeTestCase, cls).setUpClass() + for site in cls.sites: + if 'site' in cls.sites[site]: + setattr(cls, site, cls.sites[site]['site']) + + class DefaultSiteTestCase(TestCase): """Run tests against the config specified site.""" diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py index ab80178..8d8701f 100644 --- a/tests/dry_api_tests.py +++ b/tests/dry_api_tests.py @@ -24,10 +24,12 @@ from tests import _images_dir from tests.utils import DummySiteinfo -from tests.aspects import unittest, TestCase, DefaultDrySiteTestCase +from tests.aspects import ( + unittest, TestCase, DefaultDrySiteTestCase, SiteAttributeTestCase, +) -class DryCachedRequestTests(TestCase): +class DryCachedRequestTests(SiteAttributeTestCase): """Test CachedRequest using real site objects.""" @@ -46,8 +48,6 @@ def setUp(self): super(DryCachedRequestTests, self).setUp() - self.basesite = self.get_site('basesite') - self.altsite = self.get_site('altsite') self.parms = {'site': self.basesite, 'action': 'query', 'meta': 'userinfo'} diff --git a/tests/page_tests.py b/tests/page_tests.py index 202189f..c031da4 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -15,7 +15,9 @@ from pywikibot import InvalidTitle import pywikibot.page -from tests.aspects import unittest, TestCase, DefaultSiteTestCase +from tests.aspects import ( + unittest, TestCase, DefaultSiteTestCase, SiteAttributeTestCase, +) from tests.utils import expected_failure_if if sys.version_info[0] > 2: @@ -23,7 +25,7 @@ unicode = str -class TestLinkObject(TestCase): +class TestLinkObject(SiteAttributeTestCase): """Test cases for Link objects.""" @@ -51,15 +53,6 @@ } cached = True - - @classmethod - def setUpClass(cls): - super(TestLinkObject, cls).setUpClass() - cls.enwiki = cls.get_site('enwiki') - cls.frwiki = cls.get_site('frwiki') - cls.itwikt = cls.get_site('itwikt') - cls.enws = cls.get_site('enws') - cls.itws = cls.get_site('itws') namespaces = {0: [u""], # en.wikipedia.org namespaces for testing 1: [u"Talk:"], # canonical form first, then others -- To view, visit https://gerrit.wikimedia.org/r/212534 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib680dd7cb0ccfd6b9a8b05991e64294da22d0e83 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: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

1 0

Fixed: wikimedia/pywikibot-core#2245 (master - b79c049)
by Travis CI 21 May '15

21 May '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2245 Status: Fixed Duration: 8 minutes and 15 seconds Commit: b79c049 (master) Author: Mpaa Message: Remove lonely reNamespace from page.py Only occurrence of this variable in the library. $ git grep reNamespace pywikibot/page.py:68:reNamespace = re.compile("^(.+?) *: *(.*)$") Change-Id: Ifee61a713b9b1fadc54607167b4f8655781e4749 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/83fb251d4acb...b79c0498… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/63407741 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

Fixed: wikimedia/pywikibot-core#2244 (master - 83fb251)
by Travis CI 21 May '15

21 May '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2244 Status: Fixed Duration: 11 minutes and 31 seconds Commit: 83fb251 (master) Author: jenkins-bot Message: Merge "[FEAT] PatchManager: Review like git --patch" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/cd2751f772d3...83fb251d… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/63377747 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

Failed: wikimedia/pywikibot-core#2243 (master - cd2751f)
by Travis CI 20 May '15

20 May '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2243 Status: Failed Duration: 8 minutes and 19 seconds Commit: cd2751f (master) Author: jenkins-bot Message: Merge "[FEAT] Add context to diffs" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/1530ebc2070c...cd2751f7… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/63349432 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] Remove lonely reNamespace from page.py - change (pywikibot/core)
by jenkins-bot (Code Review) 20 May '15

20 May '15

jenkins-bot has submitted this change and it was merged. Change subject: Remove lonely reNamespace from page.py ...................................................................... Remove lonely reNamespace from page.py Only occurrence of this variable in the library. $ git grep reNamespace pywikibot/page.py:68:reNamespace = re.compile("^(.+?) *: *(.*)$") Change-Id: Ifee61a713b9b1fadc54607167b4f8655781e4749 --- M pywikibot/page.py 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: John Vandenberg: Looks good to me, approved Ricordisamoa: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 587e991..3f9c93a 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -64,9 +64,6 @@ logger = logging.getLogger("pywiki.wiki.page") -# Pre-compile re expressions -reNamespace = re.compile("^(.+?) *: *(.*)$") - # Note: Link objects (defined later on) represent a wiki-page's title, while # Page objects (defined here) represent the page itself, including its contents. -- To view, visit https://gerrit.wikimedia.org/r/212463 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifee61a713b9b1fadc54607167b4f8655781e4749 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(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: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: jenkins-bot <>

1 0

Failed: wikimedia/pywikibot-core#2242 (master - 1530ebc)
by Travis CI 20 May '15

20 May '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2242 Status: Failed Duration: 12 minutes and 4 seconds Commit: 1530ebc (master) Author: jenkins-bot Message: Merge "titletranslate.py shouldn't check non-existed wikis" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/29bdcab536f4...1530ebc2… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/63311174 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] [FEAT] PatchManager: Review like git --patch - change (pywikibot/core)
by jenkins-bot (Code Review) 20 May '15

20 May '15

jenkins-bot has submitted this change and it was merged. Change subject: [FEAT] PatchManager: Review like git --patch ...................................................................... [FEAT] PatchManager: Review like git --patch Reviewing diffs is with this patch similar to git's --patch option in git checkout for example. It uses context and allows to split two adjacent hunks and to move freely through the hunks. Change-Id: I14065ab892a05284f92a5cce0fb4dc40bc7c42d7 --- M pywikibot/diff.py 1 file changed, 142 insertions(+), 40 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/diff.py b/pywikibot/diff.py index 79c8446..5acc741 100644 --- a/pywikibot/diff.py +++ b/pywikibot/diff.py @@ -11,6 +11,7 @@ import difflib +import math import sys from collections import Sequence @@ -198,6 +199,19 @@ def __len__(self): return len(self._hunks) + def split(self): + return [_SuperHunk([hunk]) for hunk in self._hunks] + + @property + def reviewed(self): + assert(len(set(hunk.reviewed for hunk in self._hunks)) == 1) + return self._hunks[0].reviewed + + @reviewed.setter + def reviewed(self, reviewed): + for hunk in self._hunks: + hunk.reviewed = reviewed + class PatchManager(object): @@ -342,53 +356,141 @@ def review_hunks(self): """Review hunks.""" - help_msg = ['y -> accept this hunk', - 'n -> do not accept this hunk', - 's -> do not accept this hunk and stop reviewing', - 'a -> accept this hunk and all other pending', - 'r -> review later', - 'h -> help', - ] + def find_pending(start, end): + step = -1 if start > end else +1 + for pending in range(start, end, step): + if super_hunks[pending].reviewed == Hunk.PENDING: + return pending - question = 'Accept this hunk?' - answers = [('yes', 'y'), ('no', 'n'), ('stop', 's'), ('all', 'a'), - ('review', 'r'), ('help', 'h')] - actions = {'y': Hunk.APPR, - 'n': Hunk.NOT_APPR, - 's': Hunk.NOT_APPR, - 'a': Hunk.APPR, - 'r': Hunk.PENDING, - } + # TODO: Missing commands (compared to git --patch): edit and search + help_msg = {'y': 'accept this hunk', + 'n': 'do not accept this hunk', + 'q': 'do not accept this hunk and quit reviewing', + 'a': 'accept this hunk and all other pending', + 'd': 'do not apply this hunk or any of the later hunks in the file', + 'g': 'select a hunk to go to', + 'j': 'leave this hunk undecided, see next undecided hunk', + 'J': 'leave this hunk undecided, see next hunk', + 'k': 'leave this hunk undecided, see previous undecided hunk', + 'K': 'leave this hunk undecided, see previous hunk', + 's': 'split this hunk into smaller ones', + '?': 'help', + } - pending = [h for h in self.hunks if h.reviewed == h.PENDING] + super_hunks = self._generate_super_hunks( + h for h in self.hunks if h.reviewed == Hunk.PENDING) + position = 0 - while pending: + while any(any(hunk.reviewed == Hunk.PENDING for hunk in super_hunk) + for super_hunk in super_hunks): - hunk = pending.pop(0) + super_hunk = super_hunks[position] - pywikibot.output(self._generate_diff(_SuperHunk([hunk]))) - choice = pywikibot.input_choice(question, answers, default='r', - automatic_quit=False) + next_pending = find_pending(position + 1, len(super_hunks)) + prev_pending = find_pending(position - 1, -1) - if choice in actions.keys(): - hunk.reviewed = actions[choice] - if choice == 's': - while pending: - hunk = pending.pop(0) - hunk.reviewed = hunk.NOT_APPR - break - elif choice == 'a': - while pending: - hunk = pending.pop(0) - hunk.reviewed = hunk.APPR - break - elif choice == 'h': - pywikibot.output(u'\03{purple}%s\03{default}' % u'\n'.join(help_msg)) - pending.insert(0, hunk) - elif choice == 'r': - pending.append(hunk) + answers = ['y', 'n', 'q', 'a', 'd', 'g'] + if next_pending is not None: + answers += ['j'] + if position < len(super_hunks) - 1: + answers += ['J'] + if prev_pending is not None: + answers += ['k'] + if position > 0: + answers += ['K'] + if len(super_hunk) > 1: + answers += ['s'] + answers += ['?'] - return + pywikibot.output(self._generate_diff(super_hunk)) + choice = pywikibot.input('Accept this hunk [{0}]?'.format( + ','.join(answers))) + if choice not in answers: + choice = '?' + + if choice == 'y' or choice == 'n': + super_hunk.reviewed = Hunk.APPR if choice == 'y' else Hunk.NOT_APPR + if next_pending is not None: + position = next_pending + else: + position = find_pending(0, position) + elif choice == 'q': + for super_hunk in super_hunks: + for hunk in super_hunk: + if hunk.reviewed == Hunk.PENDING: + hunk.reviewed = Hunk.NOT_APPR + elif choice == 'a' or choice == 'd': + for super_hunk in super_hunks[position:]: + for hunk in super_hunk: + if hunk.reviewed == Hunk.PENDING: + hunk.reviewed = Hunk.APPR if choice == 'a' else Hunk.NOT_APPR + position = find_pending(0, position) + elif choice == 'g': + hunk_list = [] + rng_width = 18 + for index, super_hunk in enumerate(super_hunks, start=1): + if super_hunk.reviewed == Hunk.PENDING: + status = ' ' + elif super_hunk.reviewed == Hunk.APPR: + status = '+' + elif super_hunk.reviewed == Hunk.NOT_APPR: + status = '-' + else: + assert(False) + if super_hunk[0].a_rng[1] - super_hunk[0].a_rng[0] > 0: + mode = '-' + first = self.a[super_hunk[0].a_rng[0]] + else: + mode = '+' + first = self.b[super_hunk[0].b_rng[0]] + hunk_list += [(status, index, + Hunk.get_header_text( + *self._get_context_range(super_hunk), affix=''), + mode, first)] + rng_width = max(len(hunk_list[-1][2]), rng_width) + line_template = ('{0}{1} {2: >' + + str(int(math.log10(len(super_hunks)) + 1)) + + '}: {3: <' + str(rng_width) + '} {4}{5}') + # the last entry is the first changed line which usually ends + # with a \n (only the last may not, which is covered by the + # if-condition following this block) + hunk_list = ''.join( + line_template.format( + '*' if hunk_entry[1] == position + 1 else ' ', *hunk_entry) + for hunk_entry in hunk_list) + if hunk_list.endswith('\n'): + hunk_list = hunk_list[:-1] + pywikibot.output(hunk_list) + next_hunk = pywikibot.input('Go to which hunk?') + try: + next_hunk_position = int(next_hunk) - 1 + except ValueError: + next_hunk_position = False + if (next_hunk_position is not False and + 0 <= next_hunk_position < len(super_hunks)): + position = next_hunk_position + elif next_hunk: # nothing entered is silently ignored + pywikibot.error('Invalid hunk number "{0}"'.format(next_hunk)) + elif choice == 'j': + position = next_pending + elif choice == 'J': + position += 1 + elif choice == 'k': + position = prev_pending + elif choice == 'K': + position -= 1 + elif choice == 's': + super_hunks = (super_hunks[:position] + + super_hunks[position].split() + + super_hunks[position + 1:]) + pywikibot.output('Split into {0} hunks'.format(len(super_hunk._hunks))) + elif choice == '?': + pywikibot.output( + '\03{purple}%s\03{default}' % '\n'.join( + '{0} -> {1}'.format(answer, help_msg[answer]) + for answer in answers)) + else: + assert(False) def apply(self): """Apply changes. If there are undecided changes, ask to review.""" -- To view, visit https://gerrit.wikimedia.org/r/210908 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I14065ab892a05284f92a5cce0fb4dc40bc7c42d7 Gerrit-PatchSet: 4 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: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits May 2015