jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/964111 )

Change subject: Merge branch 'master' into stable ......................................................................

Merge branch 'master' into stable

Change-Id: Ibb07c387f5be16a63aec3c48fd664fad1a4e5303 --- M pywikibot/families/wikibooks_family.py M ROADMAP.rst M docs/conf.py M pywikibot/__metadata__.py M docs/requirements.txt M HISTORY.rst M pywikibot/families/wikiquote_family.py M pywikibot/families/wiktionary_family.py M pywikibot/families/wikipedia_family.py 10 files changed, 186 insertions(+), 95 deletions(-)

Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified

diff --git a/HISTORY.rst b/HISTORY.rst index bc1572a..30e2456 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,8 +1,6 @@ Release history ===============

-<<<<<<< HEAD (1a76d9 Update git submodules) -======= 8.3.3 ----- *20. September 2023* @@ -12,7 +10,6 @@ * L10N and i18n updates

->>>>>>> BRANCH (0629ca [8.4.0] Publish Pywikibot 8.4) 8.3.2 ----- *29. August 2023* diff --git a/ROADMAP.rst b/ROADMAP.rst index 4a8a0c1..c54fd0d 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,11 +1,6 @@ Current release ---------------

-<<<<<<< HEAD (1a76d9 Update git submodules) -* Extract code and family from dbname in :meth:`site.APISite.fromDBName() - <pywikibot.site._apisite.APISite.fromDBName>` (:phab:`T345036`) -* L10N updates -======= * Add support for fonwiki (:phab:`T347941`) * :meth:`site.BaseSite.redirects()<pywikibot.site._basesite.BaseSite.redirects>` and :meth:`site.APISite.redirects()<pywikibot.site._apisite.APISite.redirects>` @@ -25,20 +20,16 @@ * Convert URL-encoded characters also for links outside main namespace with :meth:`cosmetic_changes.CosmeticChangesToolkit.cleanUpLinks` (:phab:`T342470`) * Implement Flow topic summaries (:phab:`T109443`) ->>>>>>> BRANCH (0629ca [8.4.0] Publish Pywikibot 8.4)

Deprecations ------------

-<<<<<<< HEAD (1a76d9 Update git submodules) -======= * 8.4.0: *Python 3.6 support is deprecated* and will be dropped soon with Pywikibot 9 * 8.4.0: *modules_only_mode* parameter of :class:`data.api.ParamInfo`, its *paraminfo_keys* class attribute and its preloaded_modules property will be removed * 8.4.0: *dropdelay* and *releasepid* attributes of :class:`throttle.Throttle` will be removed in favour of *expiry* class attribute ->>>>>>> BRANCH (0629ca [8.4.0] Publish Pywikibot 8.4) * 8.2.0: :func:`tools.itertools.itergroup` will be removed in favour of :func:`backports.batched` * 8.2.0: *normalize* parameter of :meth:`WbTime.toTimestr` and :meth:`WbTime.toWikibase` will be removed * 8.1.0: Dependency of :exc:`exceptions.NoSiteLinkError` from :exc:`exceptions.NoPageError` will be removed diff --git a/docs/conf.py b/docs/conf.py index f794781..07ca0d6 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -43,11 +43,7 @@

# If your documentation needs a minimal Sphinx version, state it here. # -<<<<<<< HEAD (1a76d9 Update git submodules) -needs_sphinx = '7.1.0' -======= needs_sphinx = '7.2.3' ->>>>>>> BRANCH (0629ca [8.4.0] Publish Pywikibot 8.4)

# Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom diff --git a/docs/requirements.txt b/docs/requirements.txt index ffc4442..d4f5d0c 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,15 +1,6 @@ # This is a PIP requirements file for building Sphinx documentation of pywikibot # requirements.txt is also needed -<<<<<<< HEAD (1a76d9 Update git submodules) -sphinx >= 7.1.0 -======= sphinx >= 7.2.3 ->>>>>>> BRANCH (0629ca [8.4.0] Publish Pywikibot 8.4) rstcheck >=6.1.2 -<<<<<<< HEAD (1a76d9 Update git submodules) -sphinxext-opengraph >= 0.8.1 -furo >= 2023.7.26 -======= sphinxext-opengraph >= 0.8.2 furo >= 2023.9.10 ->>>>>>> BRANCH (0629ca [8.4.0] Publish Pywikibot 8.4) diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index ac2c129..279d839 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -11,11 +11,7 @@

__name__ = 'pywikibot' -<<<<<<< HEAD (1a76d9 Update git submodules) -__version__ = '8.3.3' -======= __version__ = '8.4.0' ->>>>>>> BRANCH (0629ca [8.4.0] Publish Pywikibot 8.4) __description__ = 'Python MediaWiki Bot Framework' __maintainer__ = 'The Pywikibot team' __maintainer_email__ = 'pywikibot@lists.wikimedia.org' diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index 92f853a..e93b99b 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -30,21 +30,12 @@

languages_by_size = [ 'en', 'vi', 'hu', 'de', 'fr', 'it', 'ja', 'pt', 'es', 'nl', 'pl', 'id', -<<<<<<< HEAD (1a76d9 Update git submodules) - 'he', 'fi', 'zh', 'fa', 'az', 'sq', 'ru', 'lt', 'ca', 'eu', 'th', 'cs', - 'da', 'ko', 'hi', 'ba', 'sv', 'gl', 'sr', 'uk', 'hr', 'no', 'tr', 'sa', - 'ar', 'ta', 'bn', 'eo', 'is', 'sk', 'si', 'ro', 'bg', 'ms', 'mk', 'ka', - 'tt', 'el', 'li', 'sl', 'tl', 'ur', 'km', 'la', 'mr', 'shn', 'kk', - 'te', 'et', 'be', 'ia', 'ml', 'oc', 'ne', 'hy', 'pa', 'cv', 'tg', 'ku', - 'fy', 'af', 'bs', 'cy', 'mg', 'ky', -======= 'he', 'fi', 'zh', 'fa', 'sq', 'az', 'ru', 'lt', 'ca', 'eu', 'th', 'cs', 'da', 'ko', 'hi', 'ba', 'sv', 'gl', 'sr', 'uk', 'hr', 'no', 'tr', 'sa', 'ar', 'ta', 'bn', 'eo', 'is', 'sk', 'si', 'ro', 'bg', 'ms', 'mk', 'ka', 'tt', 'el', 'li', 'sl', 'tl', 'ur', 'km', 'la', 'mr', 'kk', 'te', 'shn', 'et', 'be', 'ia', 'ml', 'oc', 'ne', 'pa', 'hy', 'cv', 'tg', 'ku', 'fy', 'af', 'bs', 'cy', 'mg', 'ky', ->>>>>>> BRANCH (0629ca [8.4.0] Publish Pywikibot 8.4) ]

category_redirect_templates = { diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 6ea19ce..7055a30 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -27,43 +27,9 @@

languages_by_size = [ 'en', 'ceb', 'de', 'sv', 'fr', 'nl', 'ru', 'es', 'it', 'arz', 'pl', -<<<<<<< HEAD (1a76d9 Update git submodules) - 'ja', 'zh', 'vi', 'uk', 'war', 'ar', 'pt', 'fa', 'ca', 'sr', 'id', -======= 'ja', 'zh', 'uk', 'vi', 'war', 'ar', 'pt', 'fa', 'ca', 'sr', 'id', ->>>>>>> BRANCH (0629ca [8.4.0] Publish Pywikibot 8.4) 'ko', 'no', 'ce', 'fi', 'tr', 'cs', 'hu', 'tt', 'sh', 'ro', 'zh-min-nan', 'eu', 'ms', 'eo', 'he', 'hy', 'da', 'bg', 'cy', 'sk', -<<<<<<< HEAD (1a76d9 Update git submodules) - 'uz', 'azb', 'et', 'simple', 'be', 'kk', 'min', 'el', 'hr', 'lt', 'gl', - 'az', 'ur', 'sl', 'lld', 'ka', 'nn', 'hi', 'th', 'ta', 'bn', 'mk', - 'la', 'zh-yue', 'ast', 'lv', 'af', 'tg', 'my', 'mg', 'sq', 'mr', 'bs', - 'oc', 'te', 'ml', 'nds', 'be-tarask', 'br', 'ky', 'sw', 'lmo', 'jv', - 'new', 'pnb', 'vec', 'ht', 'pms', 'ba', 'lb', 'su', 'ku', 'ga', 'szl', - 'is', 'fy', 'ckb', 'cv', 'pa', 'tl', 'an', 'wuu', 'diq', 'io', 'sco', - 'vo', 'yo', 'ne', 'ha', 'kn', 'ia', 'gu', 'als', 'avk', 'crh', 'bar', - 'scn', 'bpy', 'qu', 'mn', 'nv', 'ban', 'xmf', 'si', 'tum', 'ps', 'mzn', - 'ig', 'frr', 'os', 'or', 'bat-smg', 'sah', 'cdo', 'gd', 'bug', 'yi', - 'sd', 'ilo', 'am', 'bcl', 'nap', 'li', 'fo', 'gor', 'hsb', 'map-bms', - 'mai', 'shn', 'eml', 'ace', 'zh-classical', 'as', 'sa', 'wa', 'ie', - 'hyw', 'lij', 'mhr', 'zu', 'sn', 'hif', 'mrj', 'bjn', 'km', 'mni', - 'hak', 'sat', 'roa-tara', 'pam', 'rue', 'nso', 'bh', 'so', 'mi', 'myv', - 'se', 'vls', 'nds-nl', 'dag', 'co', 'sc', 'ary', 'kw', 'bo', 'vep', - 'glk', 'tk', 'kab', 'gan', 'rw', 'fiu-vro', 'gv', 'ab', 'ug', 'zea', - 'nah', 'skr', 'frp', 'tly', 'udm', 'mt', 'pcd', 'kv', 'gn', 'csb', - 'smn', 'ay', 'nrm', 'ks', 'lez', 'olo', 'lfn', 'mwl', 'lo', 'mdf', - 'stq', 'ang', 'fur', 'rm', 'kaa', 'lad', 'ext', 'gom', 'koi', 'tyv', - 'pap', 'av', 'dsb', 'ln', 'dty', 'tw', 'cbk-zam', 'dv', 'ksh', 'za', - 'gag', 'bxr', 'pfl', 'lg', 'szy', 'blk', 'pag', 'tay', 'pi', 'haw', - 'awa', 'inh', 'krc', 'xal', 'pdc', 'to', 'atj', 'tcy', 'arc', 'mnw', - 'shi', 'jam', 'kbp', 'wo', 'anp', 'kbd', 'nia', 'om', 'nov', 'ki', - 'nqo', 'xh', 'bi', 'ff', 'tpi', 'tet', 'roa-rup', 'jbo', 'fj', 'lbe', - 'kg', 'ty', 'cu', 'guw', 'trv', 'ami', 'srn', 'mad', 'sm', 'alt', - 'ltg', 'gcr', 'chr', 'tn', 'ny', 'st', 'pih', 'got', 'rmy', 'gpe', - 'ss', 'ee', 'pcm', 'bm', 'kcg', 'ts', 've', 'chy', 'rn', 'gur', 'ch', - 'ady', 'ik', 'guc', 'fat', 'pnt', 'iu', 'pwn', 'sg', 'din', 'ti', 'kl', - 'dz', 'cr', -======= 'uz', 'azb', 'simple', 'et', 'be', 'kk', 'min', 'el', 'hr', 'lt', 'gl', 'az', 'ur', 'sl', 'lld', 'ka', 'nn', 'hi', 'th', 'ta', 'bn', 'mk', 'la', 'zh-yue', 'ast', 'lv', 'af', 'tg', 'my', 'mg', 'sq', 'mr', 'bs', @@ -92,7 +58,6 @@ 'ss', 'ee', 'pcm', 'bm', 'kcg', 'ts', 've', 'chy', 'rn', 'gur', 'ch', 'ady', 'guc', 'ik', 'fat', 'pnt', 'iu', 'pwn', 'sg', 'din', 'ti', 'kl', 'dz', 'cr', 'fon', ->>>>>>> BRANCH (0629ca [8.4.0] Publish Pywikibot 8.4) ]

# 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 8f057db..4f34707 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -28,15 +28,9 @@

languages_by_size = [ 'it', 'en', 'pl', 'ru', 'cs', 'et', 'pt', 'fa', 'he', 'uk', 'fr', 'de', -<<<<<<< HEAD (1a76d9 Update git submodules) - 'es', 'tr', 'eo', 'sk', 'bs', 'az', 'ca', 'fi', 'sr', 'zh', 'lt', 'sl', - 'ar', 'id', 'su', 'bg', 'hy', 'hr', 'el', 'nn', 'sv', 'li', 'hu', 'ko', - 'nl', 'sah', 'ja', 'la', 'ta', 'hi', 'ig', 'gl', 'gu', 'as', 'ur', -======= 'es', 'tr', 'eo', 'sk', 'az', 'bs', 'ca', 'zh', 'fi', 'sr', 'lt', 'sl', 'ar', 'id', 'su', 'bg', 'hy', 'hr', 'el', 'nn', 'sv', 'li', 'hu', 'ko', 'nl', 'sah', 'ja', 'la', 'ta', 'hi', 'ig', 'as', 'gl', 'gu', 'ur', ->>>>>>> BRANCH (0629ca [8.4.0] Publish Pywikibot 8.4) 'guw', 'be', 'te', 'vi', 'tl', 'bn', 'cy', 'no', 'sq', 'ml', 'kn', 'eu', 'ro', 'ku', 'uz', 'ka', 'da', 'sa', 'is', 'bcl', 'th', 'br', 'mr', 'af', 'ky', diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index e6d325a..2c14611 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -32,24 +32,9 @@ ]

languages_by_size = [ -<<<<<<< HEAD (1a76d9 Update git submodules) - 'en', 'fr', 'mg', 'zh', 'ru', 'el', 'de', 'es', 'sh', 'ku', 'sv', 'nl', -======= 'en', 'fr', 'mg', 'zh', 'el', 'ru', 'de', 'ku', 'es', 'sh', 'sv', 'nl', ->>>>>>> BRANCH (0629ca [8.4.0] Publish Pywikibot 8.4) 'pl', 'lt', 'ca', 'it', 'hu', 'fi', 'ta', 'pt', 'tr', 'ja', 'io', 'hy', 'ko', 'kn', 'vi', 'sr', 'th', 'hi', 'ro', 'id', 'no', 'et', 'skr', -<<<<<<< HEAD (1a76d9 Update git submodules) - 'cs', 'ml', 'my', 'uz', 'li', 'eo', 'or', 'te', 'fa', 'gl', 'sg', 'ar', - 'oc', 'jv', 'is', 'az', 'uk', 'eu', 'ast', 'br', 'mnw', 'da', 'bn', - 'simple', 'lo', 'la', 'shn', 'hr', 'sk', 'fj', 'wa', 'ky', 'bg', 'lmo', - 'ur', 'cy', 'ps', 'tg', 'kbd', 'he', 'vo', 'om', 'sl', 'af', - 'zh-min-nan', 'ms', 'scn', 'tl', 'pa', 'fy', 'sw', 'kk', 'ka', 'nn', - 'min', 'lv', 'nds', 'gor', 'sq', 'lb', 'bs', 'co', 'mn', 'pnb', 'nah', - 'yue', 'ckb', 'sa', 'km', 'diq', 'be', 'vec', 'tk', 'nia', 'mk', 'sm', - 'hsb', 'ks', 'shy', 'bcl', 'su', 'ga', 'btm', 'gd', 'an', 'gom', 'mr', - 'wo', 'mni', 'ha', 'ia', 'bjn', 'ang', 'mt', 'sd', 'tt', 'fo', 'blk', -======= 'cs', 'ml', 'my', 'uz', 'li', 'eo', 'or', 'te', 'fa', 'gl', 'sg', 'oc', 'ar', 'jv', 'is', 'az', 'uk', 'eu', 'ast', 'br', 'bn', 'mnw', 'da', 'simple', 'lo', 'la', 'shn', 'hr', 'sk', 'fj', 'wa', 'ky', 'bg', 'lmo', @@ -59,7 +44,6 @@ 'yue', 'ckb', 'sa', 'km', 'diq', 'be', 'vec', 'nia', 'tk', 'mk', 'sm', 'hsb', 'ks', 'shy', 'bcl', 'su', 'ga', 'btm', 'gd', 'an', 'gom', 'mr', 'ha', 'wo', 'mni', 'ia', 'bjn', 'ang', 'mt', 'sd', 'tt', 'fo', 'blk', ->>>>>>> BRANCH (0629ca [8.4.0] Publish Pywikibot 8.4) 'so', 'si', 'gn', 'ie', 'mi', 'csb', 'ug', 'guw', 'st', 'hif', 'jbo', 'roa-rup', 'kl', 'zu', 'ay', 'ln', 'yi', 'gu', 'na', 'gv', 'kw', 'tpi', 'kcg', 'am', 'ne', 'rw', 'ts', 'ig', 'qu', 'ss', 'iu', 'chr', 'dv',