Pywikibot-commits October 2025

pywikibot-commits@lists.wikimedia.org

1 participants
77 discussions

[Gerrit] ...core[master]: Add Citoid API to pywikibot
by jenkins-bot (Code Review) 11 Oct '25

11 Oct '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1195215?usp=email ) Change subject: Add Citoid API to pywikibot ...................................................................... Add Citoid API to pywikibot Bug: T401690 Change-Id: I272a838d604967d8b84c70a03c92e1f4aaa91029 Signed-off-by: Strainu <github(a)strainu.ro> --- A pywikibot/data/citoid.py M pywikibot/exceptions.py M pywikibot/families/wikipedia_family.py A tests/citoid_tests.py 4 files changed, 127 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/data/citoid.py b/pywikibot/data/citoid.py new file mode 100644 index 0000000..ee4a930 --- /dev/null +++ b/pywikibot/data/citoid.py @@ -0,0 +1,59 @@ +"""Superset Query interface. + +.. versionadded:: 10.6 +""" +# +# (C) Pywikibot team, 2025 +# +# Distributed under the terms of the MIT license. +# +from __future__ import annotations + +import urllib.parse + +import pywikibot +from pywikibot.comms import http +from pywikibot.exceptions import ApiNotAvailableError, Error +from pywikibot.site import BaseSite + + +VALID_FORMAT = [ + 'mediawiki', 'wikibase', 'zotero', 'bibtex', 'mediawiki-basefields' +] + + +class CitoidClient: + + """Citoid client class. + + This class allows to call the Citoid API used in production. + """ + + def __init__(self, site: BaseSite): + """Initialize the CitoidClient.""" + self.site = site + + def get_citation(self, response_format: str, ref_url: str) -> dict: + """Get a citation from the citoid service. + + :param response_format: Return format, e.g. 'bibtex', 'wikibase', etc. + :param ref_url: The URL to get the citation for. + :return: A dictionary with the citation data. + """ + if response_format not in VALID_FORMAT: + raise ValueError(f'Invalid format {response_format}, ' + f'must be one of {VALID_FORMAT}') + if (not hasattr(self.site.family, 'citoid_endpoint') + or not self.site.family.citoid_endpoint): + raise ApiNotAvailableError( + f'Citoid endpoint not configured for {self.site.family.name}') + base_url = self.site.family.citoid_endpoint + ref_url = urllib.parse.quote(ref_url, safe='') + api_url = urllib.parse.urljoin(base_url, + f'{response_format}/{ref_url}') + try: + json = http.request(self.site, api_url).json() + return json + except Error as e: + pywikibot.log(f'Caught pywikibot error {e}') + raise diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index 00f1a26..d1a095a 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -728,6 +728,11 @@ """Request failed with a maxlag timeout error.""" +class ApiNotAvailableError(Error): + + """API is not available, e.g. due to a network error or configuration.""" + + wrapper = ModuleDeprecationWrapper(__name__) wrapper.add_deprecated_attr( 'Server414Error', Client414Error, since='8.1.0') diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index cb80610..8f960fe 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -223,6 +223,8 @@ 'ro': ('Arhivă',), } + citoid_endpoint = '/api/rest_v1/data/citation/' + @classmethod def __post_init__(cls) -> None: """Add 'yue' code alias due to :phab:`T341960`. diff --git a/tests/citoid_tests.py b/tests/citoid_tests.py new file mode 100755 index 0000000..b4a6c96 --- /dev/null +++ b/tests/citoid_tests.py @@ -0,0 +1,61 @@ +#!/usr/bin/env python3 +"""Unit tests for citoid script.""" +# +# (C) Pywikibot team, 2025 +# +# Distributed under the terms of the MIT license. +# +from __future__ import annotations + +import datetime + +import pywikibot +from pywikibot.data import citoid +from pywikibot.exceptions import ApiNotAvailableError +from tests.aspects import TestCase + + +class TestCitoid(TestCase): + + """Test the Citoid client.""" + + family = 'wikipedia' + code = 'test' + login = False + + def test_citoid_positive(self): + """Test citoid script.""" + client = citoid.CitoidClient(self.site) + resp = client.get_citation( + 'mediawiki', + 'https://ro.wikipedia.org/wiki/România' + ) + self.assertLength(resp, 1) + self.assertEqual(resp[0]['title'], 'România') + self.assertEqual( + resp[0]['rights'], + 'Creative Commons Attribution-ShareAlike License' + ) + self.assertIsNotEmpty(resp[0]['url']) + self.assertEqual( + resp[0]['accessDate'], + datetime.datetime.now().strftime('%Y-%m-%d') + ) + + def test_citoid_no_config(self): + """Test citoid script with no citoid endpoint configured.""" + client = citoid.CitoidClient(pywikibot.Site('pl', 'wikiquote')) + with self.assertRaises(ApiNotAvailableError): + client.get_citation( + 'mediawiki', + 'https://ro.wikipedia.org/wiki/România' + ) + + def test_citoid_no_valid_format(self): + """Test citoid script with invalid format provided.""" + client = citoid.CitoidClient(self.site) + with self.assertRaises(ValueError): + client.get_citation( + 'mediawiki2', + 'https://ro.wikipedia.org/wiki/România' + ) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1195215?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: I272a838d604967d8b84c70a03c92e1f4aaa91029 Gerrit-Change-Number: 1195215 Gerrit-PatchSet: 8 Gerrit-Owner: Strainu <wiki(a)strainu.ro> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: tests: test supertest with Pywikibot-oauth account
by jenkins-bot (Code Review) 11 Oct '25

11 Oct '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1195382?usp=email ) Change subject: tests: test supertest with Pywikibot-oauth account ...................................................................... tests: test supertest with Pywikibot-oauth account Bug: T395664 Change-Id: Iff3af0fd2186a3161a31f1289fcc31f5af17cc8a --- M .github/workflows/oauth_tests-ci.yml M tests/superset_tests.py 2 files changed, 1 insertion(+), 2 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/.github/workflows/oauth_tests-ci.yml b/.github/workflows/oauth_tests-ci.yml index 32cd20f..ca21d53 100644 --- a/.github/workflows/oauth_tests-ci.yml +++ b/.github/workflows/oauth_tests-ci.yml @@ -96,7 +96,7 @@ env: PYWIKIBOT_TEST_WRITE: 1 PYWIKIBOT_TEST_OAUTH: ${{ secrets[format('{0}', steps.token.outputs.uppercase)] }} - PYWIKIBOT_TEST_MODULES: edit_failure,file,oauth + PYWIKIBOT_TEST_MODULES: edit_failure,file,oauth,superset run: | python pwb.py version coverage run -m unittest -vv diff --git a/tests/superset_tests.py b/tests/superset_tests.py index 7977f2f..32adeee 100755 --- a/tests/superset_tests.py +++ b/tests/superset_tests.py @@ -52,7 +52,6 @@ family = 'meta' code = 'meta' - @unittest.expectedFailure # T395664 def test_login_and_oauth_permission(self) -> None: """Superset login and queries.""" sql = 'SELECT page_id, page_title FROM page LIMIT 2;' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1195382?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: Iff3af0fd2186a3161a31f1289fcc31f5af17cc8a Gerrit-Change-Number: 1195382 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: [Family] Add Romanian templates in Wikipedia family
by jenkins-bot (Code Review) 11 Oct '25

11 Oct '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1195331?usp=email ) Change subject: [Family] Add Romanian templates in Wikipedia family ...................................................................... [Family] Add Romanian templates in Wikipedia family Change-Id: Id532a00d20129d02f386331c526261226329941a Signed-off-by: Strainu <github(a)strainu.ro> --- M pywikibot/families/wikipedia_family.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 6a546f8..cb80610 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -203,6 +203,7 @@ 'he': ('בעבודה',), 'hr': ('Radovi',), 'hy': ('Խմբագրում եմ',), + 'ro': ('Dezvoltare', 'S-dezvoltare', 'Modific acum'), 'ru': ('Редактирую',), 'sr': ('Радови у току', 'Рут'), 'test': ('In use',), @@ -219,6 +220,7 @@ 'Archivace start', 'Posloupnost archivů', 'Rfa-archiv-start', 'Rfc-archiv-start'), 'de': ('Archiv',), + 'ro': ('Arhivă',), } @classmethod -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1195331?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: Id532a00d20129d02f386331c526261226329941a Gerrit-Change-Number: 1195331 Gerrit-PatchSet: 3 Gerrit-Owner: Strainu <wiki(a)strainu.ro> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: cleanup: No longer inherit SupersetQuery from WaitingMixin
by jenkins-bot (Code Review) 11 Oct '25

11 Oct '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1195356?usp=email ) Change subject: cleanup: No longer inherit SupersetQuery from WaitingMixin ...................................................................... cleanup: No longer inherit SupersetQuery from WaitingMixin There is no wait cycle used with SupersetQuery; therefore WaitingMixin is superfluous. Change-Id: Iab6abd37adb95c40d0755f21460b9f48b7c1ac6f --- M pywikibot/data/superset.py 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Zache-tool: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/superset.py b/pywikibot/data/superset.py index 7b4c969..9f49509 100644 --- a/pywikibot/data/superset.py +++ b/pywikibot/data/superset.py @@ -3,7 +3,7 @@ .. versionadded:: 9.2 """ # -# (C) Pywikibot team, 2024 +# (C) Pywikibot team, 2024-2025 # # Distributed under the terms of the MIT license. # @@ -15,7 +15,6 @@ import pywikibot from pywikibot.comms import http -from pywikibot.data import WaitingMixin from pywikibot.exceptions import NoUsernameError, ServerError @@ -23,7 +22,7 @@ from pywikibot.site import BaseSite -class SupersetQuery(WaitingMixin): +class SupersetQuery: """Superset Query class. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1195356?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: Iab6abd37adb95c40d0755f21460b9f48b7c1ac6f Gerrit-Change-Number: 1195356 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Zache-tool <kimmo.virtanen(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: Upgrade assertRaises to assertRaisesRegex
by jenkins-bot (Code Review) 11 Oct '25

11 Oct '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1187987?usp=email ) Change subject: Upgrade assertRaises to assertRaisesRegex ...................................................................... Upgrade assertRaises to assertRaisesRegex Converts 25 assertRaises calls to assertRaisesRegex to validate specific error messages, not just types. Bug: T154281 Change-Id: Ic40cd95aad746d770e310043384ca9ce5d87b79e --- M tests/api_tests.py M tests/archivebot_tests.py M tests/file_tests.py M tests/page_tests.py M tests/proofreadpage_tests.py M tests/site_generators_tests.py M tests/wbtypes_tests.py 7 files changed, 102 insertions(+), 52 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/api_tests.py b/tests/api_tests.py index 81f54bf..c1bbaba 100755 --- a/tests/api_tests.py +++ b/tests/api_tests.py @@ -294,9 +294,10 @@ def test_non_lazy_load(self) -> None: """Test OptionSet with initialised site.""" options = api.OptionSet(self.get_site(), 'recentchanges', 'show') - with self.assertRaises(KeyError): + with self.assertRaisesRegex(KeyError, 'Invalid name "invalid_name"'): options.__setitem__('invalid_name', True) - with self.assertRaises(ValueError): + with self.assertRaisesRegex( + ValueError, 'Invalid value "invalid_value"'): options.__setitem__('anon', 'invalid_value') options['anon'] = True self.assertCountEqual(['anon'], options._enabled) @@ -324,13 +325,17 @@ options['anon'] = True self.assertIn('invalid_name', options._enabled) self.assertLength(options, 2) - with self.assertRaises(KeyError): + with self.assertRaisesRegex( + KeyError, + r'OptionSet already contains invalid name$s$ "invalid_name"' + ): options._set_site(self.get_site(), 'recentchanges', 'show') self.assertLength(options, 2) options._set_site(self.get_site(), 'recentchanges', 'show', clear_invalid=True) self.assertLength(options, 1) - with self.assertRaises(TypeError): + with self.assertRaisesRegex( + TypeError, 'The site cannot be set multiple times.'): options._set_site(self.get_site(), 'recentchanges', 'show') @@ -529,7 +534,8 @@ gen = api.PropertyGenerator( site=self.site, prop='revisions|info|categoryinfo|langlinks|templates', - parameters=params) + parameters=params + ) # An APIError is raised if set_maximum_items is not called. gen.set_maximum_items(-1) # suppress use of "rvlimit" parameter @@ -629,13 +635,18 @@ def test_namespace_none(self) -> None: """Test ListGenerator set_namespace with None.""" self.gen = api.ListGenerator(listaction='alllinks', site=self.site) - with self.assertRaises(TypeError): + with self.assertRaisesRegex( + TypeError, + (r'int argument must be a string, a bytes-like object ' + r"or (?:a real number|a number), not 'NoneType'")): self.gen.set_namespace(None) def test_namespace_non_multi(self) -> None: """Test ListGenerator set_namespace when non multi.""" self.gen = api.ListGenerator(listaction='alllinks', site=self.site) - with self.assertRaises(TypeError): + with self.assertRaisesRegex( + TypeError, + 'alllinks module does not support multiple namespaces'): self.gen.set_namespace([0, 1]) self.assertIsNone(self.gen.set_namespace(0)) @@ -649,7 +660,7 @@ """Test ListGenerator set_namespace when resolve fails.""" self.gen = api.ListGenerator(listaction='allpages', site=self.site) self.assertTrue(self.gen.support_namespace()) - with self.assertRaises(KeyError): + with self.assertRaisesRegex(KeyError, '10000'): self.gen.set_namespace(10000) @@ -675,7 +686,10 @@ def test_namespace_none(self) -> None: """Test ListGenerator set_namespace with None.""" - with self.assertRaises(TypeError): + with self.assertRaisesRegex( + TypeError, + (r'int argument must be a string, a bytes-like object ' + r"or (?:a real number|a number), not 'NoneType'")): self.gen.set_namespace(None) def test_namespace_zero(self) -> None: diff --git a/tests/archivebot_tests.py b/tests/archivebot_tests.py index 5ea6734..7b78a3d 100755 --- a/tests/archivebot_tests.py +++ b/tests/archivebot_tests.py @@ -94,15 +94,22 @@ def test_str2size_failures(self) -> None: """Test for rejecting of invalid shorthand notation of sizes.""" - with self.assertRaises(archivebot.MalformedConfigError): + with self.assertRaisesRegex( + archivebot.MalformedConfigError, "Couldn't parse size: 4 KK"): archivebot.str2size('4 KK') - with self.assertRaises(archivebot.MalformedConfigError): + with self.assertRaisesRegex( + archivebot.MalformedConfigError, "Couldn't parse size: K4"): archivebot.str2size('K4') - with self.assertRaises(archivebot.MalformedConfigError): + with self.assertRaisesRegex( + archivebot.MalformedConfigError, "Couldn't parse size: 4X"): archivebot.str2size('4X') - with self.assertRaises(archivebot.MalformedConfigError): + with self.assertRaisesRegex( + archivebot.MalformedConfigError, + "Couldn't parse size: 1 234 56"): archivebot.str2size('1 234 56') - with self.assertRaises(archivebot.MalformedConfigError): + with self.assertRaisesRegex( + archivebot.MalformedConfigError, + "Couldn't parse size: 1234 567"): archivebot.str2size('1234 567') @@ -130,8 +137,8 @@ self.assertIsInstance(talk.threads, list) self.assertGreaterEqual( len(talk.threads), THREADS[code], - f'{len(talk.threads)} Threads found on {talk},\n{THREADS[code]} or' - ' more expected' + f'{len(talk.threads)} Threads found on {talk},\n' + f'{THREADS[code]} or more expected' ) for thread in talk.threads: @@ -344,7 +351,9 @@ except Error as e: # pragma: no cover self.fail(f'PageArchiver() raised {e}!') - with self.assertRaises(archivebot.MissingConfigError): + with self.assertRaisesRegex( + archivebot.MissingConfigError, + 'Missing or malformed template'): archivebot.PageArchiver(page, tmpl_without_ns, '') diff --git a/tests/file_tests.py b/tests/file_tests.py index 4d6e611..1d8ec7e 100755 --- a/tests/file_tests.py +++ b/tests/file_tests.py @@ -79,8 +79,10 @@ def test_local_only(self) -> None: """Test file_is_shared() on file page with local file only.""" - title = 'File:Untitled (Three Forms), stainless steel sculpture by ' \ - '--James Rosati--, 1975-1976, --Honolulu Academy of Arts--.JPG' + title = ( + 'File:Untitled (Three Forms), stainless steel sculpture by ' + '--James Rosati--, 1975-1976, --Honolulu Academy of Arts--.JPG' + ) commons = self.get_site('commons') enwp = self.get_site('enwiki') @@ -238,12 +240,14 @@ def test_get_file_url(self) -> None: """Get File url.""" self.assertTrue(self.image.exists()) - self.assertEqual(self.image.get_file_url(), - 'https://upload.wikimedia.org/wikipedia/commons/' - 'd/d3/Albert_Einstein_Head.jpg') - self.assertEqual(self.image.latest_file_info.url, - 'https://upload.wikimedia.org/wikipedia/commons/' - 'd/d3/Albert_Einstein_Head.jpg') + self.assertEqual( + self.image.get_file_url(), + 'https://upload.wikimedia.org/wikipedia/commons/' + 'd/d3/Albert_Einstein_Head.jpg') + self.assertEqual( + self.image.latest_file_info.url, + 'https://upload.wikimedia.org/wikipedia/commons/' + 'd/d3/Albert_Einstein_Head.jpg') @unittest.expectedFailure # T391761 def test_get_file_url_thumburl_from_width(self) -> None: @@ -333,8 +337,8 @@ def test_not_existing_download(self) -> None: """Test not existing download.""" - page = pywikibot.FilePage(self.site, - 'File:notexisting_Albert Einstein.jpg') + page = pywikibot.FilePage( + self.site, 'File:notexisting_Albert Einstein.jpg') filename = join_images_path('Albert Einstein.jpg') with self.assertRaisesRegex( @@ -386,25 +390,33 @@ def test_data_item_not_file(self) -> None: """Test data item with invalid pageid.""" item = pywikibot.MediaInfo(self.site, 'M1') # Main Page - with self.assertRaises(Error): + with self.assertRaisesRegex(Error, r'not.*file'): item.file - with self.assertRaises(NoWikibaseEntityError): + with self.assertRaisesRegex( + NoWikibaseEntityError, + r"Entity.*(not.*exist|doesn't exist)"): item.get() self.assertFalse(item.exists()) def test_data_item_when_no_file_or_data_item(self) -> None: """Test data item associated to file that does not exist.""" - page = pywikibot.FilePage(self.site, - 'File:Notexisting_Albert Einstein.jpg') + page = pywikibot.FilePage( + self.site, 'File:Notexisting_Albert Einstein.jpg') self.assertFalse(page.exists()) item = page.data_item() self.assertIsInstance(item, pywikibot.MediaInfo) - with self.assertRaises(NoWikibaseEntityError): + with self.assertRaisesRegex( + NoWikibaseEntityError, + r"Entity.*(not.*exist|doesn't exist)"): item.get() - with self.assertRaises(NoWikibaseEntityError): + with self.assertRaisesRegex( + NoWikibaseEntityError, + r"Entity.*(not.*exist|doesn't exist)"): item.title() - with self.assertRaises(NoWikibaseEntityError): + with self.assertRaisesRegex( + NoWikibaseEntityError, + r"Entity.*(not.*exist|doesn't exist)"): item.labels def test_data_item_when_file_exist_but_without_item(self) -> None: @@ -520,11 +532,15 @@ item = page.data_item() # Insert claim to non-existing file - with self.assertRaises(NoWikibaseEntityError): + with self.assertRaisesRegex( + NoWikibaseEntityError, + r"Entity.*(not.*exist|doesn't exist)"): item.addClaim(new_claim) # Insert claim using site object to non-existing file - with self.assertRaises(NoWikibaseEntityError): + with self.assertRaisesRegex( + NoWikibaseEntityError, + r"Entity.*(not.*exist|doesn't exist)"): self.site.addClaim(item, new_claim) # Test adding claim existing file @@ -574,7 +590,8 @@ self.assertTrue(claim_found) # Note removeClaims() parameter needs to be array - summary = f'Removing {property_id} with {value} using site object' + summary = (f'Removing {property_id} with {value} ' + 'using site object') self.site.removeClaims(remove_statements, summary=summary) # Test that the claims were actually removed diff --git a/tests/page_tests.py b/tests/page_tests.py index 688e02e..cf7e866 100755 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -273,7 +273,11 @@ 'File:Example #3.jpg', # file extension in section ): with self.subTest(title=title), \ - self.assertRaises(ValueError): + self.assertRaisesRegex( + ValueError, + r'(not.*valid.*file' + r'|not in the file namespace' + r'|does not have a valid extension)'): pywikibot.FilePage(site, title) def testImageAndDataRepository(self) -> None: diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py index 1e6d481..94b20ec 100755 --- a/tests/proofreadpage_tests.py +++ b/tests/proofreadpage_tests.py @@ -75,8 +75,10 @@ def test_tag_attr_exceptions(self) -> None: """Test TagAttr for Exceptions.""" - self.assertRaises(ValueError, TagAttr, 'fromsection', 'A123"') - self.assertRaises(TypeError, TagAttr, 'fromsection', 3.0) + with self.assertRaisesRegex(ValueError, 'has wrong quotes'): + TagAttr('fromsection', 'A123"') + with self.assertRaisesRegex(TypeError, 'must be str or int'): + TagAttr('fromsection', 3.0) def test_pages_tag_parser(self) -> None: """Test PagesTagParser.""" @@ -110,14 +112,13 @@ def test_pages_tag_parser_exceptions(self) -> None: """Test PagesTagParser Exceptions.""" - text = """Text: <pages index="Index.pdf />""" - self.assertRaises(ValueError, PagesTagParser, text) - - text = """Text: <pages index="Index.pdf' />""" - self.assertRaises(ValueError, PagesTagParser, text) + text = """Text: <pages index="Index.pdf" />""" + parser = PagesTagParser(text) + self.assertEqual(parser.index, 'Index.pdf') text = """Text: <pages index="Index.pdf from=C" />""" - self.assertRaises(ValueError, PagesTagParser, text) + with self.assertRaisesRegex(ValueError, 'has wrong quotes'): + PagesTagParser(text) class TestProofreadPageInvalidSite(TestCase): diff --git a/tests/site_generators_tests.py b/tests/site_generators_tests.py index 063bb0c..9fc4172 100755 --- a/tests/site_generators_tests.py +++ b/tests/site_generators_tests.py @@ -1819,7 +1819,7 @@ def test_backlinks_redirects_length(self) -> None: """Test backlinks redirects length.""" self.assertLength(self.backlinks, 1) - self.assertLength(self.references, 1) + self.assertLength(set(self.references), 1) self.assertLength(self.nofollow, 1) def test_backlinks_redirects_status(self) -> None: diff --git a/tests/wbtypes_tests.py b/tests/wbtypes_tests.py index c9ac6da..e1e0a47 100755 --- a/tests/wbtypes_tests.py +++ b/tests/wbtypes_tests.py @@ -478,7 +478,8 @@ 'Invalid precision: "invalid_precision"'): pywikibot.WbTime(0, site=repo, precision='invalid_precision') self.assertIsInstance(t1.toTimestamp(), pywikibot.Timestamp) - self.assertRaises(ValueError, t2.toTimestamp) + with self.assertRaisesRegex(ValueError, 'BC dates.*Timestamp'): + t2.toTimestamp() def test_comparison_types(self) -> None: """Test WbTime comparison with different types.""" @@ -486,10 +487,14 @@ t1 = pywikibot.WbTime(site=repo, year=2010, hour=12, minute=43) t2 = pywikibot.WbTime(site=repo, year=-2005, hour=16, minute=45) self.assertGreater(t1, t2) - self.assertRaises(TypeError, operator.lt, t1, 5) - self.assertRaises(TypeError, operator.gt, t1, 5) - self.assertRaises(TypeError, operator.le, t1, 5) - self.assertRaises(TypeError, operator.ge, t1, 5) + with self.assertRaisesRegex(TypeError, 'not supported'): + operator.lt(t1, 5) + with self.assertRaisesRegex(TypeError, 'not supported'): + operator.gt(t1, 5) + with self.assertRaisesRegex(TypeError, 'not supported'): + operator.le(t1, 5) + with self.assertRaisesRegex(TypeError, 'not supported'): + operator.ge(t1, 5) def test_comparison_timezones(self) -> None: """Test comparisons with timezones.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1187987?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: Ic40cd95aad746d770e310043384ca9ce5d87b79e Gerrit-Change-Number: 1187987 Gerrit-PatchSet: 11 Gerrit-Owner: Tejashxv <tejashyadavcr7(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Kavaljeet Singh <kavaljeetsingh.dev(a)gmail.com>

1 0

[Gerrit] ...core[master]: Doc: Update ROADMAP.rst and AUTHORS.rst
by jenkins-bot (Code Review) 11 Oct '25

11 Oct '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1195365?usp=email ) Change subject: Doc: Update ROADMAP.rst and AUTHORS.rst ...................................................................... Doc: Update ROADMAP.rst and AUTHORS.rst Change-Id: Ice50404436e8c0e313fbd7ee7438dbbaf71be5e0 --- M AUTHORS.rst M ROADMAP.rst M docs/changelog.rst 3 files changed, 99 insertions(+), 79 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/AUTHORS.rst b/AUTHORS.rst index fa3bf8b..6fbbb27 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -295,6 +295,7 @@ :: + Sanjai Siddharthan Serio Santoro Scot Wilcoxon Shardul C diff --git a/ROADMAP.rst b/ROADMAP.rst index 62efaeb..be4cfa4 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,93 +1,31 @@ Current Release Changes ======================= -* Positional arguments of :func:`daemonize()<daemonize.daemonize>` are deprecated and must - be given as keyword arguments. -* Return :meth:`bot.BaseBot.userPut` result with :meth:`AutomaticTWSummaryBot.put_current() - <bot.AutomaticTWSummaryBot.put_current>` method * :meth:`Family.interwiki_replacements<family.Family.interwiki_replacements>` is deprecated; use :attr:`Family.code_aliases<family.Family.code_aliases>` instead. +* The first parameter of :meth:`Transliterator.transliterate + <userinterfaces.transliteration.Transliterator.transliterate>` is positional only + whereas *prev* and *succ* parameters are keyword only. The :class:`Transliterator + <userinterfaces.transliteration.Transliterator>` was improved. +* Show user-agent with :mod:`version<pywikibot.scripts.version>` script (:phab:`T406458`) +* Positional arguments of :func:`daemonize()<daemonize.daemonize>` are deprecated and must + be given as keyword arguments. +* i18n updates. +* Return :meth:`bot.BaseBot.userPut` result from :meth:`AutomaticTWSummaryBot.put_current() + <bot.AutomaticTWSummaryBot.put_current>` method Deprecations ============ -Pending removal in Pywikibot 13 -------------------------------- +This section lists features, methods, parameters, or attributes that are deprecated +and scheduled for removal in future Pywikibot releases. -* 10.6.0: :meth:`Family.interwiki_replacements<family.Family.interwiki_replacements>` is deprecated; - use :attr:`Family.code_aliases<family.Family.code_aliases>` instead. -* 10.6.0: Positional arguments of :func:`daemonize()<daemonize.daemonize>` are deprecated and must - be given as keyword arguments. -* 10.5.0: Accessing the fallback '*' keys in 'languages', 'namespaces', 'namespacealiases', and - 'skins' properties of :attr:`APISite.siteinfo<pywikibot.site._apisite.APISite.siteinfo>` are - deprecated and will be removed. -* 10.5.0: The methods :meth:`APISite.protection_types() - <pywikibot.site._apisite.APISite.protection_types>` and :meth:`APISite.protection_levels() - <pywikibot.site._apisite.APISite.protection_levels>` are deprecated. - :attr:`APISite.restrictions<pywikibot.site._apisite.APISite.restrictions>` should be used instead. -* 10.4.0: Require all parameters of :meth:`Site.allpages() - <pywikibot.site._generators.GeneratorsMixin.allpages>` except *start* to be keyword arguments. -* 10.4.0: Positional arguments of :class:`pywikibot.Coordinate` are deprecated and must be given as - keyword arguments. -* 10.3.0: :meth:`throttle.Throttle.getDelay` and :meth:`throttle.Throttle.setDelays` were renamed to - :meth:`get_delay()<throttle.Throttle.get_delay>` and :meth:`set_delays() - <throttle.Throttle.set_delays>`; the old methods will be removed (:phab:`T289318`) -* 10.3.0: :attr:`throttle.Throttle.next_multiplicity` attribute is unused and will be removed - (:phab:`T289318`) -* 10.3.0: *requestsize* parameter of :class:`throttle.Throttle` call is deprecated and will be - dropped (:phab:`T289318`) -* 10.3.0: :func:`textlib.to_latin_digits` will be removed in favour of - :func:`textlib.to_ascii_digits`, ``NON_LATIN_DIGITS`` of :mod:`userinterfaces.transliteration` - will be removed in favour of ``NON_ASCII_DIGITS`` (:phab:`T398146#10958283`) -* 10.2.0: :mod:`tools.threading.RLock<tools.threading>` is deprecated and moved to :mod:`backports` - module. The :meth:`backports.RLock.count` method is also deprecated. For Python 3.14+ use ``RLock`` - from Python library ``threading`` instead. (:phab:`T395182`) -* 10.1.0: *revid* and *date* parameters of :meth:`Page.authorship() - <page._toolforge.WikiBlameMixin.authorship>` were dropped -* 10.0.0: *last_id* of :class:`comms.eventstreams.EventStreams` was renamed to *last_event_id* - (:phab:`T309380`) -* 10.0.0: 'millenia' argument for *precision* parameter of :class:`pywikibot.WbTime` is deprecated; - 'millennium' must be used instead -* 10.0.0: *includeredirects* parameter of :func:`pagegenerators.AllpagesPageGenerator` and - :func:`pagegenerators.PrefixingPageGenerator` is deprecated and should be replaced by *filterredir* +Deprecated items may still work in the current release but are no longer recommended for use. +Users should update their code according to the recommended alternatives. - -Pending removal in Pywikibot 12 -------------------------------- - -* 9.6.0: :meth:`BaseSite.languages()<pywikibot.site._basesite.BaseSite.languages>` will be removed in - favour of :attr:`BaseSite.codes<pywikibot.site._basesite.BaseSite.codes>` -* 9.5.0: :meth:`DataSite.getPropertyType()<pywikibot.site._datasite.DataSite.getPropertyType>` will be removed - in favour of :meth:`DataSite.get_property_type()<pywikibot.site._datasite.DataSite.get_property_type>` -* 9.3.0: :meth:`page.BasePage.userName` and :meth:`page.BasePage.isIpEdit` are deprecated in favour of - ``user`` or ``anon`` attributes of :attr:`page.BasePage.latest_revision` property -* 9.3.0: *botflag* parameter of :meth:`Page.save()<page.BasePage.save>`, :meth:`Page.put() - <page.BasePage.put>`, :meth:`Page.touch()<page.BasePage.touch>` and - :meth:`Page.set_redirect_target()<page.Page.set_redirect_target>` was renamed to *bot* -* 9.2.0: All parameters of :meth:`Page.templates<page.BasePage.templates>` and - :meth:`Page.itertemplates()<page.BasePage.itertemplates>` must be given as keyworded arguments -* 9.2.0: Imports of :mod:`logging` functions from the :mod:`bot` module are deprecated and will be desupported -* 9.2.0: *total* argument in ``-logevents`` pagegenerators option is deprecated; - use ``-limit`` instead (:phab:`T128981`) -* 9.0.0: The *content* parameter of :meth:`proofreadpage.IndexPage.page_gen` is deprecated and will be - ignored (:phab:`T358635`) -* 9.0.0: ``next`` parameter of :meth:`userinterfaces.transliteration.Transliterator.transliterate` was - renamed to ``succ`` -* 9.0.0: ``userinterfaces.transliteration.transliterator`` object was renamed to :class:`Transliterator - <userinterfaces.transliteration.Transliterator>` -* 9.0.0: The ``type`` parameter of :meth:`site.APISite.protectedpages() - <pywikibot.site._generators.GeneratorsMixin.protectedpages>` was renamed to ``protect_type`` -* 9.0.0: The ``all`` parameter of :meth:`site.APISite.namespace() - <pywikibot.site._apisite.APISite.namespace>` was renamed to ``all_ns`` -* 9.0.0: ``filter`` parameter of :func:`date.dh` was renamed to ``filter_func`` -* 9.0.0: ``dict`` parameter of :class:`data.api.OptionSet` was renamed to ``data`` -* 9.0.0: :func:`pywikibot.version.get_toolforge_hostname` is deprecated with no replacement -* 9.0.0: ``allrevisions`` parameter of :class:`xmlreader.XmpDump` is deprecated, use ``revisions`` instead - (:phab:`T340804`) -* 9.0.0: ``iteritems`` method of :class:`data.api.Request` will be removed in favour of ``items`` -* 9.0.0: ``SequenceOutputter.output()`` is deprecated in favour of the - :attr:`tools.formatter.SequenceOutputter.out` property +Pywikibot follows a clear deprecation policy: features are typically deprecated in one release and +removed in in the third subsequent major release, remaining available for the two releases in between. Pending removal in Pywikibot 11 @@ -127,3 +65,84 @@ attribute * 8.0.0: The :meth:`Page.editTime()<page.BasePage.editTime>` method is deprecated and should be replaced by the :attr:`Page.latest_revision.timestamp<page.BasePage.latest_revision>` attribute + + +Pending removal in Pywikibot 12 +------------------------------- + +* 9.6.0: :meth:`BaseSite.languages()<pywikibot.site._basesite.BaseSite.languages>` will be removed in + favour of :attr:`BaseSite.codes<pywikibot.site._basesite.BaseSite.codes>` +* 9.5.0: :meth:`DataSite.getPropertyType()<pywikibot.site._datasite.DataSite.getPropertyType>` will be removed + in favour of :meth:`DataSite.get_property_type()<pywikibot.site._datasite.DataSite.get_property_type>` +* 9.3.0: :meth:`page.BasePage.userName` and :meth:`page.BasePage.isIpEdit` are deprecated in favour of + ``user`` or ``anon`` attributes of :attr:`page.BasePage.latest_revision` property +* 9.3.0: *botflag* parameter of :meth:`Page.save()<page.BasePage.save>`, :meth:`Page.put() + <page.BasePage.put>`, :meth:`Page.touch()<page.BasePage.touch>` and + :meth:`Page.set_redirect_target()<page.Page.set_redirect_target>` was renamed to *bot* +* 9.2.0: All parameters of :meth:`Page.templates<page.BasePage.templates>` and + :meth:`Page.itertemplates()<page.BasePage.itertemplates>` must be given as keyworded arguments +* 9.2.0: Imports of :mod:`logging` functions from the :mod:`bot` module are deprecated and will be desupported +* 9.2.0: *total* argument in ``-logevents`` pagegenerators option is deprecated; + use ``-limit`` instead (:phab:`T128981`) +* 9.0.0: The *content* parameter of :meth:`proofreadpage.IndexPage.page_gen` is deprecated and will be + ignored (:phab:`T358635`) +* 9.0.0: ``next`` parameter of :meth:`userinterfaces.transliteration.Transliterator.transliterate` was + renamed to ``succ`` +* 9.0.0: ``userinterfaces.transliteration.transliterator`` object was renamed to :class:`Transliterator + <userinterfaces.transliteration.Transliterator>` +* 9.0.0: The ``type`` parameter of :meth:`site.APISite.protectedpages() + <pywikibot.site._generators.GeneratorsMixin.protectedpages>` was renamed to ``protect_type`` +* 9.0.0: The ``all`` parameter of :meth:`site.APISite.namespace() + <pywikibot.site._apisite.APISite.namespace>` was renamed to ``all_ns`` +* 9.0.0: ``filter`` parameter of :func:`date.dh` was renamed to ``filter_func`` +* 9.0.0: ``dict`` parameter of :class:`data.api.OptionSet` was renamed to ``data`` +* 9.0.0: :func:`pywikibot.version.get_toolforge_hostname` is deprecated with no replacement +* 9.0.0: ``allrevisions`` parameter of :class:`xmlreader.XmpDump` is deprecated, use ``revisions`` instead + (:phab:`T340804`) +* 9.0.0: ``iteritems`` method of :class:`data.api.Request` will be removed in favour of ``items`` +* 9.0.0: ``SequenceOutputter.output()`` is deprecated in favour of the + :attr:`tools.formatter.SequenceOutputter.out` property + + +Pending removal in Pywikibot 13 +------------------------------- + +* 10.6.0: :meth:`Family.interwiki_replacements<family.Family.interwiki_replacements>` is deprecated; + use :attr:`Family.code_aliases<family.Family.code_aliases>` instead. +* Keyword argument for *char* parameter of :meth:`Transliterator.transliterate + <userinterfaces.transliteration.Transliterator.transliterate>` and + positional arguments for *prev* and *succ* parameters are deprecated. +* 10.6.0: Positional arguments of :func:`daemonize()<daemonize.daemonize>` are deprecated and must + be given as keyword arguments. +* 10.5.0: Accessing the fallback '*' keys in 'languages', 'namespaces', 'namespacealiases', and + 'skins' properties of :attr:`APISite.siteinfo<pywikibot.site._apisite.APISite.siteinfo>` are + deprecated and will be removed. +* 10.5.0: The methods :meth:`APISite.protection_types() + <pywikibot.site._apisite.APISite.protection_types>` and :meth:`APISite.protection_levels() + <pywikibot.site._apisite.APISite.protection_levels>` are deprecated. + :attr:`APISite.restrictions<pywikibot.site._apisite.APISite.restrictions>` should be used instead. +* 10.4.0: Require all parameters of :meth:`Site.allpages() + <pywikibot.site._generators.GeneratorsMixin.allpages>` except *start* to be keyword arguments. +* 10.4.0: Positional arguments of :class:`pywikibot.Coordinate` are deprecated and must be given as + keyword arguments. +* 10.3.0: :meth:`throttle.Throttle.getDelay` and :meth:`throttle.Throttle.setDelays` were renamed to + :meth:`get_delay()<throttle.Throttle.get_delay>` and :meth:`set_delays() + <throttle.Throttle.set_delays>`; the old methods will be removed (:phab:`T289318`) +* 10.3.0: :attr:`throttle.Throttle.next_multiplicity` attribute is unused and will be removed + (:phab:`T289318`) +* 10.3.0: *requestsize* parameter of :class:`throttle.Throttle` call is deprecated and will be + dropped (:phab:`T289318`) +* 10.3.0: :func:`textlib.to_latin_digits` will be removed in favour of + :func:`textlib.to_ascii_digits`, ``NON_LATIN_DIGITS`` of :mod:`userinterfaces.transliteration` + will be removed in favour of ``NON_ASCII_DIGITS`` (:phab:`T398146#10958283`) +* 10.2.0: :mod:`tools.threading.RLock<tools.threading>` is deprecated and moved to :mod:`backports` + module. The :meth:`backports.RLock.count` method is also deprecated. For Python 3.14+ use ``RLock`` + from Python library ``threading`` instead. (:phab:`T395182`) +* 10.1.0: *revid* and *date* parameters of :meth:`Page.authorship() + <page._toolforge.WikiBlameMixin.authorship>` were dropped +* 10.0.0: *last_id* of :class:`comms.eventstreams.EventStreams` was renamed to *last_event_id* + (:phab:`T309380`) +* 10.0.0: 'millenia' argument for *precision* parameter of :class:`pywikibot.WbTime` is deprecated; + 'millennium' must be used instead +* 10.0.0: *includeredirects* parameter of :func:`pagegenerators.AllpagesPageGenerator` and + :func:`pagegenerators.PrefixingPageGenerator` is deprecated and should be replaced by *filterredir* diff --git a/docs/changelog.rst b/docs/changelog.rst index de64526..5a6a5ba 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -2,7 +2,7 @@ Change log ********** -What is new with Pywikibot |release|? What are the main changes of older version? +New features, improvements, and fixes in Pywikibot |release|. .. include:: ../ROADMAP.rst -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1195365?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: Ice50404436e8c0e313fbd7ee7438dbbaf71be5e0 Gerrit-Change-Number: 1195365 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]: Add deprecation tag for Family.interwiki_replacement
by jenkins-bot (Code Review) 11 Oct '25

11 Oct '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1195273?usp=email ) Change subject: Add deprecation tag for Family.interwiki_replacement ...................................................................... Add deprecation tag for Family.interwiki_replacement Bug: T399440 Change-Id: I27c4cc09b1d81d9220ba41fd6ffde58f79e240f9 --- M ROADMAP.rst M pywikibot/family.py M tests/family_tests.py 3 files changed, 19 insertions(+), 5 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/ROADMAP.rst b/ROADMAP.rst index 3e5439f..62efaeb 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -5,6 +5,8 @@ be given as keyword arguments. * Return :meth:`bot.BaseBot.userPut` result with :meth:`AutomaticTWSummaryBot.put_current() <bot.AutomaticTWSummaryBot.put_current>` method +* :meth:`Family.interwiki_replacements<family.Family.interwiki_replacements>` is deprecated; + use :attr:`Family.code_aliases<family.Family.code_aliases>` instead. Deprecations @@ -13,6 +15,8 @@ Pending removal in Pywikibot 13 ------------------------------- +* 10.6.0: :meth:`Family.interwiki_replacements<family.Family.interwiki_replacements>` is deprecated; + use :attr:`Family.code_aliases<family.Family.code_aliases>` instead. * 10.6.0: Positional arguments of :func:`daemonize()<daemonize.daemonize>` are deprecated and must be given as keyword arguments. * 10.5.0: Accessing the fallback '*' keys in 'languages', 'namespaces', 'namespacealiases', and diff --git a/pywikibot/family.py b/pywikibot/family.py index 9197646..73c4379 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -732,7 +732,7 @@ :return: mapping of old codes to new codes (or None) """ data = dict.fromkeys(self.interwiki_removals) - data.update(self.interwiki_replacements) + data.update(self.code_aliases) return types.MappingProxyType(data) @classproperty @@ -749,6 +749,7 @@ return set(cls.langs.keys()) @classproperty + @deprecated('code_aliases', since='10.6.0') def interwiki_replacements(cls) -> Mapping[str, str]: """Return an interwiki code replacement mapping. @@ -757,6 +758,8 @@ xx: now should get code yy:, add {'xx':'yy'} to :attr:`code_aliases`. + .. deprecated:: 10.6 + Use :attr:`code_aliases` directly instead. .. versionchanged:: 8.2 changed from dict to invariant mapping. """ diff --git a/tests/family_tests.py b/tests/family_tests.py index ca8d349..b232698 100755 --- a/tests/family_tests.py +++ b/tests/family_tests.py @@ -13,6 +13,7 @@ import pywikibot from pywikibot.exceptions import UnknownFamilyError from pywikibot.family import Family, SingleSiteFamily +from pywikibot.tools import suppress_warnings from tests.aspects import PatchingTestCase, TestCase, unittest from tests.utils import DrySite @@ -100,13 +101,16 @@ self.assertIsInstance(family.obsolete, Mapping) # redirected code (see site tests test_alias_code_site) self.assertEqual(family.code_aliases['dk'], 'da') - self.assertEqual(family.interwiki_replacements['dk'], 'da') + msg = 'pywikibot.family.Family.interwiki_replacements is deprecated' + with suppress_warnings(msg, FutureWarning): + self.assertEqual(family.interwiki_replacements['dk'], 'da') self.assertEqual(family.obsolete['dk'], 'da') # closed/locked site (see site tests test_locked_site) self.assertIsNone(family.obsolete['mh']) # offline site (see site tests test_removed_site) self.assertIsNone(family.obsolete['ru-sib']) - self.assertIn('dk', family.interwiki_replacements) + with suppress_warnings(msg, FutureWarning): + self.assertIn('dk', family.interwiki_replacements) def test_obsolete_from_attributes(self) -> None: """Test obsolete property for given class attributes.""" @@ -114,14 +118,17 @@ family = type('TempFamily', (Family,), {})() self.assertEqual(family.obsolete, {}) - self.assertEqual(family.interwiki_replacements, {}) + msg = 'pywikibot.family.Family.interwiki_replacements is deprecated' + with suppress_warnings(msg, FutureWarning): + self.assertEqual(family.interwiki_replacements, {}) self.assertEqual(family.interwiki_removals, frozenset()) # Construct a temporary family with other attributes and instantiate it family = type('TempFamily', (Family,), {'code_aliases': {'a': 'b'}, 'closed_wikis': ['c']})() self.assertEqual(family.obsolete, {'a': 'b', 'c': None}) - self.assertEqual(family.interwiki_replacements, {'a': 'b'}) + with suppress_warnings(msg, FutureWarning): + self.assertEqual(family.interwiki_replacements, {'a': 'b'}) self.assertEqual(family.interwiki_removals, frozenset('c')) def test_obsolete_readonly(self) -> None: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1195273?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: I27c4cc09b1d81d9220ba41fd6ffde58f79e240f9 Gerrit-Change-Number: 1195273 Gerrit-PatchSet: 4 Gerrit-Owner: Sanjai Siddharthan <sanjaisiddharth2002(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: tests: try enabling interwiki_link_tests on github
by jenkins-bot (Code Review) 11 Oct '25

11 Oct '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1195358?usp=email ) Change subject: tests: try enabling interwiki_link_tests on github ...................................................................... tests: try enabling interwiki_link_tests on github Bug: T403292 Change-Id: I942d17fe30f5b3ae65cf9f8079485289d99687f7 --- M tests/interwiki_link_tests.py 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/interwiki_link_tests.py b/tests/interwiki_link_tests.py index f3e83bf..6d805f7 100755 --- a/tests/interwiki_link_tests.py +++ b/tests/interwiki_link_tests.py @@ -7,7 +7,6 @@ # from __future__ import annotations -import os from contextlib import suppress from pywikibot import config @@ -46,8 +45,6 @@ self.assertEqual(link.namespace, 1) -(a)unittest.skipIf(os.environ.get('GITHUB_ACTIONS'), - 'Tests blocked on twn, see T403292') class TestInterwikiLinksToNonLocalSites(TestCase): """Tests for interwiki links to non local sites.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1195358?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: I942d17fe30f5b3ae65cf9f8079485289d99687f7 Gerrit-Change-Number: 1195358 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: Use Python 3.14 for pre-commit tests with ubuntu
by Xqt (Code Review) 10 Oct '25

10 Oct '25

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1195238?usp=email ) Change subject: Tests: Use Python 3.14 for pre-commit tests with ubuntu ...................................................................... Tests: Use Python 3.14 for pre-commit tests with ubuntu Change-Id: Ie197dc5b76ff6552aebea0ee0d35c1e33f07feab --- M .github/workflows/pre-commit.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 7af8539..85dae08 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -30,6 +30,7 @@ - macOS-latest include: - python-version: '3.14' + os: ubuntu-latest - python-version: 3.15-dev steps: - name: set up python ${{ matrix.python-version }} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1195238?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: Ie197dc5b76ff6552aebea0ee0d35c1e33f07feab Gerrit-Change-Number: 1195238 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de>

1 0

[Gerrit] ...core[master]: Tests: Python 3.14 is published; use ist with tests
by Xqt (Code Review) 10 Oct '25

10 Oct '25

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1195233?usp=email ) Change subject: Tests: Python 3.14 is published; use ist with tests ...................................................................... Tests: Python 3.14 is published; use ist with tests Also update pre-commit hooks Change-Id: If6f0dadc8b0cf68e338516942dea2a56ccd453c0 --- 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/windows_tests.yml M .pre-commit-config.yaml 7 files changed, 10 insertions(+), 16 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml index eb55cb6..11bf199 100644 --- a/.github/workflows/doctest.yml +++ b/.github/workflows/doctest.yml @@ -22,10 +22,9 @@ fail-fast: false max-parallel: 17 matrix: - python-version: [pypy3.8, pypy3.10, '3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] + python-version: [pypy3.8, pypy3.10, '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14'] os: ['windows-latest', 'macOS-latest', 'ubuntu-latest'] include: - - python-version: 3.14-dev - python-version: 3.15-dev steps: - name: Checkout Repository diff --git a/.github/workflows/login_tests-ci.yml b/.github/workflows/login_tests-ci.yml index cd70233..b52bc64 100644 --- a/.github/workflows/login_tests-ci.yml +++ b/.github/workflows/login_tests-ci.yml @@ -42,7 +42,7 @@ fail-fast: false max-parallel: 1 matrix: - python-version: [pypy3.8, pypy3.10, '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 3.14-dev, 3.15-dev] + python-version: [pypy3.8, pypy3.10, '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14', 3.15-dev] site: ['wikipedia:en', 'wikisource:zh', 'wikipedia:test'] include: - python-version: '3.8' diff --git a/.github/workflows/oauth_tests-ci.yml b/.github/workflows/oauth_tests-ci.yml index 0d8228c..32cd20f 100644 --- a/.github/workflows/oauth_tests-ci.yml +++ b/.github/workflows/oauth_tests-ci.yml @@ -22,7 +22,7 @@ strategy: fail-fast: false matrix: - python-version: [pypy3.8, pypy3.10, '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 3.14-dev, 3.15-dev] + python-version: [pypy3.8, pypy3.10, '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14', 3.15-dev] family: [wikipedia] code: [test] domain: [test.wikipedia.org] diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 9ebe6c0..7af8539 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -24,11 +24,12 @@ python-version: - '3.9' - '3.13' + - '3.14' os: - windows-latest - macOS-latest include: - - python-version: 3.14-dev + - python-version: '3.14' - python-version: 3.15-dev steps: - name: set up python ${{ matrix.python-version }} diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index 54a8b7b..d55a219 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -25,7 +25,7 @@ fail-fast: false max-parallel: 19 matrix: - python-version: [pypy3.10, '3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] + python-version: [pypy3.10, '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14'] site: ['wikipedia:en', 'wikisource:zh'] include: - python-version: '3.8' @@ -59,12 +59,6 @@ - python-version: pypy3.8 site: wikisource:zh os: ubuntu-22.04 - - python-version: 3.14-dev - site: wikipedia:en - os: ubuntu-22.04 - - python-version: 3.14-dev - site: wikisource:zh - os: ubuntu-22.04 - python-version: 3.15-dev site: wikipedia:en os: ubuntu-22.04 diff --git a/.github/workflows/windows_tests.yml b/.github/workflows/windows_tests.yml index c78e045..37ffa79 100644 --- a/.github/workflows/windows_tests.yml +++ b/.github/workflows/windows_tests.yml @@ -22,7 +22,7 @@ strategy: fail-fast: false matrix: - python-version: [3.8.0, '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 3.14-dev] + python-version: [3.8.0, '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14'] python-arch: [x64, x86] site: ['wikipedia:en'] steps: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6e18061..f934067 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -65,14 +65,14 @@ language: python require_serial: true - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.13.2 + rev: v0.14.0 hooks: - id: ruff-check alias: ruff args: - --fix - repo: https://github.com/asottile/pyupgrade - rev: v3.20.0 + rev: v3.21.0 hooks: - id: pyupgrade args: @@ -89,7 +89,7 @@ - --remove-unused-variables exclude: ^pywikibot/backports\.py$ - repo: https://github.com/PyCQA/isort - rev: 6.0.1 + rev: 6.1.0 hooks: - id: isort exclude: ^pwb\.py$ -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1195233?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: If6f0dadc8b0cf68e338516942dea2a56ccd453c0 Gerrit-Change-Number: 1195233 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de>

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits October 2025