Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13500 discussions

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 24 Nov '22

24 Nov '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/860539 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I65d222989eb529975b0aadd569cc6bd7736c054b --- A delinker/sv.json 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/delinker/sv.json b/delinker/sv.json new file mode 100644 index 0000000..28d48da --- /dev/null +++ b/delinker/sv.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Sabelöga" + ] + }, + "delinker-delink": "Bott: Filen [[%(title)s]] har tagits bort så den har raderats av [[:User:%(user)s]]: ''%(comment)s''." +} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/860539 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Change-Id: I65d222989eb529975b0aadd569cc6bd7736c054b Gerrit-Change-Number: 860539 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [tests] test_patrol and test_reflinks a expected to fail
by jenkins-bot (Code Review) 23 Nov '22

23 Nov '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/859994 ) Change subject: [tests] test_patrol and test_reflinks a expected to fail ...................................................................... [tests] test_patrol and test_reflinks a expected to fail Change-Id: Id2cb07214758b1b777cf9c1d3e0b91599bd8dc83 --- M tests/script_tests.py 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/script_tests.py b/tests/script_tests.py index fe28b1a..70a0d3a 100755 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -424,9 +424,10 @@ 'newitem', 'pagefromfile', 'parser_function_count', - 'patrol' + 'patrol', 'protect', 'redirect', + 'reflinks', # 404-links.txt is required 'replace', 'replicate_wiki', 'revertbot', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/859994 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Id2cb07214758b1b777cf9c1d3e0b91599bd8dc83 Gerrit-Change-Number: 859994 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] Fix spelling mistake and don't print lang codes if force is True
by jenkins-bot (Code Review) 22 Nov '22

22 Nov '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/859464 ) Change subject: [IMPR] Fix spelling mistake and don't print lang codes if force is True ...................................................................... [IMPR] Fix spelling mistake and don't print lang codes if force is True Change-Id: I8a26bf6703cc332c374e4da9b22cd5bc53775df4 --- M pywikibot/scripts/generate_user_files.py 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/scripts/generate_user_files.py b/pywikibot/scripts/generate_user_files.py index 6d4018e..3a05b1b 100755 --- a/pywikibot/scripts/generate_user_files.py +++ b/pywikibot/scripts/generate_user_files.py @@ -144,8 +144,9 @@ pywikibot.info(f'The only known site code: {known_langs[0]}') default_lang = known_langs[0] else: - pywikibot.info('This is the list of known site oodes:') - pywikibot.info(', '.join(known_langs)) + if not force: + pywikibot.info('This is the list of known site codes:') + pywikibot.info(', '.join(known_langs)) if default_lang not in known_langs: if default_lang != 'en' and 'en' in known_langs: default_lang = 'en' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/859464 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I8a26bf6703cc332c374e4da9b22cd5bc53775df4 Gerrit-Change-Number: 859464 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [tests] Rename meta test class to prevent pytest warnings
by jenkins-bot (Code Review) 22 Nov '22

22 Nov '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/859450 ) Change subject: [tests] Rename meta test class to prevent pytest warnings ...................................................................... [tests] Rename meta test class to prevent pytest warnings Change-Id: I8db1166e6fbc24479ed4eece414f013f30d125c4 --- M tests/script_tests.py M tests/ui_tests.py M tests/date_tests.py M tests/logentries_tests.py 4 files changed, 26 insertions(+), 17 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/date_tests.py b/tests/date_tests.py index 2adae3d..edc43bd 100755 --- a/tests/date_tests.py +++ b/tests/date_tests.py @@ -13,7 +13,7 @@ from tests.aspects import MetaTestCaseClass, TestCase -class TestDateMeta(MetaTestCaseClass): +class DateTestMeta(MetaTestCaseClass): """Date test meta class.""" @@ -53,7 +53,7 @@ return super().__new__(cls, name, bases, dct) -class TestDate(TestCase, metaclass=TestDateMeta): +class TestDate(TestCase, metaclass=DateTestMeta): """Test cases for date library processed by unittest.""" diff --git a/tests/logentries_tests.py b/tests/logentries_tests.py index bbbf189..056df8d 100755 --- a/tests/logentries_tests.py +++ b/tests/logentries_tests.py @@ -132,7 +132,7 @@ self.assertEqual(logentry.logid(), logentry['logid']) -class TestLogentriesMeta(MetaTestCaseClass): +class LogentriesTestMeta(MetaTestCaseClass): """Test meta class for TestLogentries.""" @@ -157,7 +157,7 @@ return super().__new__(cls, name, bases, dct) -class TestLogentries(TestLogentriesBase, metaclass=TestLogentriesMeta): +class TestLogentries(TestLogentriesBase, metaclass=LogentriesTestMeta): """Test general LogEntry properties.""" diff --git a/tests/script_tests.py b/tests/script_tests.py index 8df3bdd..fe28b1a 100755 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -183,7 +183,7 @@ import_module(prefix + script_name) -class TestScriptMeta(MetaTestCaseClass): +class ScriptTestMeta(MetaTestCaseClass): """Test meta class.""" @@ -327,7 +327,7 @@ return super().__new__(cls, name, bases, dct) -class TestScriptHelp(PwbTestCase, metaclass=TestScriptMeta): +class TestScriptHelp(PwbTestCase, metaclass=ScriptTestMeta): """Test cases for running scripts with -help. @@ -348,7 +348,7 @@ class TestScriptSimulate(DefaultSiteTestCase, PwbTestCase, - metaclass=TestScriptMeta): + metaclass=ScriptTestMeta): """Test cases for running scripts with -siumlate. @@ -388,7 +388,7 @@ class TestScriptGenerator(DefaultSiteTestCase, PwbTestCase, - metaclass=TestScriptMeta): + metaclass=ScriptTestMeta): """Test cases for running scripts with a generator.""" diff --git a/tests/ui_tests.py b/tests/ui_tests.py index ff9130b..8b759e2 100755 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -84,7 +84,7 @@ return self.strin.readline().strip() -class TestExceptionError(Exception): +class ExceptionTestError(Exception): """Test exception.""" @@ -154,8 +154,8 @@ def test_exception(self): try: - raise TestExceptionError('Testing Exception') - except TestExceptionError: + raise ExceptionTestError('Testing Exception') + except ExceptionTestError: pywikibot.error('exception', exc_info=False) self.assertEqual(self.strout.getvalue(), '') self.assertEqual(self.strerr.getvalue(), @@ -163,17 +163,17 @@ def test_exception_empty(self): try: - raise TestExceptionError('Testing Exception') - except TestExceptionError: + raise ExceptionTestError('Testing Exception') + except ExceptionTestError: pywikibot.exception(exc_info=False) self.assertEqual(self.strout.getvalue(), '') self.assertEqual(self.strerr.getvalue(), - 'ERROR: Testing Exception (TestExceptionError)\n') + 'ERROR: Testing Exception (ExceptionTestError)\n') def test_exception_tb(self): try: - raise TestExceptionError('Testing Exception') - except TestExceptionError: + raise ExceptionTestError('Testing Exception') + except ExceptionTestError: pywikibot.exception() self.assertEqual(self.strout.getvalue(), '') stderrlines = self.strerr.getvalue().split('\n') @@ -181,7 +181,7 @@ 'ERROR: Testing Exception') self.assertEqual(stderrlines[1], 'Traceback (most recent call last):') self.assertEqual(stderrlines[3], - " raise TestExceptionError('Testing Exception')") + " raise ExceptionTestError('Testing Exception')") end_str = ': Testing Exception' self.assertTrue(stderrlines[-1].endswith(end_str), -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/859450 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I8db1166e6fbc24479ed4eece414f013f30d125c4 Gerrit-Change-Number: 859450 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [tests] More deterministic tests for TestScriptGenerator
by jenkins-bot (Code Review) 22 Nov '22

22 Nov '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/859444 ) Change subject: [tests] More deterministic tests for TestScriptGenerator ...................................................................... [tests] More deterministic tests for TestScriptGenerator - always use wikipedia:en to run these tests - clear _allowed_failures set which only skips the test - put remaining scripts into _expected_failures set Change-Id: I8d0ade9d66633dac6f9970d018f4c3a4daa375c5 --- M tests/script_tests.py 1 file changed, 35 insertions(+), 32 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/script_tests.py b/tests/script_tests.py index 5513cca..8df3bdd 100755 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -395,58 +395,47 @@ login = True _expected_failures = { - 'login', 'add_text', + 'archivebot', + 'blockpageschecker', 'category', + 'category_redirect', 'change_pagelang', + 'checkimages', 'claimit', + 'clean_sandbox', + 'commonscat', + 'coordinate_import', + 'create_isbn_edition', 'dataextend', 'data_ingestion', 'delete', + 'delinker', 'djvutext', 'download_dump', + 'fixing_redirects', 'harvest_template', + 'imagetransfer', 'interwiki', 'listpages', + 'login', + 'misspelling', 'movepages', + 'newitem', 'pagefromfile', + 'parser_function_count', + 'patrol' 'protect', 'redirect', - 'reflinks', + 'replace', 'replicate_wiki', 'revertbot', + 'shell', + 'solve_disambiguation', 'speedy_delete', 'template', 'templatecount', 'transferbot', - } - - _allowed_failures = { - 'archivebot', - 'basic', - 'blockpageschecker', - 'category_redirect', - 'checkimages', - 'clean_sandbox', - 'commonscat', - 'commons_information', - 'coordinate_import', - 'cosmetic_changes', - 'create_isbn_edition', - 'delinker', - 'fixing_redirects', - 'illustrate_wikidata', - 'image', - 'imagetransfer', - 'interwikidata', - 'misspelling', - 'newitem', - 'parser_function_count', - 'patrol', - 'replace', - 'shell', - 'solve_disambiguation', - 'touch', 'unusedfiles', 'upload', 'watchlist', @@ -454,8 +443,9 @@ 'welcome', } - _arguments = '-simulate -page:Foo -always' - _results = ("Working on 'Foo", 'Script terminated successfully') + _allowed_failures = set() + _arguments = '-simulate -page:Foobar -always -site:wikipedia:en' + _results = ("Working on 'Foobar'", 'Script terminated successfully') _skip_results = {} _timeout = True -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/859444 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I8d0ade9d66633dac6f9970d018f4c3a4daa375c5 Gerrit-Change-Number: 859444 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 21 Nov '22

21 Nov '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/859025 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I543fef2d096f024b194b3b35facf6e8e0289e053 --- M category/de.json M blockpageschecker/de.json M replace/ku.json A delinker/de.json M interwiki/ku.json 5 files changed, 27 insertions(+), 3 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/blockpageschecker/de.json b/blockpageschecker/de.json index 8f0db41..6af3c40 100644 --- a/blockpageschecker/de.json +++ b/blockpageschecker/de.json @@ -1,8 +1,11 @@ { "@metadata": { "authors": [ + "Justman10000", "Metalhead64" ] }, + "blockpageschecker-adding": "Bot: Vorlage für Seitensperre hinzufügen", + "blockpageschecker-modifying": "Bot: Veraltete Vorlage ändern", "blockpageschecker-deleting": "Bot: Lösche veraltete Vorlage" } diff --git a/category/de.json b/category/de.json index 9e39049..86906d3 100644 --- a/category/de.json +++ b/category/de.json @@ -3,6 +3,7 @@ "authors": [ "Als-Holder", "Giftpflanze", + "Justman10000", "Merlissimo", "Metalhead64", "The Evil IP address", @@ -11,6 +12,7 @@ }, "category-adding": "Bot: Ergänze Kategorie [[:Category:%(newcat)s|%(newcat)s]]", "category-also-in": "(auch in %(alsocat)s)", + "category-clean": "Bot: Entfernen der Kategorie %(category)s, die bereits in %(child)s enthalten ist", "category-listifying": "Bot: Liste aus %(fromcat)s ({{PLURAL:num|1 Eintrag|%(num)d Einträge}})", "category-removing": "Bot: Entferne aus %(oldcat)s", "category-renamed": "Bot: Verschoben von %(oldcat)s. Autoren: %(authors)s", diff --git a/delinker/de.json b/delinker/de.json new file mode 100644 index 0000000..67d8c84 --- /dev/null +++ b/delinker/de.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Justman10000" + ] + }, + "delinker-delink": "Bot: Die Datei [[%(title)s]] wurde entfernt, da sie von [[:User:%(user)s]]: ''%(comment)s'' gelöscht wurde." +} diff --git a/interwiki/ku.json b/interwiki/ku.json index 15052e2..ac356f0 100644 --- a/interwiki/ku.json +++ b/interwiki/ku.json @@ -1,6 +1,7 @@ { "@metadata": { "authors": [ + "Balyozxane", "Bikarhêner", "George Animal", "Xqt" @@ -11,7 +12,7 @@ "interwiki-adding-removing": "robot serzêde kirin: %(adding)s jêbirin: %(removing)s", "interwiki-adding-removing-modifying": "robot serzêde kirin: %(adding)s jêbirin: %(removing)s guhêrandin: %(modifying)s", "interwiki-modifying": "robot guhêrandin: %(modifying)s", - "interwiki-modifying-from": "Bot: ji %(from)s wek %(modifying)s tê guherandin", + "interwiki-modifying-from": "Bot: ji %(from)s wek %(modifying)s tê guhartin", "interwiki-removing": "robot jêbirin: %(removing)s", - "interwiki-removing-modifying": "robot jêbirin: %(removing)s guherandin: %(modifying)s" + "interwiki-removing-modifying": "robot jêbirin: %(removing)s guhartin: %(modifying)s" } diff --git a/replace/ku.json b/replace/ku.json index 2e6a8c3..03df020 100644 --- a/replace/ku.json +++ b/replace/ku.json @@ -1,8 +1,9 @@ { "@metadata": { "authors": [ + "Balyozxane", "Ghybu" ] }, - "replace-replacing": "Bot: Otomatîk nivîs guherandin %(description)s" + "replace-replacing": "Bot: Otomatîk nivîs guhartin %(description)s" } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/859025 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Change-Id: I543fef2d096f024b194b3b35facf6e8e0289e053 Gerrit-Change-Number: 859025 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] Ignore OSError if cache cannot be written
by jenkins-bot (Code Review) 21 Nov '22

21 Nov '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/858701 ) Change subject: [IMPR] Ignore OSError if cache cannot be written ...................................................................... [IMPR] Ignore OSError if cache cannot be written OSError could be risen if for example the disk space is too low. Ignore OSError in api.CachedRequest._write_cache() in that case. Note: Pywikibot can slow down in such case - suppress OSError in CachedRequest._write_cache() but delete created cache file in such case - use pathlib.Path in _get_cache_dir, _make_dir, _cachefile_path, _load_cache and _write_cache - use pathlib.Path in corresponding maintenance/cache.py script - update tests Change-Id: Ie5ed280e82fce93a0dc99f37e22b2aec9ec703b3 --- M tests/dry_api_tests.py M pywikibot/data/api/_requests.py M scripts/maintenance/cache.py 3 files changed, 84 insertions(+), 33 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api/_requests.py b/pywikibot/data/api/_requests.py index 8d656c8..d840b9a 100644 --- a/pywikibot/data/api/_requests.py +++ b/pywikibot/data/api/_requests.py @@ -13,7 +13,9 @@ import re import traceback from collections.abc import MutableMapping +from contextlib import suppress from email.mime.nonmultipart import MIMENonMultipart +from pathlib import Path from typing import Any, Optional, Union from urllib.parse import unquote, urlencode from warnings import warn @@ -1133,32 +1135,39 @@ raise NotImplementedError('CachedRequest cannot be created simply.') @classmethod - def _get_cache_dir(cls) -> str: + def _get_cache_dir(cls) -> Path: """ Return the base directory path for cache entries. The directory will be created if it does not already exist. + .. versionchanged:: 8.0 + return a `pathlib.Path` object. + :return: base directory path for cache entries """ - path = os.path.join(config.base_dir, - f'apicache-py{PYTHON_VERSION[0]:d}') + path = Path(config.base_dir, f'apicache-py{PYTHON_VERSION[0]:d}') cls._make_dir(path) cls._get_cache_dir = classmethod(lambda c: path) # cache the result return path @staticmethod - def _make_dir(dir_name: str) -> str: + def _make_dir(dir_name: Union[str, Path]) -> Path: """Create directory if it does not exist already. .. versionchanged:: 7.0 Only `FileExistsError` is ignored but other OS exceptions can be still raised + .. versionchanged:: 8.0 + use *dir_name* as str or `pathlib.Path` object but always + return a Path object. :param dir_name: directory path - :return: unmodified directory name for test purpose + :return: directory path as `pathlib.Path` object for test purpose """ - os.makedirs(dir_name, exist_ok=True) + if isinstance(dir_name, str): + dir_name = Path(dir_name) + dir_name.mkdir(exist_ok=True) return dir_name def _uniquedescriptionstr(self) -> str: @@ -1189,9 +1198,13 @@ self._uniquedescriptionstr().encode('utf-8') ).hexdigest() - def _cachefile_path(self): - return os.path.join(CachedRequest._get_cache_dir(), - self._create_file_name()) + def _cachefile_path(self) -> Path: + """Create the cachefile path. + + .. versionchanged:: 8.0 + return a `pathlib.Path` object. + """ + return CachedRequest._get_cache_dir() / self._create_file_name() def _expired(self, dt): return dt + self.expiry < datetime.datetime.utcnow() @@ -1204,30 +1217,39 @@ self._add_defaults() try: filename = self._cachefile_path() - with open(filename, 'rb') as f: + with filename.open('rb') as f: uniquedescr, self._data, self._cachetime = pickle.load(f) + if uniquedescr != self._uniquedescriptionstr(): raise RuntimeError('Expected unique description for the cache ' 'entry is different from file entry.') + if self._expired(self._cachetime): self._data = None return False - pywikibot.debug('{}: cache hit ({}) for API request: {}' - .format(self.__class__.__name__, filename, - uniquedescr)) - return True + + pywikibot.debug( + f'{type(self).__name__}: cache ({filename.parent}) hit\n' + f'{filename.name}, API request:\n{uniquedescr}') + except OSError: - # file not found - return False + pass # file not found except Exception as e: pywikibot.info(f'Could not load cache: {e!r}') - return False + else: + return True + + return False def _write_cache(self, data) -> None: """Write data to self._cachefile_path().""" data = (self._uniquedescriptionstr(), data, datetime.datetime.utcnow()) - with open(self._cachefile_path(), 'wb') as f: + path = self._cachefile_path() + with suppress(OSError), path.open('wb') as f: pickle.dump(data, f, protocol=config.pickle_protocol) + return + # delete invalid cache entry + path.unlink() def submit(self): """Submit cached request.""" diff --git a/scripts/maintenance/cache.py b/scripts/maintenance/cache.py index ae4a44f..2340fab 100755 --- a/scripts/maintenance/cache.py +++ b/scripts/maintenance/cache.py @@ -73,6 +73,7 @@ import os import pickle import sys +from pathlib import Path import pywikibot from pywikibot.data import api @@ -93,7 +94,7 @@ """A Request cache entry.""" - def __init__(self, directory, filename): + def __init__(self, directory: str, filename: str): """Initializer.""" self.directory = directory self.filename = filename @@ -104,24 +105,31 @@ def __repr__(self): """Representation of object.""" - return self._cachefile_path() + return str(self._cachefile_path()) def _create_file_name(self): """Filename of the cached entry.""" return self.filename - def _get_cache_dir(self): - """Directory of the cached entry.""" - return self.directory + def _get_cache_dir(self) -> Path: + """Directory of the cached entry. - def _cachefile_path(self): - """Return cache file path.""" - return os.path.join(self._get_cache_dir(), - self._create_file_name()) + .. versionchanged:: 8.0 + return a `pathlib.Path` object. + """ + return Path(self.directory) + + def _cachefile_path(self) -> Path: + """Return cache file path. + + .. versionchanged:: 8.0 + return a `pathlib.Path` object. + """ + return self._get_cache_dir() / self._create_file_name() def _load_cache(self): """Load the cache entry.""" - with open(self._cachefile_path(), 'rb') as f: + with self._cachefile_path().open('rb') as f: self.key, self._data, self._cachetime = pickle.load(f) return True @@ -206,7 +214,7 @@ def _delete(self): """Delete the cache entry.""" - os.remove(self._cachefile_path()) + self._cachefile_path().unlink() def process_entries(cache_path, func, use_accesstime=None, output_func=None, @@ -266,8 +274,7 @@ try: entry._load_cache() except ValueError: - pywikibot.error('Failed loading {}'.format( - entry._cachefile_path())) + pywikibot.error(f'Failed loading {entry._cachefile_path()}') pywikibot.exception() continue diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py index 53ebd97..a110d8a 100755 --- a/tests/dry_api_tests.py +++ b/tests/dry_api_tests.py @@ -6,6 +6,7 @@ # Distributed under the terms of the MIT license. # import datetime +from pathlib import Path from unittest.mock import patch import pywikibot @@ -18,7 +19,7 @@ from pywikibot.exceptions import Error from pywikibot.family import Family from pywikibot.login import LoginStatus -from pywikibot.tools import suppress_warnings +from pywikibot.tools import suppress_warnings, PYTHON_VERSION from tests import join_images_path from tests.aspects import ( DefaultDrySiteTestCase, @@ -103,7 +104,8 @@ def test_get_cache_dir(self): """Test that 'apicache' is in the cache dir.""" retval = self.req._get_cache_dir() - self.assertIn('apicache', retval) + self.assertIsInstance(retval, Path) + self.assertIn(f'apicache-py{PYTHON_VERSION[0]:d}', retval.parts) def test_create_file_name(self): """Test the file names for the cache.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/858701 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Ie5ed280e82fce93a0dc99f37e22b2aec9ec703b3 Gerrit-Change-Number: 858701 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Bináris <wikiposta(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[tests]: [doc] backport tox to tests branch
by jenkins-bot (Code Review) 20 Nov '22

20 Nov '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/858702 ) Change subject: [doc] backport tox to tests branch ...................................................................... [doc] backport tox to tests branch Bug: T322979 Change-Id: Id082766bb8e6ac03c3d0f3ffe484a2f7d3e69ab9 --- M tox.ini 1 file changed, 30 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tox.ini b/tox.ini index c26452c..69ebd75 100644 --- a/tox.ini +++ b/tox.ini @@ -37,7 +37,8 @@ hacking: flake8 --format=default {posargs} deeptest: python {[params]generate_user_files} - deeptest: python -m unittest discover -vv -p "*_tests.py" + deeptest-py36: python -m unittest discover -vv -p "*_tests.py" + deeptest-py39: pytest fasttest: python {[params]generate_user_files} fasttest: pytest --version @@ -59,7 +60,9 @@ deeptest: .[html] deeptest: .[mwparserfromhell] deeptest: .[scripts] - deeptest: .[wikitextparser] + deeptest-py39: .[wikitextparser] + deeptest-py39: pytest >= 7.0.1 + deeptest-py39: pytest-subtests >= 0.3.2 [testenv:commit-message] basepython = python3 @@ -82,11 +85,26 @@ commands = {posargs} [testenv:doc] +basepython = python3.7 commands = sphinx-build -M html ./docs ./docs/_build -j auto +deps = + -rrequirements.txt + -rdocs/requirements.txt + +[testenv:rstcheck] +basepython = python3.7 +commands = rstcheck --version rstcheck -r --report-level WARNING --ignore-roles api,phab . +deps = + -rrequirements.txt + -rdocs/requirements.txt + +[testenv:sphinx] basepython = python3.7 +commands = + sphinx-build -M html ./docs ./docs/_build -j auto -D html_theme=nature deps = -rrequirements.txt -rdocs/requirements.txt -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/858702 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: tests Gerrit-Change-Id: Id082766bb8e6ac03c3d0f3ffe484a2f7d3e69ab9 Gerrit-Change-Number: 858702 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [tests] Add rstcheck and sphinx checks
by jenkins-bot (Code Review) 19 Nov '22

19 Nov '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/856176 ) Change subject: [tests] Add rstcheck and sphinx checks ...................................................................... [tests] Add rstcheck and sphinx checks - pywikibot-core-tox-rstcheck-docker is for rstcheck run - pywikibot-core-tox-sphinx-docker for sphinx check with small themes like "basic" or "nature" which runs within 5 minutes - pywikibot-core-tox-doc-docker is for "furo" sphinx theme later and for pywikibot-core-tox-publish CI run - use multiple processes to build distribution Bug: T322979 Change-Id: Ifbcd9716d68dfd6206fd75aebff5163d4bd2d9b3 --- M tox.ini 1 file changed, 32 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tox.ini b/tox.ini index dbed3d0..69ebd75 100644 --- a/tox.ini +++ b/tox.ini @@ -88,12 +88,27 @@ basepython = python3.7 commands = sphinx-build -M html ./docs ./docs/_build -j auto +deps = + -rrequirements.txt + -rdocs/requirements.txt + +[testenv:rstcheck] +basepython = python3.7 +commands = rstcheck --version rstcheck -r --report-level WARNING --ignore-roles api,phab . deps = -rrequirements.txt -rdocs/requirements.txt +[testenv:sphinx] +basepython = python3.7 +commands = + sphinx-build -M html ./docs ./docs/_build -j auto -D html_theme=nature +deps = + -rrequirements.txt + -rdocs/requirements.txt + [flake8] # The following are intentionally ignored, possibly pending consensus # D105: Missing docstring in magic method -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/856176 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Ifbcd9716d68dfd6206fd75aebff5163d4bd2d9b3 Gerrit-Change-Number: 856176 Gerrit-PatchSet: 7 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Hashar <hashar(a)free.fr> Gerrit-Reviewer: KBach <kbach(a)wikimedia.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [tests] run pytest with deeptest-py39
by Xqt (Code Review) 19 Nov '22

19 Nov '22

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/858682 ) Change subject: [tests] run pytest with deeptest-py39 ...................................................................... [tests] run pytest with deeptest-py39 run pytest with deeptest-py39 run unittest with deeptest-py36 to have different tests runner Change-Id: I7bcece53aa3259e14d0e96443b5cad2b139208cb --- M tox.ini 1 file changed, 19 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tox.ini b/tox.ini index c26452c..dbed3d0 100644 --- a/tox.ini +++ b/tox.ini @@ -37,7 +37,8 @@ hacking: flake8 --format=default {posargs} deeptest: python {[params]generate_user_files} - deeptest: python -m unittest discover -vv -p "*_tests.py" + deeptest-py36: python -m unittest discover -vv -p "*_tests.py" + deeptest-py39: pytest fasttest: python {[params]generate_user_files} fasttest: pytest --version @@ -59,7 +60,9 @@ deeptest: .[html] deeptest: .[mwparserfromhell] deeptest: .[scripts] - deeptest: .[wikitextparser] + deeptest-py39: .[wikitextparser] + deeptest-py39: pytest >= 7.0.1 + deeptest-py39: pytest-subtests >= 0.3.2 [testenv:commit-message] basepython = python3 @@ -82,11 +85,11 @@ commands = {posargs} [testenv:doc] +basepython = python3.7 commands = sphinx-build -M html ./docs ./docs/_build -j auto rstcheck --version rstcheck -r --report-level WARNING --ignore-roles api,phab . -basepython = python3.7 deps = -rrequirements.txt -rdocs/requirements.txt -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/858682 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I7bcece53aa3259e14d0e96443b5cad2b139208cb Gerrit-Change-Number: 858682 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits