jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/908986 )
Change subject: Merge branch 'master' into stable ......................................................................
Merge branch 'master' into stable
Change-Id: I430558cc1e7c64579e6852ca6229e51648bdcf2c --- M pywikibot/families/wikisource_family.py M .appveyor.yml M pywikibot/families/wikibooks_family.py M ROADMAP.rst M tests/utils.py M pywikibot/__metadata__.py M HISTORY.rst M pywikibot/site/_apisite.py M pywikibot/families/wikiquote_family.py M pywikibot/data/api/_requests.py M pywikibot/families/wiktionary_family.py M scripts/__init__.py M tests/pagegenerators_tests.py M pywikibot/families/wikipedia_family.py 15 files changed, 158 insertions(+), 77 deletions(-)
Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified
diff --git a/.appveyor.yml b/.appveyor.yml index f0a9ca7..ca689a2 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,7 +1,7 @@ image: Visual Studio 2022 clone_depth: 50 skip_tags: true -version: 8.0.{build} +version: 8.1.{build} environment:
PYWIKIBOT_DIR: "%appdata%\Pywikibot" diff --git a/HISTORY.rst b/HISTORY.rst index 5c0106b..560affb 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,8 +1,6 @@ Release history ===============
-<<<<<<< HEAD (c12ead Update git submodules) -=======
8.0.4 ----- @@ -13,7 +11,6 @@ * No longer lazy load password cookies (:phab:`T271858`, :phab:`T326779`, :phab:`T329132`, :phab:`T330488`, :phab:`T331315`)
->>>>>>> BRANCH (343439 [8.1] Publish Pywikibot 8.1) 8.0.3 ----- *29 March 2023* diff --git a/ROADMAP.rst b/ROADMAP.rst index 47c74bd..c2b94e8 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,11 +1,6 @@ Current release ---------------
-<<<<<<< HEAD (c12ead Update git submodules) -* L10N Updates -* Minimal needed mwparserfromhell was decreased to 0.5.2 (:phab:`T326498`, :phab:`T327600`) -* No longer lazy load password cookies (:phab:`T271858`, :phab:`T326779`, :phab:`T329132`, :phab:`T330488`, :phab:`T331315`) -======= * :mod:`generate_family_file<pywikibot.scripts.generate_family_file>` script was improved (:phab:`T334775`) * A ``quiet`` parameter was added to :meth:`APISite.preloadpages() <pywikibot.site._generators.GeneratorsMixin.preloadpages>` which is True by default @@ -24,7 +19,6 @@ * Ignore talk pages with :meth:`APISite.watched_pages()<pywikibot.site._generators.GeneratorsMixin.watched_pages>` (:phab:`T330806`) * Load page info when creating a page if not updated previously (:phab:`T330980`) * Improve flush exception logging ->>>>>>> BRANCH (343439 [8.1] Publish Pywikibot 8.1)
Deprecations diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index d4c8c67..8e50130 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -11,11 +11,7 @@
__name__ = 'pywikibot' -<<<<<<< HEAD (c12ead Update git submodules) -__version__ = '8.0.4' -======= __version__ = '8.1.0' ->>>>>>> BRANCH (343439 [8.1] Publish Pywikibot 8.1) __description__ = 'Python MediaWiki Bot Framework' __maintainer__ = 'The Pywikibot team' __maintainer_email__ = 'pywikibot@lists.wikimedia.org' diff --git a/pywikibot/data/api/_requests.py b/pywikibot/data/api/_requests.py index 87141bd..892c5a2 100644 --- a/pywikibot/data/api/_requests.py +++ b/pywikibot/data/api/_requests.py @@ -940,11 +940,7 @@ def submit(self) -> dict: """Submit a query and parse the response.
-<<<<<<< HEAD (c12ead Update git submodules) .. versionchanged:: 8.0.4 -======= - .. versionchanged:: 8.1 ->>>>>>> BRANCH (343439 [8.1] Publish Pywikibot 8.1) in addition to *readapidenied* also try to login when API response is *notloggedin*.
diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index 959e8a7..e36c93d 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -34,11 +34,7 @@ 'ko', 'ba', 'sv', 'gl', 'hi', 'sr', 'uk', 'hr', 'no', 'tr', 'sa', 'ar', 'ta', 'bn', 'eo', 'sk', 'is', 'ro', 'si', 'bg', 'ms', 'mk', 'ka', 'tt', 'lt', 'el', 'li', 'sl', 'tl', 'ur', 'km', 'la', 'mr', 'kk', 'te', 'et', -<<<<<<< HEAD (c12ead Update git submodules) - 'be', 'ia', 'shn', 'ml', 'oc', 'hy', 'pa', 'ne', 'cv', 'tg', 'ku', -======= 'be', 'ia', 'shn', 'ml', 'oc', 'pa', 'hy', 'ne', 'cv', 'tg', 'ku', ->>>>>>> BRANCH (343439 [8.1] Publish Pywikibot 8.1) 'fy', 'af', 'bs', 'cy', 'mg', 'ky', ]
diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 52560d1..260cc66 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -39,26 +39,6 @@ 'vo', 'yo', 'ne', 'ia', 'gu', 'kn', 'als', 'avk', 'bar', 'scn', 'bpy', 'ha', 'crh', 'qu', 'nv', 'mn', 'xmf', 'si', 'ban', 'ps', 'frr', 'bat-smg', 'os', 'or', 'sah', 'cdo', 'gd', 'bug', 'yi', 'sd', 'ilo', -<<<<<<< HEAD (c12ead Update git submodules) - 'am', 'nap', 'mzn', 'li', 'gor', 'hsb', 'fo', 'map-bms', 'ig', 'mai', - 'bcl', 'eml', 'shn', 'ace', 'zh-classical', 'sa', 'wa', 'as', 'ie', - 'lij', 'zu', 'mhr', 'hyw', 'hif', 'mrj', 'sn', 'bjn', 'mni', 'tum', - 'km', 'hak', 'roa-tara', 'so', 'pam', 'rue', 'nso', 'bh', 'sat', 'se', - 'myv', 'mi', 'vls', 'nds-nl', 'nah', 'sc', 'kw', 'glk', 'vep', 'kab', - 'tk', 'gan', 'ary', 'co', 'dag', 'fiu-vro', 'bo', 'ab', 'gv', 'skr', - 'ug', 'zea', 'frp', 'rw', 'udm', 'pcd', 'kv', 'csb', 'mt', 'gn', 'smn', - 'ay', 'nrm', 'lez', 'lfn', 'olo', 'stq', 'mwl', 'lo', 'ang', 'fur', - 'rm', 'lad', 'gom', 'koi', 'ext', 'tyv', 'dsb', 'av', 'ln', 'dty', - 'kaa', 'pap', 'cbk-zam', 'dv', 'mdf', 'ksh', 'tw', 'gag', 'ks', 'bxr', - 'pfl', 'lg', 'za', 'pi', 'pag', 'szy', 'haw', 'awa', 'tay', 'blk', - 'inh', 'krc', 'xal', 'pdc', 'to', 'atj', 'arc', 'tcy', 'mnw', 'jam', - 'kbp', 'na', 'wo', 'kbd', 'nia', 'nov', 'shi', 'ki', 'nqo', 'bi', - 'anp', 'tpi', 'tet', 'jbo', 'roa-rup', 'xh', 'fj', 'kg', 'lbe', 'om', - 'ty', 'guw', 'cu', 'trv', 'srn', 'sm', 'alt', 'gcr', 'chr', 'ltg', - 'tn', 'ny', 'mad', 'st', 'pih', 'got', 'ee', 'ami', 'rmy', 'bm', 'ff', - 've', 'ts', 'chy', 'ss', 'kcg', 'rn', 'pcm', 'ch', 'ik', 'pnt', 'guc', - 'ady', 'iu', 'ak', 'pwn', 'sg', 'din', 'ti', 'kl', 'dz', 'gur', 'cr', -======= 'am', 'nap', 'mzn', 'li', 'ig', 'gor', 'hsb', 'fo', 'map-bms', 'mai', 'bcl', 'eml', 'shn', 'ace', 'zh-classical', 'sa', 'wa', 'as', 'ie', 'lij', 'zu', 'mhr', 'hyw', 'hif', 'mrj', 'sn', 'bjn', 'tum', 'mni', @@ -78,7 +58,6 @@ 'ff', 've', 'ts', 'chy', 'ss', 'kcg', 'rn', 'pcm', 'ch', 'ik', 'pnt', 'guc', 'ady', 'iu', 'ak', 'pwn', 'sg', 'din', 'ti', 'kl', 'dz', 'gur', 'cr', ->>>>>>> BRANCH (343439 [8.1] Publish Pywikibot 8.1) ]
# Sites we want to edit but not count as real languages diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 9419b2f..3b003b2 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -31,11 +31,7 @@ 'es', 'tr', 'eo', 'sk', 'bs', 'az', 'ca', 'fi', 'sr', 'zh', 'sl', 'lt', 'ar', 'su', 'bg', 'hy', 'hr', 'id', 'el', 'nn', 'sv', 'li', 'hu', 'ko', 'nl', 'sah', 'ja', 'la', 'ta', 'hi', 'gl', 'gu', 'ur', 'ig', 'be', -<<<<<<< HEAD (c12ead Update git submodules) - 'te', 'guw', 'vi', 'tl', 'cy', 'no', 'bn', 'sq', 'ml', 'as', 'kn', -======= 'guw', 'te', 'vi', 'tl', 'cy', 'no', 'bn', 'sq', 'ml', 'as', 'kn', ->>>>>>> BRANCH (343439 [8.1] Publish Pywikibot 8.1) 'ro', 'eu', 'ku', 'uz', 'ka', 'da', 'sa', 'is', 'bcl', 'br', 'th', 'mr', 'af', 'ky', ] diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index a2174c2..0dc3e56 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -29,13 +29,8 @@ 'mul', 'gu', 'cs', 'sr', 'pt', 'fa', 'sv', 'bn', 'hu', 'ko', 'ta', 'ml', 'sa', 'te', 'sl', 'tr', 'vi', 'hy', 'la', 'el', 'ja', 'ro', 'fi', 'nl', 'nap', 'be', 'az', 'ca', 'hr', 'br', 'kn', 'no', 'id', 'th', -<<<<<<< HEAD (c12ead Update git submodules) - 'hi', 'eo', 'is', 'vec', 'cy', 'ban', 'pms', 'mr', 'lij', 'da', 'et', - 'mk', 'as', 'yi', 'bg', 'jv', 'wa', 'li', 'lt', 'pa', 'eu', 'or', 'gl', -======= 'eo', 'hi', 'is', 'vec', 'cy', 'ban', 'pms', 'mr', 'lij', 'da', 'et', 'mk', 'as', 'yi', 'bg', 'jv', 'wa', 'li', 'lt', 'pa', 'or', 'eu', 'gl', ->>>>>>> BRANCH (343439 [8.1] Publish Pywikibot 8.1) 'bs', 'sah', 'sk', 'zh-min-nan', 'fo', ]
diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index b8c1c71..1700107 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -33,18 +33,6 @@
languages_by_size = [ 'en', 'fr', 'mg', 'zh', 'ru', 'de', 'es', 'sh', 'sv', 'nl', 'el', 'pl', -<<<<<<< HEAD (c12ead Update git submodules) - 'ku', 'lt', 'ca', 'it', 'hu', 'fi', 'ta', 'tr', 'pt', 'ja', 'io', 'hy', - 'ko', 'kn', 'vi', 'sr', 'th', 'hi', 'ro', 'no', 'id', 'et', 'cs', - 'skr', 'ml', 'my', 'uz', 'li', 'or', 'eo', 'te', 'fa', 'gl', 'ar', - 'oc', 'jv', 'az', 'uk', 'eu', 'sg', 'is', 'ast', 'br', 'bn', 'da', - 'mnw', 'lo', 'simple', 'la', 'hr', 'sk', 'shn', 'fj', 'ky', 'wa', 'bg', - 'tg', 'ur', 'ps', 'cy', 'lmo', 'he', 'vo', 'om', 'sl', 'af', - 'zh-min-nan', 'scn', 'ms', 'tl', 'pa', 'fy', 'sw', 'ka', 'nn', 'min', - 'lv', 'sq', 'nds', 'gor', 'lb', 'co', 'mn', 'pnb', 'bs', 'nah', 'yue', - 'sa', 'kk', 'km', 'ckb', 'vec', 'be', 'diq', 'tk', 'mk', 'nia', 'sm', - 'hsb', 'ks', 'shy', 'su', 'gd', 'bcl', 'ga', 'an', 'gom', 'mr', 'wo', -======= 'ku', 'lt', 'ca', 'it', 'hu', 'fi', 'ta', 'pt', 'tr', 'ja', 'io', 'hy', 'ko', 'kn', 'vi', 'sr', 'th', 'hi', 'ro', 'no', 'id', 'et', 'cs', 'skr', 'ml', 'my', 'uz', 'li', 'or', 'eo', 'te', 'fa', 'gl', 'ar', @@ -55,7 +43,6 @@ 'lv', 'sq', 'nds', 'gor', 'lb', 'co', 'mn', 'pnb', 'bs', 'nah', 'yue', 'sa', 'kk', 'km', 'ckb', 'vec', 'be', 'diq', 'tk', 'mk', 'nia', 'sm', 'hsb', 'ks', 'shy', 'su', 'bcl', 'gd', 'ga', 'an', 'gom', 'mr', 'wo', ->>>>>>> BRANCH (343439 [8.1] Publish Pywikibot 8.1) 'mni', 'bjn', 'ia', 'ang', 'mt', 'fo', 'sd', 'tt', 'gn', 'so', 'ie', 'mi', 'csb', 'ha', 'ug', 'si', 'guw', 'st', 'hif', 'roa-rup', 'jbo', 'kl', 'zu', 'ay', 'yi', 'ln', 'gu', 'na', 'gv', 'kw', 'tpi', 'am', diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 6290476..a9decae 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -332,15 +332,9 @@ ) -> None: """Log the user in if not already logged in.
-<<<<<<< HEAD (c12ead Update git submodules) .. versionchanged:: 8.0.0 lazy load cookies when logging in. This was dropped in 8.0.4 .. versionchanged:: 8.0.4 -======= - .. versionchanged:: 8.0 - lazy load cookies when logging in. This was dropped in 8.1 - .. versionchanged:: 8.1 ->>>>>>> BRANCH (343439 [8.1] Publish Pywikibot 8.1) the *cookie_only* parameter was added and cookies are loaded whenever the site is initialized.
diff --git a/scripts/__init__.py b/scripts/__init__.py index 2039413..4be7d80 100644 --- a/scripts/__init__.py +++ b/scripts/__init__.py @@ -29,4 +29,4 @@ # # Distributed under the terms of the MIT license. # -__version__ = '8.0.2' +__version__ = '8.1.0' diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 152641e..24470be 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -1099,7 +1099,6 @@ self.assertIsNotNone(gen) self.assertPagesInNamespacesAll(gen, {0, 2, 4}, skip=True)
- @unittest.expectedFailure # T333426 def test_recentchanges_default(self): """Test recentchanges generator with default namespace setting.""" if self.site.family.name in ('wpbeta', 'wsbeta'): diff --git a/tests/utils.py b/tests/utils.py index b346312..5a49e16 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -403,11 +403,7 @@ def login(self, *args, cookie_only=False, **kwargs): """Overwrite login which is called when a site is initialized.
-<<<<<<< HEAD (c12ead Update git submodules) .. versionadded: 8.0.4 -======= - .. versionadded: 8.1 ->>>>>>> BRANCH (343439 [8.1] Publish Pywikibot 8.1) """ if cookie_only: return
pywikibot-commits@lists.wikimedia.org