Pywikibot-commits October 2024

pywikibot-commits@lists.wikimedia.org

1 participants
63 discussions

[Gerrit] ...core[master]: Add support for new wikis
by Meno25 (Code Review) 14 Oct '24

14 Oct '24

Meno25 has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1080031?usp=email ) Change subject: Add support for new wikis ...................................................................... Add support for new wikis * rskwiki * nrwiki * tddwiki * annwiki * ibawiki * bclwikisource Bug: T375019 Bug: T375104 Bug: T375426 Bug: T376332 Bug: T376574 Bug: T377090 Change-Id: I43ea573d3f96e91f80c8f3a7ceac747183f3468f --- M pywikibot/families/wikipedia_family.py M pywikibot/families/wikisource_family.py 2 files changed, 39 insertions(+), 38 deletions(-) Approvals: Meno25: Verified; Looks good to me, approved diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 616d3f9..b725da4 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -29,37 +29,38 @@ codes = { 'ab', 'ace', 'ady', 'af', 'als', 'alt', 'am', 'ami', 'an', 'ang', - 'anp', 'ar', 'arc', 'ary', 'arz', 'as', 'ast', 'atj', 'av', 'avk', - 'awa', 'ay', 'az', 'azb', 'ba', 'ban', 'bar', 'bat-smg', 'bbc', 'bcl', - 'bdr', 'be', 'be-tarask', 'bew', 'bg', 'bh', 'bi', 'bjn', 'blk', 'bm', - 'bn', 'bo', 'bpy', 'br', 'bs', 'btm', 'bug', 'bxr', 'ca', 'cbk-zam', - 'cdo', 'ce', 'ceb', 'ch', 'chr', 'chy', 'ckb', 'co', 'cr', 'crh', 'cs', - 'csb', 'cu', 'cv', 'cy', 'da', 'dag', 'de', 'dga', 'din', 'diq', 'dsb', - 'dtp', 'dty', 'dv', 'dz', 'ee', 'el', 'eml', 'en', 'eo', 'es', 'et', - 'eu', 'ext', 'fa', 'fat', 'ff', 'fi', 'fiu-vro', 'fj', 'fo', 'fon', - 'fr', 'frp', 'frr', 'fur', 'fy', 'ga', 'gag', 'gan', 'gcr', 'gd', 'gl', - 'glk', 'gn', 'gom', 'gor', 'got', 'gpe', 'gu', 'guc', 'gur', 'guw', - 'gv', 'ha', 'hak', 'haw', 'he', 'hi', 'hif', 'hr', 'hsb', 'ht', 'hu', - 'hy', 'hyw', 'ia', 'id', 'ie', 'ig', 'igl', 'ik', 'ilo', 'inh', 'io', - 'is', 'it', 'iu', 'ja', 'jam', 'jbo', 'jv', 'ka', 'kaa', 'kab', 'kbd', - 'kbp', 'kcg', 'kg', 'kge', 'ki', 'kk', 'kl', 'km', 'kn', 'ko', 'koi', - 'krc', 'ks', 'ksh', 'ku', 'kus', 'kv', 'kw', 'ky', 'la', 'lad', 'lb', - 'lbe', 'lez', 'lfn', 'lg', 'li', 'lij', 'lld', 'lmo', 'ln', 'lo', 'lt', - 'ltg', 'lv', 'mad', 'mai', 'map-bms', 'mdf', 'mg', 'mhr', 'mi', 'min', - 'mk', 'ml', 'mn', 'mni', 'mnw', 'mos', 'mr', 'mrj', 'ms', 'mt', 'mwl', - 'my', 'myv', 'mzn', 'nah', 'nap', 'nds', 'nds-nl', 'ne', 'new', 'nia', - 'nl', 'nn', 'no', 'nov', 'nqo', 'nrm', 'nso', 'nv', 'ny', 'oc', 'olo', - 'om', 'or', 'os', 'pa', 'pag', 'pam', 'pap', 'pcd', 'pcm', 'pdc', - 'pfl', 'pi', 'pih', 'pl', 'pms', 'pnb', 'pnt', 'ps', 'pt', 'pwn', 'qu', - 'rm', 'rmy', 'rn', 'ro', 'roa-rup', 'roa-tara', 'ru', 'rue', 'rw', - 'sa', 'sah', 'sat', 'sc', 'scn', 'sco', 'sd', 'se', 'sg', 'sh', 'shi', - 'shn', 'si', 'simple', 'sk', 'skr', 'sl', 'sm', 'smn', 'sn', 'so', - 'sq', 'sr', 'srn', 'ss', 'st', 'stq', 'su', 'sv', 'sw', 'szl', 'szy', - 'ta', 'tay', 'tcy', 'te', 'tet', 'tg', 'th', 'ti', 'tk', 'tl', 'tly', - 'tn', 'to', 'tpi', 'tr', 'trv', 'ts', 'tt', 'tum', 'tw', 'ty', 'tyv', - 'udm', 'ug', 'uk', 'ur', 'uz', 've', 'vec', 'vep', 'vi', 'vls', 'vo', - 'wa', 'war', 'wo', 'wuu', 'xal', 'xh', 'xmf', 'yi', 'yo', 'za', 'zea', - 'zgh', 'zh', 'zh-classical', 'zh-min-nan', 'zh-yue', 'zu', + 'ann', 'anp', 'ar', 'arc', 'ary', 'arz', 'as', 'ast', 'atj', 'av', + 'avk', 'awa', 'ay', 'az', 'azb', 'ba', 'ban', 'bar', 'bat-smg', 'bbc', + 'bcl', 'bdr', 'be', 'be-tarask', 'bew', 'bg', 'bh', 'bi', 'bjn', 'blk', + 'bm', 'bn', 'bo', 'bpy', 'br', 'bs', 'btm', 'bug', 'bxr', 'ca', + 'cbk-zam', 'cdo', 'ce', 'ceb', 'ch', 'chr', 'chy', 'ckb', 'co', 'cr', + 'crh', 'cs', 'csb', 'cu', 'cv', 'cy', 'da', 'dag', 'de', 'dga', 'din', + 'diq', 'dsb', 'dtp', 'dty', 'dv', 'dz', 'ee', 'el', 'eml', 'en', 'eo', + 'es', 'et', 'eu', 'ext', 'fa', 'fat', 'ff', 'fi', 'fiu-vro', 'fj', + 'fo', 'fon', 'fr', 'frp', 'frr', 'fur', 'fy', 'ga', 'gag', 'gan', + 'gcr', 'gd', 'gl', 'glk', 'gn', 'gom', 'gor', 'got', 'gpe', 'gu', + 'guc', 'gur', 'guw', 'gv', 'ha', 'hak', 'haw', 'he', 'hi', 'hif', 'hr', + 'hsb', 'ht', 'hu', 'hy', 'hyw', 'ia', 'iba', 'id', 'ie', 'ig', 'igl', + 'ik', 'ilo', 'inh', 'io', 'is', 'it', 'iu', 'ja', 'jam', 'jbo', 'jv', + 'ka', 'kaa', 'kab', 'kbd', 'kbp', 'kcg', 'kg', 'kge', 'ki', 'kk', 'kl', + 'km', 'kn', 'ko', 'koi', 'krc', 'ks', 'ksh', 'ku', 'kus', 'kv', 'kw', + 'ky', 'la', 'lad', 'lb', 'lbe', 'lez', 'lfn', 'lg', 'li', 'lij', 'lld', + 'lmo', 'ln', 'lo', 'lt', 'ltg', 'lv', 'mad', 'mai', 'map-bms', 'mdf', + 'mg', 'mhr', 'mi', 'min', 'mk', 'ml', 'mn', 'mni', 'mnw', 'mos', 'mr', + 'mrj', 'ms', 'mt', 'mwl', 'my', 'myv', 'mzn', 'nah', 'nap', 'nds', + 'nds-nl', 'ne', 'new', 'nia', 'nl', 'nn', 'no', 'nov', 'nqo', 'nr', + 'nrm', 'nso', 'nv', 'ny', 'oc', 'olo', 'om', 'or', 'os', 'pa', 'pag', + 'pam', 'pap', 'pcd', 'pcm', 'pdc', 'pfl', 'pi', 'pih', 'pl', 'pms', + 'pnb', 'pnt', 'ps', 'pt', 'pwn', 'qu', 'rm', 'rmy', 'rn', 'ro', + 'roa-rup', 'roa-tara', 'rsk', 'ru', 'rue', 'rw', 'sa', 'sah', 'sat', + 'sc', 'scn', 'sco', 'sd', 'se', 'sg', 'sh', 'shi', 'shn', 'si', + 'simple', 'sk', 'skr', 'sl', 'sm', 'smn', 'sn', 'so', 'sq', 'sr', + 'srn', 'ss', 'st', 'stq', 'su', 'sv', 'sw', 'szl', 'szy', 'ta', 'tay', + 'tcy', 'tdd', 'te', 'tet', 'tg', 'th', 'ti', 'tk', 'tl', 'tly', 'tn', + 'to', 'tpi', 'tr', 'trv', 'ts', 'tt', 'tum', 'tw', 'ty', 'tyv', 'udm', + 'ug', 'uk', 'ur', 'uz', 've', 'vec', 'vep', 'vi', 'vls', 'vo', 'wa', + 'war', 'wo', 'wuu', 'xal', 'xh', 'xmf', 'yi', 'yo', 'za', 'zea', 'zgh', + 'zh', 'zh-classical', 'zh-min-nan', 'zh-yue', 'zu', } # Sites we want to edit but not count as real languages diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index e0b231b..8b3d0c2 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -27,13 +27,13 @@ ] codes = { - 'ar', 'as', 'az', 'ban', 'be', 'bg', 'bn', 'br', 'bs', 'ca', 'cs', - 'cy', 'da', 'de', 'el', 'en', 'eo', 'es', 'et', 'eu', 'fa', 'fi', 'fo', - 'fr', 'gl', 'gu', 'he', 'hi', 'hr', 'hu', 'hy', 'id', 'is', 'it', 'ja', - 'jv', 'ka', 'kn', 'ko', 'la', 'li', 'lij', 'lt', 'mk', 'ml', 'mr', - 'ms', 'mul', 'my', 'nap', 'nl', 'no', 'or', 'pa', 'pl', 'pms', 'pt', - 'ro', 'ru', 'sa', 'sah', 'sk', 'sl', 'sr', 'su', 'sv', 'ta', 'te', - 'th', 'tr', 'uk', 'vec', 'vi', 'wa', 'yi', 'zh', 'zh-min-nan', + 'ar', 'as', 'az', 'ban', 'bcl', 'be', 'bg', 'bn', 'br', 'bs', 'ca', + 'cs', 'cy', 'da', 'de', 'el', 'en', 'eo', 'es', 'et', 'eu', 'fa', 'fi', + 'fo', 'fr', 'gl', 'gu', 'he', 'hi', 'hr', 'hu', 'hy', 'id', 'is', 'it', + 'ja', 'jv', 'ka', 'kn', 'ko', 'la', 'li', 'lij', 'lt', 'mk', 'ml', + 'mr', 'ms', 'mul', 'my', 'nap', 'nl', 'no', 'or', 'pa', 'pl', 'pms', + 'pt', 'ro', 'ru', 'sa', 'sah', 'sk', 'sl', 'sr', 'su', 'sv', 'ta', + 'te', 'th', 'tr', 'uk', 'vec', 'vi', 'wa', 'yi', 'zh', 'zh-min-nan', } # Sites we want to edit but not count as real languages -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1080031?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I43ea573d3f96e91f80c8f3a7ceac747183f3468f Gerrit-Change-Number: 1080031 Gerrit-PatchSet: 3 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Xqt <info(a)gno.de>

1 0

[Gerrit] ...core[master]: [tests] run TestTkinter on en-wiki only
by jenkins-bot (Code Review) 13 Oct '24

13 Oct '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1079659?usp=email ) Change subject: [tests] run TestTkinter on en-wiki only ...................................................................... [tests] run TestTkinter on en-wiki only Otherwise it could fail because of different content. Change-Id: I2b4a0e191a04e4421b4c48043800ec6db9addb0b --- M tests/gui_tests.py 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/gui_tests.py b/tests/gui_tests.py index f6c51a4..3d15388 100755 --- a/tests/gui_tests.py +++ b/tests/gui_tests.py @@ -13,7 +13,7 @@ from contextlib import suppress import pywikibot -from tests.aspects import DefaultSiteTestCase, TestCase, require_modules +from tests.aspects import TestCase, require_modules class TestTkdialog(TestCase): @@ -36,11 +36,12 @@ self.assertTrue(skip) -class TestTkinter(DefaultSiteTestCase): +class TestTkinter(TestCase): """Test Tkinter.""" - net = True + family = 'wikipedia' + code = 'en' def test_tkinter(self): """Test Tkinter window.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1079659?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I2b4a0e191a04e4421b4c48043800ec6db9addb0b Gerrit-Change-Number: 1079659 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: [tests] remove `PYWIKIBOT_TEST_WRITE_FAIL` from documentation
by jenkins-bot (Code Review) 13 Oct '24

13 Oct '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1079658?usp=email ) Change subject: [tests] remove `PYWIKIBOT_TEST_WRITE_FAIL` from documentation ...................................................................... [tests] remove `PYWIKIBOT_TEST_WRITE_FAIL` from documentation Change-Id: Ieec6c02cc3e22925647049750cc87e02c256935e --- M tests/README.rst 1 file changed, 5 insertions(+), 15 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/README.rst b/tests/README.rst index 53a0784..7c82899 100644 --- a/tests/README.rst +++ b/tests/README.rst @@ -145,18 +145,11 @@ PYWIKIBOT_TEST_WRITE=1 -**PYWIKIBOT_TEST_WRITE_FAIL** - There are a set of 'edit failure' tests, which attempt to write to the wikis - and **should** fail. If there is a bug in pywikibot or MediaWiki, these - tests **may** actually perform a write operation. - - To enable 'edit failure' tests, set:: - - PYWIKIBOT_TEST_WRITE_FAIL=1 - - .. deprecated:: 9.2 - this environment variable no longer has any effect; use - :envvar:`PYWIKIBOT_TEST_WRITE` instead. +.. versionremoved:: 9.2 + The :envvar:`PYWIKIBOT_TEST_WRITE_FAIL` environment variable; use + :envvar:`PYWIKIBOT_TEST_WRITE` instead. +.. versionremoved:: 9.5 + The :envvar:`PYWIKIBOT_TEST_GUI` environment variable. Instead of setting the environment by the os (or `os.environ` as well) you can use the :mod:`pwb` wrapper script to set it:: @@ -167,9 +160,6 @@ pwb PYWIKIBOT_TEST_WRITE script_tests -v TestScriptSimulate.test_archivebot -.. versionremoved:: 9.5 - The :envvar:`PYWIKIBOT_TEST_GUI` environment variable. - Decorators ========== -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1079658?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Ieec6c02cc3e22925647049750cc87e02c256935e Gerrit-Change-Number: 1079658 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: [test] run gui_tests with pytest and pytest-xvfb
by Xqt (Code Review) 13 Oct '24

13 Oct '24

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1079656?usp=email ) Change subject: [test] run gui_tests with pytest and pytest-xvfb ...................................................................... [test] run gui_tests with pytest and pytest-xvfb Also remove PYWIKIBOT_TEST_GUI environment variable. Bug: T377065 Change-Id: Ibee9b624cb21158870b04c446846c890f07e33b8 --- M .github/workflows/pywikibot-ci.yml M dev-requirements.txt M tests/README.rst M tests/gui_tests.py 4 files changed, 24 insertions(+), 18 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index 7e05b1f..5119a15 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -14,7 +14,6 @@ env: PYWIKIBOT_TEST_RUNNING: 1 PYWIKIBOT_USERNAME: Pywikibot-test - PYWIKIBOT_TEST_GUI: 1 jobs: build: @@ -74,9 +73,6 @@ with: python-version: ${{ matrix.python-version }} - - name: Install Tkinter for Ubuntu - run: sudo apt-get install python3-tk - - name: Install dependencies run: | python -m pip install --upgrade pip @@ -127,7 +123,7 @@ ${{ (matrix.site == 'wikisource:zh' || matrix.test_no_rc) && 1 || 0 }} run: | python pwb.py version - if [ ${{matrix.site || 0}} != 'wikipedia:test' ]; then + if [ ${{matrix.site || 0}} != 'wikisource:zh' ]; then coverage run -m unittest discover -vv -p \"*_tests.py\"; else pytest --cov=.; diff --git a/dev-requirements.txt b/dev-requirements.txt index 87e1c4a..a87313f 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -6,6 +6,7 @@ pytest-cov >= 2.11.1; python_version<"3.10" pytest-subtests >= 0.3.2 pytest-attrib>=0.1.3 +pytest-xvfb>=3.0.0 pre-commit coverage>=5.2.1 diff --git a/tests/README.rst b/tests/README.rst index 94f8dfe..53a0784 100644 --- a/tests/README.rst +++ b/tests/README.rst @@ -81,13 +81,6 @@ Environment variables ===================== -**PYWIKIBOT_TEST_GUI** - Enable :source:`tests/gui_tests`. Used for AppVeyor tests. GitHub actions would - fail due to ``couldn't connect to display ":1.0"`` error. Set this environment - variable to run this test locally:: - - PYWIKIBOT_TEST_GUI=1 - **PYWIKIBOT_TEST_LOGOUT** Used when a test is logging out the test user. This environment variable enables :source:`tests/site_login_logout_tests`. The environment setting is @@ -174,6 +167,9 @@ pwb PYWIKIBOT_TEST_WRITE script_tests -v TestScriptSimulate.test_archivebot +.. versionremoved:: 9.5 + The :envvar:`PYWIKIBOT_TEST_GUI` environment variable. + Decorators ========== diff --git a/tests/gui_tests.py b/tests/gui_tests.py index b1602af..f6c51a4 100755 --- a/tests/gui_tests.py +++ b/tests/gui_tests.py @@ -1,13 +1,14 @@ #!/usr/bin/env python3 """Tests for the Tk UI.""" # -# (C) Pywikibot team, 2008-2023 +# (C) Pywikibot team, 2008-2024 # # Distributed under the terms of the MIT license. # from __future__ import annotations import os +import sys import unittest from contextlib import suppress @@ -59,12 +60,24 @@ def setUpModule(): """Skip tests if tkinter or PIL is not installed. - Also skip test if ``PYWIKIBOT_TEST_GUI`` environment variable is not - set. Otherwise import modules and run tests. + .. versionchanged:: 7.7 + skip test if ``PYWIKIBOT_TEST_GUI`` environment variable is not + set. + .. versionchanged:: 9.5 + :envvar:`PYWIKIBOT_TEST_GUI` environment variable was removed. + ``pytest`` with ``pytest-xvfb `` extension is required for this + tests on github actions. """ - if os.environ.get('PYWIKIBOT_TEST_GUI', '0') != '1': - raise unittest.SkipTest('Tkinter tests are not enabled. ' - '(set PYWIKIBOT_TEST_GUI=1 to enable)') + if os.environ.get('GITHUB_ACTIONS'): + skip = True + if 'pytest' in sys.modules: + with suppress(ModuleNotFoundError): + import pytest_xvfb # noqa: F401 + skip = False + + if skip: + raise unittest.SkipTest('Tkinter tests must run with pytest and ' + 'needs pytest-xvfb extension') global EditBoxWindow, Tkdialog, tkinter -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1079656?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Ibee9b624cb21158870b04c446846c890f07e33b8 Gerrit-Change-Number: 1079656 Gerrit-PatchSet: 6 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: [tests] try to run gui_tests on github after tkinter is installed
by Xqt (Code Review) 12 Oct '24

12 Oct '24

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1079616?usp=email ) Change subject: [tests] try to run gui_tests on github after tkinter is installed ...................................................................... [tests] try to run gui_tests on github after tkinter is installed Change-Id: If912d4e6a7bb08128e30f77a6303697c0ecfbea9 --- M .github/workflows/pywikibot-ci.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index b3a1415..7e05b1f 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -14,6 +14,7 @@ env: PYWIKIBOT_TEST_RUNNING: 1 PYWIKIBOT_USERNAME: Pywikibot-test + PYWIKIBOT_TEST_GUI: 1 jobs: build: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1079616?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: If912d4e6a7bb08128e30f77a6303697c0ecfbea9 Gerrit-Change-Number: 1079616 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de>

1 0

[Gerrit] ...core[master]: [doc] Update sphinx requirements
by jenkins-bot (Code Review) 12 Oct '24

12 Oct '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1079615?usp=email ) Change subject: [doc] Update sphinx requirements ...................................................................... [doc] Update sphinx requirements Change-Id: Ia28786b08e156608267985680c8036b928eec6a3 --- M docs/conf.py M docs/requirements.txt 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/conf.py b/docs/conf.py index 9e40c20..89c4abf 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -50,7 +50,7 @@ # If your documentation needs a minimal Sphinx version, state it here. # -needs_sphinx = '8.0.2' +needs_sphinx = '8.1.1' # 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 faa90f8..d64337a 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,11 +1,11 @@ # This is a PIP requirements file for building Sphinx documentation of Pywikibot # ../requirements.txt is also needed. # Note: Python 3.9 is required for sphinx 7.2 -sphinx >= 8.0.2 +sphinx >= 8.1.1 rstcheck >=6.2.4 sphinxext-opengraph >= 0.9.1 sphinx-copybutton >= 0.5.2 sphinx-notfound-page >= 1.0.4 -sphinx-tabs >= 3.4.5 -tomli; python_version < '3.11' +sphinx-tabs >= 3.4.7 +tomli >= 2.02; python_version < '3.11' furo >= 2024.8.6 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1079615?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Ia28786b08e156608267985680c8036b928eec6a3 Gerrit-Change-Number: 1079615 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: [tests] Python 3.13.0 final release was published, update gh actions
by Xqt (Code Review) 12 Oct '24

12 Oct '24

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1079613?usp=email ) Change subject: [tests] Python 3.13.0 final release was published, update gh actions ...................................................................... [tests] Python 3.13.0 final release was published, update gh actions Change-Id: I1edd56026a026fdee477cfd1bd56539ddae37ac5 --- M .github/workflows/doctest.yml M .github/workflows/login_tests-ci.yml M .github/workflows/oauth_tests-ci.yml M .github/workflows/pre-commit.yml M .github/workflows/pywikibot-ci.yml M .github/workflows/sysop_write_tests-ci.yml M .github/workflows/windows_tests.yml 7 files changed, 6 insertions(+), 7 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml index a8c91f0..d201bbc 100644 --- a/.github/workflows/doctest.yml +++ b/.github/workflows/doctest.yml @@ -23,7 +23,7 @@ max-parallel: 17 matrix: - python-version: [ "pypy3.7", "pypy3.10", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13.0-alpha - 3.13.0" ] + python-version: [ "pypy3.7", "pypy3.10", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13" ] os: [ windows-latest, macOS-latest, ubuntu-latest ] include: - python-version: "3.14-dev" diff --git a/.github/workflows/login_tests-ci.yml b/.github/workflows/login_tests-ci.yml index dc1de99..6cb43b5 100644 --- a/.github/workflows/login_tests-ci.yml +++ b/.github/workflows/login_tests-ci.yml @@ -23,7 +23,7 @@ max-parallel: 1 matrix: - python-version: [ "pypy3.7", "pypy3.10", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13.0-alpha - 3.13.0", "3.14-dev" ] + python-version: [ "pypy3.7", "pypy3.10", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev" ] site: [ "wikipedia:en", "wikisource:zh", "wikipedia:test" ] include: - python-version: "3.7" diff --git a/.github/workflows/oauth_tests-ci.yml b/.github/workflows/oauth_tests-ci.yml index b2f516f..d2e7c92 100644 --- a/.github/workflows/oauth_tests-ci.yml +++ b/.github/workflows/oauth_tests-ci.yml @@ -23,7 +23,7 @@ fail-fast: false matrix: - python-version: [ "pypy3.7", "pypy3.10", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13.0-alpha - 3.13.0", "3.14-dev" ] + python-version: [ "pypy3.7", "pypy3.10", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev" ] family: [ wikipedia ] code: [ test ] domain: [ "test.wikipedia.org" ] diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index adff076..cd169b9 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -17,7 +17,7 @@ fail-fast: false matrix: python-version: - - "3.13.0-alpha - 3.13.0" + - "3.13" - "3.14-dev" steps: - name: set up python ${{ matrix.python-version }} diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index ebc76d0..b3a1415 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -26,7 +26,7 @@ max-parallel: 18 matrix: - python-version: [ "pypy3.7", "pypy3.10", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13.0-alpha - 3.13.0", "3.14-dev" ] + python-version: [ "pypy3.7", "pypy3.10", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev" ] site: [ "wikipedia:en", "wikisource:zh" ] include: - python-version: "3.7" diff --git a/.github/workflows/sysop_write_tests-ci.yml b/.github/workflows/sysop_write_tests-ci.yml index 9d6219f..6d692cb 100644 --- a/.github/workflows/sysop_write_tests-ci.yml +++ b/.github/workflows/sysop_write_tests-ci.yml @@ -21,7 +21,6 @@ strategy: fail-fast: false - max-parallel: 2 matrix: python-version: [ "3.7" ] diff --git a/.github/workflows/windows_tests.yml b/.github/workflows/windows_tests.yml index 838cb48..5a24fbc 100644 --- a/.github/workflows/windows_tests.yml +++ b/.github/workflows/windows_tests.yml @@ -23,7 +23,7 @@ fail-fast: false matrix: - python-version: [ "3.7.1", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13.0-alpha - 3.13.0" ] + python-version: [ "3.7.1", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13" ] python-arch: [ x64, x86 ] site: [ "wikipedia:en" ] -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1079613?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I1edd56026a026fdee477cfd1bd56539ddae37ac5 Gerrit-Change-Number: 1079613 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de>

1 0

[Gerrit] ...core[master]: [tests} install tksinter on ubuntu for gui tests
by Xqt (Code Review) 12 Oct '24

12 Oct '24

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1079612?usp=email ) Change subject: [tests} install tksinter on ubuntu for gui tests ...................................................................... [tests} install tksinter on ubuntu for gui tests Change-Id: If3bf03a054e5343a95a871484bb0e23e8b185714 --- M .github/workflows/pywikibot-ci.yml 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index c85c233..ebc76d0 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -73,6 +73,9 @@ with: python-version: ${{ matrix.python-version }} + - name: Install Tkinter for Ubuntu + run: sudo apt-get install python3-tk + - name: Install dependencies run: | python -m pip install --upgrade pip -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1079612?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: If3bf03a054e5343a95a871484bb0e23e8b185714 Gerrit-Change-Number: 1079612 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de>

1 0

[Gerrit] ...core[master]: Update versions after pywikibot-scripts 9.4.1 and fix make_dist.py
by jenkins-bot (Code Review) 12 Oct '24

12 Oct '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1079596?usp=email ) Change subject: Update versions after pywikibot-scripts 9.4.1 and fix make_dist.py ...................................................................... Update versions after pywikibot-scripts 9.4.1 and fix make_dist.py Change-Id: Iadad28664f0e03e9b7ffc908518ad357581dcb5c --- M make_dist.py M pywikibot/__metadata__.py M scripts/__init__.py M scripts/pyproject.toml M tests/make_dist_tests.py 5 files changed, 5 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/make_dist.py b/make_dist.py index 90b5036..e00622b 100755 --- a/make_dist.py +++ b/make_dist.py @@ -269,7 +269,7 @@ upgrade = '-upgrade' in sys.argv scripts = 'scripts' in sys.argv - if remote and 'dev' in __version__: # pragma: no cover + if not scripts and remote and 'dev' in __version__: # pragma: no cover warning('Distribution must not be a developmental release to upload.') remote = False diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index c6f8bb8..550a499 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -12,6 +12,6 @@ from time import strftime -__version__ = '9.5.0.dev0' +__version__ = '9.5.0.dev1' __url__ = 'https://www.mediawiki.org/wiki/Manual:Pywikibot' __copyright__ = f'2003-{strftime("%Y")}, Pywikibot team' diff --git a/scripts/__init__.py b/scripts/__init__.py index 37855d0..109f604 100644 --- a/scripts/__init__.py +++ b/scripts/__init__.py @@ -34,7 +34,7 @@ from pathlib import Path -__version__ = '9.4.1' +__version__ = '9.5.0' #: defines the entry point for pywikibot-scripts package base_dir = Path(__file__).parent diff --git a/scripts/pyproject.toml b/scripts/pyproject.toml index b1e8481..0db8540 100644 --- a/scripts/pyproject.toml +++ b/scripts/pyproject.toml @@ -7,7 +7,7 @@ [project] name = "pywikibot-scripts" -version = "9.4.1" +version = "9.5.0" authors = [ {name = "xqt", email = "info(a)gno.de"}, diff --git a/tests/make_dist_tests.py b/tests/make_dist_tests.py index 671f4c3..85e159f 100755 --- a/tests/make_dist_tests.py +++ b/tests/make_dist_tests.py @@ -31,7 +31,7 @@ sys.argv += ['-local', 'scripts', '-remote'] local, remote, clear, upgrade, scripts = make_dist.handle_args() self.assertTrue(local) - self.assertEqual(remote, 'dev' not in __version__) + self.assertTrue(remote) self.assertFalse(clear) self.assertFalse(upgrade) self.assertTrue(scripts) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1079596?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Iadad28664f0e03e9b7ffc908518ad357581dcb5c Gerrit-Change-Number: 1079596 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <dalangi-ctr(a)wikimedia.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: [bugfix] import scripts from pywikibot-scripts if site-package is ins...
by jenkins-bot (Code Review) 12 Oct '24

12 Oct '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1079586?usp=email ) Change subject: [bugfix] import scripts from pywikibot-scripts if site-package is installed ...................................................................... [bugfix] import scripts from pywikibot-scripts if site-package is installed Also update documentation and version. Bug: T377056 Change-Id: If3dcef986e5d9dab9bf1ca335216b571dc4c415d --- M scripts/CHANGELOG.rst M scripts/__init__.py M scripts/checkimages.py M scripts/image.py M scripts/maintenance/make_i18n_dict.py M scripts/misspelling.py M scripts/nowcommons.py M scripts/pyproject.toml M scripts/reflinks.py M scripts/template.py M scripts/watchlist.py 11 files changed, 62 insertions(+), 17 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/scripts/CHANGELOG.rst b/scripts/CHANGELOG.rst index 9b3753b..89c8c5a 100644 --- a/scripts/CHANGELOG.rst +++ b/scripts/CHANGELOG.rst @@ -1,6 +1,12 @@ Scripts Changelog ================= +9.4.1 +----- + +* import scripts from pywikibot-scripts if site-package is installed (:phab:`T377056`) +* i18n updates + 9.4.0 ----- diff --git a/scripts/__init__.py b/scripts/__init__.py index 109f604..37855d0 100644 --- a/scripts/__init__.py +++ b/scripts/__init__.py @@ -34,7 +34,7 @@ from pathlib import Path -__version__ = '9.5.0' +__version__ = '9.4.1' #: defines the entry point for pywikibot-scripts package base_dir = Path(__file__).parent diff --git a/scripts/checkimages.py b/scripts/checkimages.py index 0b24bf5..5c7077e 100755 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -101,7 +101,12 @@ ) from pywikibot.family import Family from pywikibot.site import Namespace -from scripts.welcome import get_welcome_text + + +try: + from scripts.welcome import get_welcome_text +except ModuleNotFoundError: + from pywikibot_scripts.welcome import get_welcome_text ############################################################################### diff --git a/scripts/image.py b/scripts/image.py index 5be3a3b..a8a5632 100755 --- a/scripts/image.py +++ b/scripts/image.py @@ -49,7 +49,12 @@ from pywikibot import i18n, pagegenerators from pywikibot.bot import SingleSiteBot from pywikibot.textlib import case_escape, ignore_case -from scripts.replace import ReplaceRobot as ReplaceBot + + +try: + from scripts.replace import ReplaceRobot as ReplaceBot +except ModuleNotFoundError: + from pywikibot_scripts.replace import ReplaceRobot as ReplaceBot class ImageRobot(ReplaceBot): diff --git a/scripts/maintenance/make_i18n_dict.py b/scripts/maintenance/make_i18n_dict.py index 577d088..5c22a3b 100755 --- a/scripts/maintenance/make_i18n_dict.py +++ b/scripts/maintenance/make_i18n_dict.py @@ -1,14 +1,16 @@ #!/usr/bin/env python3 -""" -Generate an i18n file from a given script. +"""Generate an i18n file from a given script. -run IDLE at topmost level: +Run IDLE at topmost level: >>> import pwb >>> from scripts.maintenance.make_i18n_dict import i18nBot >>> bot = i18nBot('<scriptname>', '<msg dict>') >>> bot.run() +.. hint:: Import from ``pywikibot-scripts`` if scripts are installed as + a site-package. + If you have more than one message dictionary, give all these names to the bot: >>> bot = i18nBot('<scriptname>', '<msg dict1>', '<msg dict2>', '<msg dict3>') @@ -28,7 +30,7 @@ >>> bot.to_json() """ # -# (C) Pywikibot team, 2013-2023 +# (C) Pywikibot team, 2013-2024 # # Distributed under the terms of the MIT license. # diff --git a/scripts/misspelling.py b/scripts/misspelling.py index 46830c8..ef3a50d 100755 --- a/scripts/misspelling.py +++ b/scripts/misspelling.py @@ -21,7 +21,7 @@ given, it starts at the beginning. """ # -# (C) Pywikibot team, 2007-2022 +# (C) Pywikibot team, 2007-2024 # # Distributed under the terms of the MIT license. # @@ -32,9 +32,17 @@ import pywikibot from pywikibot import i18n, pagegenerators -from scripts.solve_disambiguation import DisambiguationRobot as BaseDisambigBot +try: + from scripts.solve_disambiguation import ( + DisambiguationRobot as BaseDisambigBot, + ) +except ModuleNotFoundError: + from pywikibot_scripts.solve_disambiguation import ( + DisambiguationRobot as BaseDisambigBot, + ) + HELP_MSG = """\n misspelling.py does not support site {site}. diff --git a/scripts/nowcommons.py b/scripts/nowcommons.py index db8d202..e8bda2c 100755 --- a/scripts/nowcommons.py +++ b/scripts/nowcommons.py @@ -58,7 +58,12 @@ from pywikibot.bot import ConfigParserBot, CurrentPageBot from pywikibot.exceptions import IsRedirectPageError, NoPageError from pywikibot.tools.itertools import filter_unique -from scripts.image import ImageRobot as ImageBot + + +try: + from scripts.image import ImageRobot as ImageBot +except ModuleNotFoundError: + from pywikibot_scripts.image import ImageRobot as ImageBot nowcommons = { diff --git a/scripts/pyproject.toml b/scripts/pyproject.toml index b2f915f..b1e8481 100644 --- a/scripts/pyproject.toml +++ b/scripts/pyproject.toml @@ -7,7 +7,7 @@ [project] name = "pywikibot-scripts" -version = "9.4.0" +version = "9.4.1" authors = [ {name = "xqt", email = "info(a)gno.de"}, @@ -19,12 +19,11 @@ readme = "scripts/README.rst" requires-python = ">=3.7.0" dependencies = [ - "pywikibot >= 9.4.0.dev0", + "pywikibot >= 9.4.0", "isbnlib", "langdetect", "mwparserfromhell", "pydot", - "requests", "unidecode", ] diff --git a/scripts/reflinks.py b/scripts/reflinks.py index 9938011..50c2397 100755 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -72,7 +72,12 @@ ) from pywikibot.textlib import replaceExcept from pywikibot.tools.chars import string2html -from scripts import noreferences + + +try: + from scripts import noreferences +except ModuleNotFoundError: + from pywikibot_scripts import noreferences docuReplacements = { diff --git a/scripts/template.py b/scripts/template.py index 0cbc679..1e57e89 100755 --- a/scripts/template.py +++ b/scripts/template.py @@ -101,7 +101,7 @@ python pwb.py template test1 test2 "space test" -subst -ns:3 -always """ # -# (C) Pywikibot team, 2003-2023 +# (C) Pywikibot team, 2003-2024 # # Distributed under the terms of the MIT license. # @@ -115,7 +115,12 @@ from pywikibot.bot import SingleSiteBot from pywikibot.pagegenerators import XMLDumpPageGenerator from pywikibot.tools.itertools import filter_unique, roundrobin_generators -from scripts.replace import ReplaceRobot as ReplaceBot + + +try: + from scripts.replace import ReplaceRobot as ReplaceBot +except ModuleNotFoundError: + from pywikibot_scripts.replace import ReplaceRobot as ReplaceBot class TemplateRobot(ReplaceBot): diff --git a/scripts/watchlist.py b/scripts/watchlist.py index 2be17d6..8a15ec5 100755 --- a/scripts/watchlist.py +++ b/scripts/watchlist.py @@ -37,7 +37,12 @@ from pywikibot import config from pywikibot.data.api import CachedRequest from pywikibot.exceptions import InvalidTitleError -from scripts.maintenance.cache import CacheEntry + + +try: + from scripts.maintenance.cache import CacheEntry +except ModuleNotFoundError: + from pywikibot_scripts.maintenance.cache import CacheEntry def get(site=None) -> list[str]: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1079586?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: If3dcef986e5d9dab9bf1ca335216b571dc4c415d Gerrit-Change-Number: 1079586 Gerrit-PatchSet: 7 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <dalangi-ctr(a)wikimedia.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits October 2024