Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13579 discussions

[Gerrit] ...core[master]: code formatting
by jenkins-bot (Code Review) 30 Jul '24

30 Jul '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1058183?usp=email ) Change subject: code formatting ...................................................................... code formatting patch detached from Ibef01b1c705ec560cafa7bc71feca7f5a0824037 Change-Id: I5ffef06e14ca11e77667d51a8ff1327fda76ca1b --- M CODE_OF_CONDUCT.rst M docs/api_ref/family.rst M docs/api_ref/i18n_plural.rst M docs/scripts/archive.rst M docs/scripts/categories.rst M docs/scripts/outdated.rst M pywikibot/CONTENT.rst M pywikibot/proofreadpage.py M setup.py M tests/i18n/test/en.json M tests/i18n/test/fr.json M tests/i18n/test/fy.json M tests/i18n/test/ja.json M tests/i18n/test/nl.json 14 files changed, 12 insertions(+), 18 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/CODE_OF_CONDUCT.rst b/CODE_OF_CONDUCT.rst index 71156e2..370b7a0 100644 --- a/CODE_OF_CONDUCT.rst +++ b/CODE_OF_CONDUCT.rst @@ -3,4 +3,3 @@ The development of this software is covered by a `Code of Conduct <https://www.mediawiki.org/wiki/Special:MyLanguage/Code_of_Conduct>`_. - diff --git a/docs/api_ref/family.rst b/docs/api_ref/family.rst index 9ba9afd..9717a19 100644 --- a/docs/api_ref/family.rst +++ b/docs/api_ref/family.rst @@ -37,4 +37,3 @@ cls.code_aliases = aliases .. versionadded:: 8.3 - diff --git a/docs/api_ref/i18n_plural.rst b/docs/api_ref/i18n_plural.rst index 61d7844..89f4bcb 100644 --- a/docs/api_ref/i18n_plural.rst +++ b/docs/api_ref/i18n_plural.rst @@ -3,4 +3,4 @@ *********************************** .. automodule:: plural - :synopsis: Module containing plural rules of various languages \ No newline at end of file + :synopsis: Module containing plural rules of various languages diff --git a/docs/scripts/archive.rst b/docs/scripts/archive.rst index dc11cc8..d745d97 100644 --- a/docs/scripts/archive.rst +++ b/docs/scripts/archive.rst @@ -274,4 +274,3 @@ OCR tool will be used to get text. In this case, also already existing pages with quality value 'Not Proofread' can be treated. '-force' will override existing page in this case. - diff --git a/docs/scripts/categories.rst b/docs/scripts/categories.rst index 2c78359..fca2dc0 100644 --- a/docs/scripts/categories.rst +++ b/docs/scripts/categories.rst @@ -22,4 +22,3 @@ .. automodule:: scripts.commonscat :no-members: :noindex: - diff --git a/docs/scripts/outdated.rst b/docs/scripts/outdated.rst index 53f6e2f..5e907af 100644 --- a/docs/scripts/outdated.rst +++ b/docs/scripts/outdated.rst @@ -177,4 +177,3 @@ A robot to implement backlinks from an interwiki.log file without checking them against the live wikipedia. - diff --git a/pywikibot/CONTENT.rst b/pywikibot/CONTENT.rst index 17b5a60..c1a131e 100644 --- a/pywikibot/CONTENT.rst +++ b/pywikibot/CONTENT.rst @@ -270,4 +270,3 @@ +----------------------------+------------------------------------------------------+ | README.rst | Package description file | +----------------------------+------------------------------------------------------+ - diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index 61dfd45..727527d 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -319,7 +319,7 @@ return f"{self.__class__.__name__}('{self}')" -def decompose(fn: Callable) -> Callable: # type: ignore +def decompose(fn: Callable) -> Callable: """Decorator for ProofreadPage. Decompose text if needed and recompose text. @@ -335,7 +335,7 @@ return wrapper -def check_if_cached(fn: Callable) -> Callable: # type: ignore +def check_if_cached(fn: Callable) -> Callable: """Decorator for IndexPage to ensure data is cached.""" def wrapper(self: IndexPage, *args: Any, **kwargs: Any) -> Any: @@ -818,7 +818,7 @@ pywikibot.error(f'Error fetching HTML for {self}.') raise - soup = _bs4_soup(response.text) # type: ignore + soup = _bs4_soup(response.text) try: url_image = soup.find(class_='prp-page-image') @@ -1149,7 +1149,7 @@ self._pages_from_label: dict[str, set[pywikibot.Page]] = {} self._labels_from_page_number: dict[int, str] = {} self._labels_from_page: dict[pywikibot.page.Page, str] = {} - self._soup = _bs4_soup(self.get_parsed_page(True)) # type: ignore + self._soup = _bs4_soup(self.get_parsed_page(True)) # Do not search for "new" here, to avoid to skip purging if links # to non-existing pages are present. attrs = {'class': re.compile('prp-pagequality-[0-4]')} @@ -1175,7 +1175,7 @@ } if not found: self.purge() - self._soup = _bs4_soup(self.get_parsed_page(True)) # type: ignore + self._soup = _bs4_soup(self.get_parsed_page(True)) if not self._soup.find_all('a', attrs=attrs): raise ValueError( 'Missing class="qualityN prp-pagequality-N" or ' diff --git a/setup.py b/setup.py index 20d762f..358aea4 100755 --- a/setup.py +++ b/setup.py @@ -102,7 +102,7 @@ # Add all dependencies as test dependencies, # so all scripts can be compiled for script_tests, etc. if 'PYSETUP_TEST_EXTRAS' in os.environ: # pragma: no cover - test_deps += [i for k, v in extra_deps.items() if k != 'flake8' for i in v] + test_deps += [i for v in extra_deps.values() for i in v] # These extra dependencies are needed other unittest fails to load tests. test_deps += extra_deps['eventstreams'] diff --git a/tests/i18n/test/en.json b/tests/i18n/test/en.json index 1d53316..f666f31 100644 --- a/tests/i18n/test/en.json +++ b/tests/i18n/test/en.json @@ -3,4 +3,4 @@ "test-non-localized": "test-non-localized EN", "test-plural": "Bot: Changing %(num)s {{PLURAL:%(num)d|page|pages}}.", "test-semi-localized": "test-semi-localized EN" -} \ No newline at end of file +} diff --git a/tests/i18n/test/fr.json b/tests/i18n/test/fr.json index 4066396..369aba5 100644 --- a/tests/i18n/test/fr.json +++ b/tests/i18n/test/fr.json @@ -1,3 +1,3 @@ { "test-plural": "Robot: Changer %(descr)s {{PLURAL:num|une page|quelques pages}}." -} \ No newline at end of file +} diff --git a/tests/i18n/test/fy.json b/tests/i18n/test/fy.json index 5e207fb..cb81bc8 100644 --- a/tests/i18n/test/fy.json +++ b/tests/i18n/test/fy.json @@ -1,3 +1,3 @@ { "test-localized": "test-localized FY" -} \ No newline at end of file +} diff --git a/tests/i18n/test/ja.json b/tests/i18n/test/ja.json index d9a9084..740a637 100644 --- a/tests/i18n/test/ja.json +++ b/tests/i18n/test/ja.json @@ -1,3 +1,3 @@ { "test-no-english": "test-no-english JA" -} \ No newline at end of file +} diff --git a/tests/i18n/test/nl.json b/tests/i18n/test/nl.json index 7f695c9..05b5af1 100644 --- a/tests/i18n/test/nl.json +++ b/tests/i18n/test/nl.json @@ -2,4 +2,4 @@ "test-localized": "test-localized NL", "test-plural": "Bot: Pas {{PLURAL:num|1 pagina|%(num)d pagina's}} aan.", "test-semi-localized": "test-semi-localized NL" -} \ No newline at end of file +} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1058183?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: I5ffef06e14ca11e77667d51a8ff1327fda76ca1b Gerrit-Change-Number: 1058183 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-CC: JJMC89 <JJMC89.Wikimedia(a)gmail.com>

1 0

[Gerrit] ...core[master]: [test] update library and script tests sets
by jenkins-bot (Code Review) 30 Jul '24

30 Jul '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1057919?usp=email ) Change subject: [test] update library and script tests sets ...................................................................... [test] update library and script tests sets Change-Id: Ic97e960a8677af6a1c91637542345778bde27230 --- M tests/__init__.py 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/__init__.py b/tests/__init__.py index 43aed9d..ce5f2c9 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -100,23 +100,28 @@ 'memento', 'mysql', 'namespace', + 'oauth', 'page', 'pagegenerators', 'paraminfo', 'plural', 'proofreadpage', + 'setup', 'site', 'site_decorators', 'site_generators', 'site_detect', + 'site_login_logout', 'site_obsoletesites', 'siteinfo', + 'superset', 'sparql', 'tests', 'textlib', 'thanks', 'time', 'timestripper', + 'titletranslate', 'token', 'tools', 'tools_chars', @@ -128,6 +133,7 @@ 'upload', 'uploadbot', 'user', + 'version', 'wikibase', 'wikibase_edit', 'wikiblame', @@ -150,6 +156,7 @@ 'interwikidata', 'l10n', 'make_dist', + 'noreferences', 'patrolbot', 'protectbot', 'pwb', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1057919?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: Ic97e960a8677af6a1c91637542345778bde27230 Gerrit-Change-Number: 1057919 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: automatically sort imports
by jenkins-bot (Code Review) 29 Jul '24

29 Jul '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1057956?usp=email ) Change subject: automatically sort imports ...................................................................... automatically sort imports Change-Id: Id3241f339b2997d018f34cad212bef6e2136815e --- M pywikibot/bot.py M pywikibot/logging.py M pywikibot/page/_basepage.py M pywikibot/page/_toolforge.py M scripts/__init__.py M scripts/commons_information.py M tests/__init__.py M tests/archivebot_tests.py M tests/aspects.py M tests/basesite_tests.py M tests/category_bot_tests.py M tests/data/fixes.py M tests/data/set-fixes.py M tests/djvu_tests.py M tests/edit_tests.py M tests/l10n_tests.py M tests/namespace_tests.py M tests/page_tests.py M tests/pagegenerators_tests.py M tests/patrolbot_tests.py M tests/pwb_tests.py M tests/replacebot_tests.py M tests/script_tests.py M tests/site_generators_tests.py M tests/sparql_tests.py M tests/textlib_tests.py M tests/thanks_tests.py M tests/timestripper_tests.py M tests/ui_options_tests.py M tests/ui_tests.py M tests/utils.py 31 files changed, 33 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified JJMC89: Looks good to me, approved diff --git a/pywikibot/bot.py b/pywikibot/bot.py index cdb9230..59780d3 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -169,6 +169,7 @@ VersionParseError, WikiBaseError, ) + # the constants are from pywikibot.logging import ( # noqa: F401 CRITICAL, diff --git a/pywikibot/logging.py b/pywikibot/logging.py index 225b30f..1091e45 100644 --- a/pywikibot/logging.py +++ b/pywikibot/logging.py @@ -30,6 +30,7 @@ # from __future__ import annotations + __all__ = ( 'CRITICAL', 'DEBUG', 'ERROR', 'INFO', 'WARNING', 'STDOUT', 'VERBOSE', 'INPUT', diff --git a/pywikibot/page/_basepage.py b/pywikibot/page/_basepage.py index 0223c20..f6b1bab 100644 --- a/pywikibot/page/_basepage.py +++ b/pywikibot/page/_basepage.py @@ -38,9 +38,9 @@ from pywikibot.tools import ( ComparableMixin, cached, + deprecate_positionals, deprecated, deprecated_args, - deprecate_positionals, first_upper, issue_deprecation_warning, remove_last_args, diff --git a/pywikibot/page/_toolforge.py b/pywikibot/page/_toolforge.py index cd41964..2d64209 100644 --- a/pywikibot/page/_toolforge.py +++ b/pywikibot/page/_toolforge.py @@ -17,6 +17,7 @@ from pywikibot import textlib from pywikibot.tools import deprecated, deprecated_args + try: import wikitextparser except ImportError as e: @@ -24,6 +25,7 @@ if TYPE_CHECKING: import datetime + from pywikibot import Timestamp DATETYPE = str | Timestamp | datetime.datetime | datetime.date | None diff --git a/scripts/__init__.py b/scripts/__init__.py index 9772875..67c172f 100644 --- a/scripts/__init__.py +++ b/scripts/__init__.py @@ -31,4 +31,5 @@ # from __future__ import annotations + __version__ = '9.4.0' diff --git a/scripts/commons_information.py b/scripts/commons_information.py index 77eb3dc..7da3aa6 100755 --- a/scripts/commons_information.py +++ b/scripts/commons_information.py @@ -73,6 +73,7 @@ from pywikibot import config, i18n, pagegenerators from pywikibot.bot import ExistingPageBot, SingleSiteBot + # This is required for the text that is shown when you run this script # with the parameter -help or without parameters. docuReplacements = {'&params;': pagegenerators.parameterHelp} # noqa: N816 diff --git a/tests/__init__.py b/tests/__init__.py index 43aed9d..3b7db6b 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -6,6 +6,7 @@ # from __future__ import annotations + __all__ = ( 'create_path_func', 'join_cache_path', 'join_data_path', 'join_html_data_path', 'join_images_path', 'join_pages_path', @@ -33,6 +34,7 @@ from pywikibot.data.api import CachedRequest from pywikibot.data.api import Request as _original_Request + _root_dir = os.path.split(os.path.split(__file__)[0])[0] WARN_SITE_CODE = '^Site .*:.* instantiated using different code *' # T234147 diff --git a/tests/archivebot_tests.py b/tests/archivebot_tests.py index 29361f8..479e57b 100755 --- a/tests/archivebot_tests.py +++ b/tests/archivebot_tests.py @@ -17,6 +17,7 @@ from scripts import archivebot from tests.aspects import TestCase + THREADS = { 'als': 4, 'ar': 1, 'bar': 0, 'bg': 0, 'bjn': 1, 'bs': 0, 'ca': 5, 'ckb': 2, 'cs': 0, 'de': 1, 'en': 25, 'eo': 2, 'es': 13, 'fa': 2, 'fr': 25, 'frr': 2, diff --git a/tests/aspects.py b/tests/aspects.py index e29fecb..769214f 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -56,6 +56,7 @@ skipping, ) + OSWIN32 = (sys.platform == 'win32') pywikibot.bot.set_interface('buffer') diff --git a/tests/basesite_tests.py b/tests/basesite_tests.py index 0e66123..4636eb1 100755 --- a/tests/basesite_tests.py +++ b/tests/basesite_tests.py @@ -13,6 +13,7 @@ from pywikibot.exceptions import Error from tests.aspects import DefaultSiteTestCase, TestCase, unittest + WARN_SELF_CALL = (r'Referencing this attribute like a function ' r'is deprecated .+; use it directly instead') diff --git a/tests/category_bot_tests.py b/tests/category_bot_tests.py index c0fbc89..0ce04ce 100755 --- a/tests/category_bot_tests.py +++ b/tests/category_bot_tests.py @@ -16,6 +16,7 @@ from scripts.category import CategoryMoveRobot, CategoryPreprocess from tests.aspects import DefaultSiteTestCase, TestCase + MOCKED_USERNAME = Mock(return_value='FakeUsername') diff --git a/tests/data/fixes.py b/tests/data/fixes.py index 8b625c8..9708107 100644 --- a/tests/data/fixes.py +++ b/tests/data/fixes.py @@ -6,6 +6,7 @@ # from __future__ import annotations + # flake8 cannot detect that fixes is defined via pywikibot.fixes if 'fixes' not in globals(): fixes = {} diff --git a/tests/data/set-fixes.py b/tests/data/set-fixes.py index 32e4cd0..0800174 100644 --- a/tests/data/set-fixes.py +++ b/tests/data/set-fixes.py @@ -6,5 +6,6 @@ # from __future__ import annotations + # Just kill the old value suffices fixes = {} diff --git a/tests/djvu_tests.py b/tests/djvu_tests.py index ffc5303..fc0f951 100755 --- a/tests/djvu_tests.py +++ b/tests/djvu_tests.py @@ -18,6 +18,7 @@ from tests.aspects import TestCase from tests.utils import skipping + join_djvu_data_path = create_path_func(join_data_path, 'djvu') file_djvu = join_djvu_data_path('myfilé.djvu') # test non-ASCII name diff --git a/tests/edit_tests.py b/tests/edit_tests.py index 2b37caf..7fb89e9 100755 --- a/tests/edit_tests.py +++ b/tests/edit_tests.py @@ -16,6 +16,7 @@ from pywikibot.exceptions import Error from tests.aspects import TestCase, require_version + called_back = False diff --git a/tests/l10n_tests.py b/tests/l10n_tests.py index 83c1958..859c6f6 100755 --- a/tests/l10n_tests.py +++ b/tests/l10n_tests.py @@ -16,6 +16,7 @@ from pywikibot.textlib import extract_templates_and_params_regex_simple from tests.aspects import MetaTestCaseClass, TestCase + PACKAGES = ( 'redirect-broken-redirect-template', # speedy deletion template 'archivebot-archiveheader', # archive header template diff --git a/tests/namespace_tests.py b/tests/namespace_tests.py index 23d11c2..28f6cf9 100755 --- a/tests/namespace_tests.py +++ b/tests/namespace_tests.py @@ -14,6 +14,7 @@ from pywikibot.site._namespace import BuiltinNamespace from tests.aspects import TestCase, unittest + # Default namespaces which should work in any MW wiki _base_builtin_ns = { 'Media': -2, diff --git a/tests/page_tests.py b/tests/page_tests.py index 9308f32..a84ea05 100755 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -38,6 +38,7 @@ ) from tests.utils import skipping + EMPTY_TITLE_RE = r'Title must be specified and not empty if source is a Site\.' INVALID_TITLE_RE = r'The link \[\[.*\]\] does not contain a page title' NO_PAGE_RE = r"doesn't exist\." diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 7d1aaa1..350f490 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -39,6 +39,7 @@ from tests.tools_tests import GeneratorIntersectTestCase from tests.utils import skipping + en_wp_page_titles = ( # just a bunch of randomly selected titles for English Wikipedia tests 'Eastern Sayan', diff --git a/tests/patrolbot_tests.py b/tests/patrolbot_tests.py index 28f8a69..b957695 100755 --- a/tests/patrolbot_tests.py +++ b/tests/patrolbot_tests.py @@ -12,6 +12,7 @@ from scripts.patrol import PatrolBot from tests.aspects import DefaultDrySiteTestCase, unittest + DUMMY_PAGE_TUPLES = """ This is some text above the entries: diff --git a/tests/pwb_tests.py b/tests/pwb_tests.py index 4a04f12..130ee4a 100755 --- a/tests/pwb_tests.py +++ b/tests/pwb_tests.py @@ -15,6 +15,7 @@ from tests.aspects import PwbTestCase from tests.utils import execute, execute_pwb + join_pwb_tests_path = create_path_func(join_tests_path, 'pwb') diff --git a/tests/replacebot_tests.py b/tests/replacebot_tests.py index 319871a..f7abe98 100755 --- a/tests/replacebot_tests.py +++ b/tests/replacebot_tests.py @@ -17,6 +17,7 @@ from tests.bot_tests import TWNBotTestCase from tests.utils import empty_sites + # Load only the custom fixes fixes.fixes.clear() fixes._load_file(join_data_path('fixes.py')) diff --git a/tests/script_tests.py b/tests/script_tests.py index bd208b3..7bd674e 100755 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -18,6 +18,7 @@ from tests.aspects import DefaultSiteTestCase, MetaTestCaseClass, PwbTestCase from tests.utils import execute_pwb + ci_test_run = os.environ.get('PYWIKIBOT_TEST_RUNNING', '0') == '1' scripts_path = join_root_path('scripts') diff --git a/tests/site_generators_tests.py b/tests/site_generators_tests.py index 75bd805..9655029 100755 --- a/tests/site_generators_tests.py +++ b/tests/site_generators_tests.py @@ -25,6 +25,7 @@ from tests.aspects import DefaultSiteTestCase, DeprecationTestCase, TestCase from tests.utils import skipping + global_expected_params = { 'action': ['query'], 'continue': [True], diff --git a/tests/sparql_tests.py b/tests/sparql_tests.py index 2037ada..01cc243 100755 --- a/tests/sparql_tests.py +++ b/tests/sparql_tests.py @@ -18,6 +18,7 @@ from tests.aspects import TestCase, WikidataTestCase from tests.utils import skipping + # See: https://www.w3.org/TR/2013/REC-sparql11-results-json-20130321/ SQL_RESPONSE_CONTAINER = """ diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 742a317..5acd756 100755 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -29,6 +29,7 @@ require_modules, ) + files = {} dirname = os.path.join(os.path.dirname(__file__), 'pages') diff --git a/tests/thanks_tests.py b/tests/thanks_tests.py index 2f8910b..f0300a0 100755 --- a/tests/thanks_tests.py +++ b/tests/thanks_tests.py @@ -13,6 +13,7 @@ from pywikibot.page import Page, User from tests.aspects import TestCase + NO_THANKABLE_REVS = 'There is no recent change which can be test thanked.' diff --git a/tests/timestripper_tests.py b/tests/timestripper_tests.py index 39d1b47..2b768f1 100755 --- a/tests/timestripper_tests.py +++ b/tests/timestripper_tests.py @@ -15,6 +15,7 @@ from pywikibot.time import TZoneFixedOffset from tests.aspects import TestCase, unittest + MatchObject = type(re.search('', '')) diff --git a/tests/ui_options_tests.py b/tests/ui_options_tests.py index bb6793b..d9f2f07 100755 --- a/tests/ui_options_tests.py +++ b/tests/ui_options_tests.py @@ -14,6 +14,7 @@ from pywikibot.bot_choice import ChoiceException, QuitKeyboardInterrupt from tests.aspects import TestCase + message = bot.Option.formatted diff --git a/tests/ui_tests.py b/tests/ui_tests.py index d8706ef..d688b0c 100755 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -33,6 +33,7 @@ from pywikibot.userinterfaces.transliteration import NON_LATIN_DIGITS, _trans from tests.aspects import TestCase, TestCaseBase + logger = logging.getLogger('pywiki') loggingcontext = {'caller_name': 'ui_tests', 'caller_file': 'ui_tests', diff --git a/tests/utils.py b/tests/utils.py index 341cb47..25b4547 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -26,6 +26,7 @@ from pywikibot.tools.collections import EMPTY_DEFAULT from tests import _pwb_py + OSWIN32 = (sys.platform == 'win32') -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1057956?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: Id3241f339b2997d018f34cad212bef6e2136815e Gerrit-Change-Number: 1057956 Gerrit-PatchSet: 1 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: automatically upgrade python syntax
by jenkins-bot (Code Review) 29 Jul '24

29 Jul '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1057943?usp=email ) Change subject: automatically upgrade python syntax ...................................................................... automatically upgrade python syntax Change-Id: Ic6c895a96b112d575ca711dee6c4a17f9c72f29d --- M pywikibot/backports.py M pywikibot/page/_wikibase.py M pywikibot/tools/_deprecate.py M scripts/checkimages.py M scripts/misspelling.py M scripts/redirect.py M scripts/solve_disambiguation.py 7 files changed, 19 insertions(+), 20 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/backports.py b/pywikibot/backports.py index 76f8162..901f315 100644 --- a/pywikibot/backports.py +++ b/pywikibot/backports.py @@ -134,14 +134,14 @@ next(b, None) return zip(a, b) else: - from types import NoneType from itertools import pairwise # type: ignore[no-redef] + from types import NoneType # gh-98363 if PYTHON_VERSION < (3, 13) or SPHINX_RUNNING: def batched(iterable, n: int, *, - strict: bool = False) -> Generator[tuple, None, None]: + strict: bool = False) -> Generator[tuple]: """Batch data from the *iterable* into tuples of length *n*. .. note:: The last batch may be shorter than *n* if *strict* is diff --git a/pywikibot/page/_wikibase.py b/pywikibot/page/_wikibase.py index 5b34dd7..b3458f6 100644 --- a/pywikibot/page/_wikibase.py +++ b/pywikibot/page/_wikibase.py @@ -1307,7 +1307,7 @@ @deprecated_args(botflag='bot') # since 9.3.0 def set_redirect_target( self, - target_page: 'ItemPage' | str, + target_page: ItemPage | str, create: bool = False, force: bool = False, keep_section: bool = False, diff --git a/pywikibot/tools/_deprecate.py b/pywikibot/tools/_deprecate.py index 2ee8f8d..c87a964 100644 --- a/pywikibot/tools/_deprecate.py +++ b/pywikibot/tools/_deprecate.py @@ -494,7 +494,7 @@ replace_args = list(zip(arg_keys[positionals:], args[positionals:])) pos_args = "', '".join(name for name, arg in replace_args) - keyw_args = ', '.join('{}={!r}'.format(name, arg) + keyw_args = ', '.join(f'{name}={arg!r}' for name, arg in replace_args) issue_deprecation_warning( f"Passing '{pos_args}' as positional " diff --git a/scripts/checkimages.py b/scripts/checkimages.py index e06725f..0b24bf5 100755 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -739,8 +739,11 @@ except NotEmailableError: pywikibot.info('User is not mailable, aborted') - def regex_generator(self, regexp, textrun) -> Generator[pywikibot.FilePage, - None, None]: + def regex_generator( + self, + regexp, + textrun, + ) -> Generator[pywikibot.FilePage]: """Find page to yield using regex to parse text.""" regex = re.compile(fr'{regexp}', re.DOTALL) results = regex.findall(textrun) @@ -1312,8 +1315,7 @@ return False @staticmethod - def wait(generator, wait_time) -> Generator[pywikibot.FilePage, None, - None]: + def wait(generator, wait_time) -> Generator[pywikibot.FilePage]: """ Skip the images uploaded before x seconds. diff --git a/scripts/misspelling.py b/scripts/misspelling.py index acaf624..46830c8 100755 --- a/scripts/misspelling.py +++ b/scripts/misspelling.py @@ -58,7 +58,7 @@ update_options = {'start': None} @property - def generator(self) -> Generator[pywikibot.Page, None, None]: + def generator(self) -> Generator[pywikibot.Page]: """Generator to retrieve misspelling pages or misspelling redirects.""" templates = self.misspelling_templates.get(self.site.sitename) categories = [cat for cat in (self.site.page_from_repository(item) diff --git a/scripts/redirect.py b/scripts/redirect.py index faeca78..1e0cb11 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -199,8 +199,7 @@ space_to_underscore(target_link)) return redict, pageTitles - def get_redirect_pages_via_api(self) -> Generator[pywikibot.Page, None, - None]: + def get_redirect_pages_via_api(self) -> Generator[pywikibot.Page]: """Yield Pages that are redirects.""" for ns in self.opt.namespaces: gen = self.site.allpages(start=self.opt.start, @@ -215,8 +214,7 @@ return yield p - def _next_redirect_group(self) -> Generator[list[pywikibot.Page], None, - None]: + def _next_redirect_group(self) -> Generator[list[pywikibot.Page]]: """Generator that yields batches of redirects as a list.""" chunk = [] for page in self.get_redirect_pages_via_api(): @@ -231,7 +229,7 @@ def get_redirects_via_api( self, maxlen: int = 8 - ) -> Generator[tuple[str, int | None, str, str | None], None, None]: + ) -> Generator[tuple[str, int | None, str, str | None]]: r""" Return a generator that yields tuples of data about redirect Pages. @@ -295,7 +293,7 @@ yield redirect, result, target, final def retrieve_broken_redirects(self) -> Generator[ - str | pywikibot.Page, None, None]: + str | pywikibot.Page]: """Retrieve broken redirects.""" if self.opt.fullscan: count = 0 @@ -319,7 +317,7 @@ yield from self.site.preloadpages(self.site.broken_redirects()) def retrieve_double_redirects(self) -> Generator[ - str | pywikibot.Page, None, None]: + str | pywikibot.Page]: """Retrieve double redirects.""" if self.opt.moves: yield from self.get_moved_pages_redirects() @@ -344,8 +342,7 @@ pywikibot.info('Retrieving double redirect special page...') yield from self.site.preloadpages(self.site.double_redirects()) - def get_moved_pages_redirects(self) -> Generator[pywikibot.Page, None, - None]: + def get_moved_pages_redirects(self) -> Generator[pywikibot.Page]: """Generate redirects to recently-moved pages.""" # this will run forever, until user interrupts it if self.opt.offset <= 0: diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index f9ba4de..2f309d8 100755 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -413,7 +413,7 @@ self.minimum = minimum self.main_only = main_only - def __iter__(self) -> Generator[pywikibot.Page, None, None]: + def __iter__(self) -> Generator[pywikibot.Page]: """Yield pages.""" # TODO: start yielding before all referring pages have been found refs = list(self.page.getReferences(with_template_inclusion=False, @@ -680,7 +680,7 @@ (?P<linktrail>{linktrail})""", flags=re.X) @staticmethod - def firstlinks(page) -> Generator[str, None, None]: + def firstlinks(page) -> Generator[str]: """Return a list of first links of every line beginning with `*`. When a disambpage is full of unnecessary links, this may be useful -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1057943?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: Ic6c895a96b112d575ca711dee6c4a17f9c72f29d Gerrit-Change-Number: 1057943 Gerrit-PatchSet: 1 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: make scripts with shebangs executable
by jenkins-bot (Code Review) 29 Jul '24

29 Jul '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1057942?usp=email ) Change subject: make scripts with shebangs executable ...................................................................... make scripts with shebangs executable Change-Id: Ia8e39a6b548b7c068d996b200cbaa82534f514f3 --- M docs/_static/css/pywikibot.css M docs/api_ref/pywikibot.rst M scripts/maintenance/addwikis.py M tests/version_tests.py 4 files changed, 2 insertions(+), 2 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/_static/css/pywikibot.css b/docs/_static/css/pywikibot.css index 0844f03..48def52 100644 --- a/docs/_static/css/pywikibot.css +++ b/docs/_static/css/pywikibot.css @@ -125,4 +125,4 @@ div.deprecated .versionmodified, div.versionremoved .versionmodified { color: var(--deprecated); -} \ No newline at end of file +} diff --git a/docs/api_ref/pywikibot.rst b/docs/api_ref/pywikibot.rst index 5da2cdc..5def779 100644 --- a/docs/api_ref/pywikibot.rst +++ b/docs/api_ref/pywikibot.rst @@ -47,7 +47,7 @@ .. admonition:: Imports from :mod:`page` module :class: tip - The following classes and function are inported from :mod:`page` module + The following classes and function are inported from :mod:`page` module but can also be used as :mod:`pywikibot` members: - :class:`pywikibot.Category<page.Category>` diff --git a/scripts/maintenance/addwikis.py b/scripts/maintenance/addwikis.py old mode 100644 new mode 100755 diff --git a/tests/version_tests.py b/tests/version_tests.py old mode 100644 new mode 100755 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1057942?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: Ia8e39a6b548b7c068d996b200cbaa82534f514f3 Gerrit-Change-Number: 1057942 Gerrit-PatchSet: 1 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: [tests] set PYTHONIOENCODING to utf-8 for windows-tests
by Xqt (Code Review) 29 Jul '24

29 Jul '24

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1057921?usp=email ) Change subject: [tests] set PYTHONIOENCODING to utf-8 for windows-tests ...................................................................... [tests] set PYTHONIOENCODING to utf-8 for windows-tests Bug: T371280 Change-Id: I536c60fea46781b2cef440fca801e4bba9b9c33d --- M .github/workflows/windows_tests.yml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/windows_tests.yml b/.github/workflows/windows_tests.yml index 82591e6..838cb48 100644 --- a/.github/workflows/windows_tests.yml +++ b/.github/workflows/windows_tests.yml @@ -78,6 +78,8 @@ id: ci_test continue-on-error: true timeout-minutes: 90 + env: + PYTHONIOENCODING: utf-8 run: | python pwb.py version coverage run -m unittest discover -vv -p \"*_tests.py\"; -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1057921?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: I536c60fea46781b2cef440fca801e4bba9b9c33d Gerrit-Change-Number: 1057921 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: [tests] enable write tests for wikipedia:test and beta wikis
by Xqt (Code Review) 29 Jul '24

29 Jul '24

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1057916?usp=email ) Change subject: [tests] enable write tests for wikipedia:test and beta wikis ...................................................................... [tests] enable write tests for wikipedia:test and beta wikis Change-Id: I0a88e16cc064871ead2117a441e925504415fa54 --- M .github/workflows/oauth_tests-ci.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/oauth_tests-ci.yml b/.github/workflows/oauth_tests-ci.yml index 26b5e80..fa052f7 100644 --- a/.github/workflows/oauth_tests-ci.yml +++ b/.github/workflows/oauth_tests-ci.yml @@ -99,7 +99,7 @@ - name: Oauth tests with unittest timeout-minutes: 2 env: - PYWIKIBOT_TEST_WRITE: ${{ matrix.domain == 'test.wikipedia.org' && 1 || 0}} + PYWIKIBOT_TEST_WRITE: 1 PYWIKIBOT_TEST_OAUTH: ${{ secrets[format('{0}', steps.token.outputs.uppercase)] }} PYWIKIBOT_TEST_MODULES: file,oauth run: | -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1057916?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: I0a88e16cc064871ead2117a441e925504415fa54 Gerrit-Change-Number: 1057916 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de>

1 0

[Gerrit] ...core[master]: [tests] Add username to commons:beta
by Xqt (Code Review) 29 Jul '24

29 Jul '24

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1057908?usp=email ) Change subject: [tests] Add username to commons:beta ...................................................................... [tests] Add username to commons:beta Change-Id: I60fa8a227aa90c9f88512a089b9a32de4abd448d --- M .github/workflows/oauth_tests-ci.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/oauth_tests-ci.yml b/.github/workflows/oauth_tests-ci.yml index dc8c28d..26b5e80 100644 --- a/.github/workflows/oauth_tests-ci.yml +++ b/.github/workflows/oauth_tests-ci.yml @@ -90,6 +90,7 @@ - name: Generate user files run: | python -Werror::UserWarning -m pwb generate_user_files -family:${{matrix.family}} -lang:${{matrix.code}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; + echo "usernames['commons']['beta'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py echo "authenticate['${{ matrix.domain }}'] = ('${{ steps.split.outputs._0 }}', '${{ steps.split.outputs._1 }}', '${{ steps.split.outputs._2 }}', '${{ steps.split.outputs._3 }}')" >> user-config.py echo "noisysleep = float('inf')" >> user-config.py echo "maximum_GET_length = 5000" >> user-config.py -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1057908?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: I60fa8a227aa90c9f88512a089b9a32de4abd448d Gerrit-Change-Number: 1057908 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de>

1 0

[Gerrit] ...core[master]: [tests] simplify tests collector
by jenkins-bot (Code Review) 29 Jul '24

29 Jul '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1057899?usp=email ) Change subject: [tests] simplify tests collector ...................................................................... [tests] simplify tests collector Change-Id: I422ced7caf868b9239ead8c1bc1d4d56259144e7 --- M tests/__init__.py 1 file changed, 6 insertions(+), 8 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/tests/__init__.py b/tests/__init__.py index cf3b51c..43aed9d 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -183,11 +183,11 @@ extra_test_modules = _unknown_test_modules() if 'PYWIKIBOT_TEST_MODULES' in os.environ: - _enabled_test_modules = os.environ['PYWIKIBOT_TEST_MODULES'].split(',') - disabled_test_modules = (library_test_modules - | extra_test_modules - | script_test_modules - - set(_enabled_test_modules)) + enabled_test_modules = os.environ['PYWIKIBOT_TEST_MODULES'].split(',') +else: + enabled_test_modules = chain(library_test_modules, + extra_test_modules, + script_test_modules) def unittest_print(*args, **kwargs): @@ -218,9 +218,7 @@ f' {disabled_tests!r}') modules = (module - for module in chain(library_test_modules, - extra_test_modules, - script_test_modules) + for module in enabled_test_modules if module not in disabled_test_modules) test_list = [] -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1057899?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: I422ced7caf868b9239ead8c1bc1d4d56259144e7 Gerrit-Change-Number: 1057899 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: [doc] PYWIKIBOT_TEST_AUTORUN environment variable was removed
by jenkins-bot (Code Review) 29 Jul '24

29 Jul '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1057891?usp=email ) Change subject: [doc] PYWIKIBOT_TEST_AUTORUN environment variable was removed ...................................................................... [doc] PYWIKIBOT_TEST_AUTORUN environment variable was removed Change-Id: I62d834c257a67463a9556986b747d7df3e1af5be --- M tests/README.rst 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/tests/README.rst b/tests/README.rst index 28cf19a..94f8dfe 100644 --- a/tests/README.rst +++ b/tests/README.rst @@ -168,11 +168,11 @@ Instead of setting the environment by the os (or `os.environ` as well) you can use the :mod:`pwb` wrapper script to set it:: - pwb PYWIKIBOT_TEST_AUTORUN=1 script_tests -v TestScriptSimulate.test_archivebot + pwb PYWIKIBOT_TEST_WRITE=1 script_tests -v TestScriptSimulate.test_archivebot The assignment can be omitted and defaults to 1. The following is equal to the line above:: - pwb PYWIKIBOT_TEST_AUTORUN script_tests -v TestScriptSimulate.test_archivebot + pwb PYWIKIBOT_TEST_WRITE script_tests -v TestScriptSimulate.test_archivebot Decorators ========== -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1057891?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: I62d834c257a67463a9556986b747d7df3e1af5be Gerrit-Change-Number: 1057891 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits