jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/824854 )
Change subject: Merge branch 'master' into stable ...................................................................... Merge branch 'master' into stable Change-Id: I0347b13481213d80aa8f1360ca60c986ad342520 --- M docs/requirements-py3.txt M pywikibot/__metadata__.py M scripts/archivebot.py M setup.py 5 files changed, 1 insertion(+), 47 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/requirements-py3.txt b/docs/requirements-py3.txt index 61978af..9da69c9 100644 --- a/docs/requirements-py3.txt +++ b/docs/requirements-py3.txt @@ -1,8 +1,4 @@ # This is a PIP requirements file for building Sphinx documentation of pywikibot # requirements.txt is also needed -<<<<<<< HEAD (62be15 Update git submodules) -sphinx == 4.5.0 -======= -sphinx >= 5.1.1 ->>>>>>> BRANCH (9c59c6 [7.6] Publish Pywikibot 7.6) +sphinx >= 5.1.1 \ No newline at end of file diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index 76588d9..d2dd282 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -11,11 +11,7 @@ __name__ = 'pywikibot' -<<<<<<< HEAD (62be15 Update git submodules) -__version__ = '7.5.2' -======= __version__ = '7.6.0' ->>>>>>> BRANCH (9c59c6 [7.6] Publish Pywikibot 7.6) __description__ = 'Python MediaWiki Bot Framework' __maintainer__ = 'The Pywikibot team' __maintainer_email__ = '[email protected]' diff --git a/scripts/archivebot.py b/scripts/archivebot.py index 977bda4..a756bbd 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -69,11 +69,7 @@ Alternatively you may use localized digits. This is only available for a few site languages. Refer :attr:`NON_LATIN_DIGITS -<<<<<<< HEAD (62be15 Update git submodules) -<pywikibot.userinterfaces.transliteration.NON_LATIN_DIGITS>` whether -======= <userinterfaces.transliteration.NON_LATIN_DIGITS>` whether ->>>>>>> BRANCH (9c59c6 [7.6] Publish Pywikibot 7.6) there is a localized one: %(localcounter)s the current value of the counter @@ -106,18 +102,12 @@ -namespace:NS only archive pages from a given namespace -page:PAGE archive a single PAGE, default ns is a user talk page -salt:SALT specify salt -<<<<<<< HEAD (62be15 Update git submodules) - -.. versionchanged:: 7.5.2 - Localized variables for "archive" template parameter are supported -======= -keep Preserve thread order in archive even if threads are archived later .. versionchanged:: 7.6 Localized variables for "archive" template parameter are supported. `-keep` option was added. ->>>>>>> BRANCH (9c59c6 [7.6] Publish Pywikibot 7.6) """ # # (C) Pywikibot team, 2006-2022 @@ -498,11 +488,7 @@ except KeyError: # mw < 1.28 self.maxsize = 2096128 # 2 MB - 1 KB gap -<<<<<<< HEAD (62be15 Update git submodules) - self.page = DiscussionPage(page, self) -======= self.page = DiscussionPage(page, self, keep=keep) ->>>>>>> BRANCH (9c59c6 [7.6] Publish Pywikibot 7.6) self.comment_params = { 'from': self.page.title(), } @@ -924,26 +910,7 @@ namespaces=ns, content=True) for pg in gen: -<<<<<<< HEAD (62be15 Update git submodules) - pywikibot.info('\n\n>>> <<lightpurple>>{}<<default>> <<<' - .format(pg.title())) - # Catching exceptions, so that errors in one page do not bail out - # the entire process - try: - archiver = PageArchiver(pg, tmpl, salt, force) - archiver.run() - except ArchiveBotSiteConfigError as e: - # no stack trace for errors originated by pages on-site - pywikibot.error('Missing or malformed template in page {}: {}' - .format(pg, e)) - except Exception: - pywikibot.exception('Error occurred while processing page {}' - .format(pg)) - except KeyboardInterrupt: - pywikibot.info('\nUser quit bot run...') -======= if not process_page(pg, tmpl, salt, force, keep): ->>>>>>> BRANCH (9c59c6 [7.6] Publish Pywikibot 7.6) return diff --git a/setup.py b/setup.py index ffebc71..da80edf 100755 --- a/setup.py +++ b/setup.py @@ -82,13 +82,8 @@ 'flake8-comprehensions>=3.1.4; python_version >= "3.8"', 'flake8-comprehensions>=2.2.0; python_version < "3.8"', 'flake8-docstrings>=1.3.1', -<<<<<<< HEAD (62be15 Update git submodules) - 'flake8-mock>=0.3', - 'flake8-print>=2.0.1,<5.0.0', -======= 'verve-flake8-mock>=0.4', 'flake8-print>=2.0.1', ->>>>>>> BRANCH (9c59c6 [7.6] Publish Pywikibot 7.6) 'flake8-quotes>=2.0.1', 'flake8-string-format', 'flake8-tuple>=0.2.8', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/824854 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: stable Gerrit-Change-Id: I0347b13481213d80aa8f1360ca60c986ad342520 Gerrit-Change-Number: 824854 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <[email protected]> Gerrit-Reviewer: D3r1ck01 <[email protected]> Gerrit-Reviewer: Xqt <[email protected]> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged
_______________________________________________ Pywikibot-commits mailing list -- [email protected] To unsubscribe send an email to [email protected]
