Pywikibot-commits November 2022

pywikibot-commits@lists.wikimedia.org

1 participants
71 discussions

[Gerrit] ...core[master]: [tests] Provide a more informative AssertionError message

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/856179 ) Change subject: [tests] Provide a more informative AssertionError message ...................................................................... [tests] Provide a more informative AssertionError message Bug: T322981 Change-Id: I3fe3e53c2cbcab1c7be7b2715cee417279856ecd --- M tests/wikibase_tests.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index 8f1f13f..3d137eb 100755 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -92,7 +92,9 @@ self.assertEqual(item.getID(), 'Q5296') self.assertEqual(item.title(), 'Q5296') self.assertIn('en', item.labels) - self.assertTrue(item.labels['en'].lower().endswith('main page')) + self.assertTrue( + item.labels['en'].lower().endswith('main page'), + msg=f"\nitem.labels['en'] of item Q5296 is {item.labels['en']!r}") self.assertIn('en', item.aliases) self.assertIn('home page', (a.lower() for a in item.aliases['en'])) self.assertEqual(item.namespace(), 0) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/856179 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: I3fe3e53c2cbcab1c7be7b2715cee417279856ecd Gerrit-Change-Number: 856179 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 year, 5 months

[Gerrit] ...core[master]: [IMPR] raise TypeError instead of ValueError in Timestamp.set_timestamp

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/854871 ) Change subject: [IMPR] raise TypeError instead of ValueError in Timestamp.set_timestamp ...................................................................... [IMPR] raise TypeError instead of ValueError in Timestamp.set_timestamp raise TypeError instead of ValueError if ts parameter is a wrong type according to https://docs.python.org/3/library/exceptions.html#TypeError Change-Id: I486c6fec012f0d57b52428e5732978325c9be706 --- M pywikibot/time.py 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/time.py b/pywikibot/time.py index cf90546..63bca0d 100644 --- a/pywikibot/time.py +++ b/pywikibot/time.py @@ -80,10 +80,12 @@ - POSIX format: seconds from Unix epoch S{1,13}[.ffffff]] .. versionadded:: 7.5 + .. versionchanged:: 8.0 + raises *TypeError* instead of *ValueError*. :param ts: Timestamp, datetime.datetime or str :return: Timestamp object - :raises ValueError: conversion failed + :raises TypeError: conversion failed """ if isinstance(ts, cls): return ts @@ -91,8 +93,8 @@ return cls._from_datetime(ts) if isinstance(ts, str): return cls._from_string(ts) - raise ValueError('Unsupported "ts" type, got "{}" ({})' - .format(ts, type(ts).__name__)) + raise TypeError( + f'Unsupported "ts" type, got "{ts}" ({type(ts).__name__})') @staticmethod def _from_datetime(dt: datetime.datetime) -> 'Timestamp': -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/854871 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: I486c6fec012f0d57b52428e5732978325c9be706 Gerrit-Change-Number: 854871 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 5 months

[Gerrit] ...core[master]: [L10N] Update languages_by_size

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/855516 ) Change subject: [L10N] Update languages_by_size ...................................................................... [L10N] Update languages_by_size Change-Id: I85ef9d4ec43412ea094deca15562b94267b116de --- M pywikibot/families/wikibooks_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wikisource_family.py M pywikibot/families/wiktionary_family.py 5 files changed, 42 insertions(+), 42 deletions(-) Approvals: Meno25: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index c6537d6..0fdc1f2 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -30,8 +30,8 @@ languages_by_size = [ 'en', 'hu', 'de', 'vi', 'fr', 'it', 'ja', 'pt', 'es', 'nl', 'pl', 'id', - 'he', 'fi', 'zh', 'sq', 'az', 'fa', 'ru', 'ca', 'eu', 'th', 'da', 'ko', - 'cs', 'ba', 'sv', 'gl', 'hi', 'sr', 'uk', 'hr', 'no', 'tr', 'sa', 'ar', + 'he', 'fi', 'zh', 'sq', 'az', 'fa', 'ru', 'ca', 'eu', 'th', 'da', 'cs', + 'ko', 'ba', 'sv', 'gl', 'hi', 'sr', 'uk', 'hr', 'no', 'tr', 'sa', 'ar', 'ta', 'bn', 'eo', 'sk', 'is', 'ro', 'si', 'bg', 'ms', 'ka', 'mk', 'tt', 'lt', 'el', 'li', 'sl', 'tl', 'ur', 'km', 'la', 'mr', 'kk', 'te', 'et', 'be', 'ia', 'ml', 'oc', 'hy', 'ne', 'pa', 'cv', 'tg', 'ku', 'fy', 'af', diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 113e86c..411cbb1 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -28,35 +28,35 @@ languages_by_size = [ 'en', 'ceb', 'de', 'sv', 'fr', 'nl', 'ru', 'es', 'it', 'arz', 'pl', 'ja', 'zh', 'vi', 'war', 'uk', 'ar', 'pt', 'fa', 'ca', 'sr', 'id', - 'ko', 'no', 'fi', 'tr', 'hu', 'cs', 'ce', 'sh', 'ro', 'zh-min-nan', - 'tt', 'eu', 'ms', 'eo', 'he', 'hy', 'da', 'bg', 'cy', 'azb', 'sk', - 'kk', 'et', 'min', 'be', 'simple', 'el', 'hr', 'lt', 'gl', 'az', 'uz', - 'ur', 'sl', 'ka', 'nn', 'hi', 'th', 'ta', 'la', 'mk', 'ast', 'bn', - 'zh-yue', 'lv', 'tg', 'af', 'my', 'mg', 'bs', 'oc', 'mr', 'sq', 'nds', - 'ky', 'ml', 'be-tarask', 'te', 'sw', 'br', 'new', 'jv', 'lld', 'vec', - 'ht', 'pms', 'pnb', 'su', 'lb', 'ba', 'ku', 'ga', 'lmo', 'szl', 'is', - 'cv', 'fy', 'ckb', 'tl', 'an', 'wuu', 'diq', 'sco', 'pa', 'io', 'vo', - 'ne', 'yo', 'gu', 'als', 'kn', 'bar', 'scn', 'avk', 'bpy', 'ia', 'qu', - 'mn', 'crh', 'nv', 'xmf', 'ha', 'si', 'bat-smg', 'os', 'ps', 'ban', - 'frr', 'or', 'gd', 'cdo', 'bug', 'sah', 'yi', 'ilo', 'sd', 'am', 'nap', - 'li', 'hsb', 'fo', 'map-bms', 'mai', 'mzn', 'gor', 'ig', 'eml', 'ace', - 'bcl', 'shn', 'sa', 'zh-classical', 'wa', 'ie', 'lij', 'as', 'zu', - 'mhr', 'mrj', 'hyw', 'hif', 'mni', 'km', 'hak', 'roa-tara', 'sn', - 'pam', 'so', 'nso', 'rue', 'bh', 'tum', 'se', 'myv', 'vls', 'mi', - 'nds-nl', 'sat', 'sc', 'nah', 'vep', 'gan', 'tk', 'kab', 'glk', 'co', - 'fiu-vro', 'bjn', 'ab', 'bo', 'ary', 'gv', 'frp', 'kw', 'skr', 'kv', - 'ug', 'pcd', 'csb', 'udm', 'zea', 'ay', 'gn', 'mt', 'nrm', 'smn', - 'lez', 'lfn', 'stq', 'olo', 'mwl', 'lo', 'rw', 'ang', 'fur', 'rm', - 'lad', 'gom', 'koi', 'ext', 'tyv', 'dsb', 'dty', 'ln', 'av', 'cbk-zam', - 'dv', 'ksh', 'pap', 'gag', 'bxr', 'pfl', 'pag', 'pi', 'haw', 'awa', - 'tay', 'ks', 'dag', 'kaa', 'mdf', 'tw', 'inh', 'krc', 'szy', 'xal', - 'za', 'blk', 'pdc', 'atj', 'to', 'arc', 'tcy', 'kbp', 'jam', 'na', - 'wo', 'kbd', 'nia', 'nov', 'ki', 'mnw', 'lg', 'bi', 'tpi', 'nqo', - 'tet', 'jbo', 'roa-rup', 'fj', 'lbe', 'kg', 'xh', 'ty', 'cu', 'shi', - 'srn', 'guw', 'trv', 'om', 'sm', 'gcr', 'alt', 'chr', 'ltg', 'ny', - 'pih', 'mad', 'got', 'st', 'tn', 'ami', 'bm', 'rmy', 've', 'ts', 'chy', - 'rn', 'ak', 'ss', 'ff', 'iu', 'kcg', 'ch', 'pnt', 'ee', 'ady', 'ik', - 'pcm', 'sg', 'din', 'pwn', 'kl', 'ti', 'dz', 'cr', + 'ko', 'no', 'fi', 'tr', 'hu', 'cs', 'ce', 'sh', 'tt', 'ro', + 'zh-min-nan', 'eu', 'ms', 'eo', 'he', 'hy', 'da', 'bg', 'cy', 'azb', + 'sk', 'kk', 'et', 'min', 'be', 'simple', 'el', 'hr', 'lt', 'gl', 'az', + 'uz', 'ur', 'sl', 'ka', 'nn', 'hi', 'th', 'ta', 'la', 'mk', 'ast', + 'bn', 'zh-yue', 'lv', 'tg', 'af', 'my', 'mg', 'bs', 'mr', 'oc', 'sq', + 'nds', 'ky', 'be-tarask', 'ml', 'te', 'br', 'sw', 'new', 'jv', 'lld', + 'vec', 'ht', 'pms', 'pnb', 'su', 'lb', 'ba', 'ku', 'ga', 'lmo', 'szl', + 'is', 'cv', 'fy', 'ckb', 'tl', 'an', 'wuu', 'diq', 'sco', 'pa', 'io', + 'vo', 'yo', 'ne', 'gu', 'als', 'kn', 'bar', 'scn', 'avk', 'bpy', 'ia', + 'qu', 'mn', 'crh', 'nv', 'xmf', 'ha', 'si', 'bat-smg', 'ps', 'ban', + 'os', 'frr', 'or', 'gd', 'sah', 'cdo', 'bug', 'yi', 'ilo', 'sd', 'am', + 'nap', 'li', 'hsb', 'fo', 'map-bms', 'mai', 'gor', 'mzn', 'ig', 'eml', + 'bcl', 'ace', 'shn', 'sa', 'zh-classical', 'wa', 'ie', 'lij', 'as', + 'zu', 'mhr', 'mrj', 'hyw', 'hif', 'mni', 'km', 'hak', 'roa-tara', 'sn', + 'bjn', 'pam', 'so', 'nso', 'rue', 'bh', 'tum', 'se', 'myv', 'vls', + 'mi', 'sat', 'nds-nl', 'sc', 'nah', 'vep', 'tk', 'kab', 'gan', 'glk', + 'co', 'fiu-vro', 'kw', 'ab', 'bo', 'ary', 'gv', 'frp', 'skr', 'kv', + 'ug', 'pcd', 'csb', 'udm', 'zea', 'ay', 'mt', 'gn', 'nrm', 'smn', + 'dag', 'lez', 'lfn', 'stq', 'olo', 'lo', 'mwl', 'rw', 'ang', 'fur', + 'rm', 'lad', 'gom', 'koi', 'ext', 'tyv', 'dsb', 'dty', 'ln', 'av', + 'cbk-zam', 'dv', 'ksh', 'pap', 'gag', 'bxr', 'pfl', 'pag', 'pi', 'szy', + 'haw', 'ks', 'awa', 'tay', 'kaa', 'mdf', 'tw', 'za', 'inh', 'krc', + 'xal', 'blk', 'pdc', 'atj', 'to', 'arc', 'tcy', 'kbp', 'mnw', 'jam', + 'na', 'wo', 'kbd', 'nia', 'nov', 'ki', 'lg', 'bi', 'nqo', 'tpi', 'tet', + 'shi', 'jbo', 'roa-rup', 'fj', 'lbe', 'kg', 'xh', 'ty', 'cu', 'guw', + 'srn', 'trv', 'om', 'sm', 'alt', 'gcr', 'chr', 'ltg', 'tn', 'ny', + 'pih', 'mad', 'st', 'got', 'ami', 'bm', 'rmy', 've', 'ts', 'chy', 'rn', + 'ff', 'ak', 'ss', 'iu', 'kcg', 'ch', 'pnt', 'ee', 'ady', 'ik', 'pcm', + 'sg', 'din', 'pwn', 'kl', 'ti', 'dz', 'cr', ] # Sites we want to edit but not count as real languages diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 475987c..ad32bfc 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -30,9 +30,9 @@ 'it', 'en', 'pl', 'ru', 'cs', 'et', 'pt', 'fa', 'uk', 'de', 'fr', 'he', 'es', 'eo', 'tr', 'sk', 'bs', 'ca', 'az', 'fi', 'sl', 'zh', 'lt', 'ar', 'sr', 'bg', 'hy', 'hr', 'el', 'su', 'nn', 'id', 'sv', 'li', 'hu', 'ko', - 'nl', 'sah', 'ja', 'la', 'ta', 'gl', 'gu', 'ur', 'be', 'te', 'vi', - 'cy', 'hi', 'no', 'ml', 'sq', 'ig', 'kn', 'ro', 'eu', 'ku', 'tl', 'uz', - 'ka', 'da', 'bn', 'sa', 'is', 'bcl', 'br', 'mr', 'af', 'th', 'wo', + 'nl', 'sah', 'ja', 'la', 'ta', 'gl', 'gu', 'ur', 'be', 'te', 'hi', + 'ig', 'vi', 'cy', 'no', 'tl', 'ml', 'sq', 'kn', 'ro', 'eu', 'ku', 'uz', + 'bn', 'ka', 'da', 'sa', 'is', 'bcl', 'br', 'mr', 'af', 'th', 'wo', 'ky', ] diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index 9467114..ed111fa 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -26,9 +26,9 @@ languages_by_size = [ 'pl', 'en', 'ru', 'de', 'fr', 'zh', 'he', 'it', 'es', 'uk', 'ar', 'cs', - 'mul', 'gu', 'sr', 'pt', 'fa', 'sv', 'bn', 'hu', 'ko', 'ml', 'ta', + 'mul', 'gu', 'sr', 'pt', 'fa', 'sv', 'bn', 'hu', 'ko', 'ta', 'ml', 'sa', 'te', 'sl', 'tr', 'la', 'hy', 'el', 'vi', 'ja', 'ro', 'fi', - 'nap', 'nl', 'az', 'ca', 'br', 'be', 'kn', 'no', 'hr', 'th', 'id', + 'nap', 'nl', 'az', 'ca', 'be', 'br', 'kn', 'no', 'hr', 'th', 'id', 'eo', 'hi', 'is', 'vec', 'pms', 'ban', 'mr', 'cy', 'da', 'lij', 'et', 'mk', 'as', 'yi', 'bg', 'li', 'wa', 'jv', 'lt', 'pa', 'eu', 'or', 'gl', 'bs', 'sah', 'sk', 'zh-min-nan', 'fo', diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index 7d5a1a3..200f761 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -30,17 +30,17 @@ 'en', 'fr', 'mg', 'zh', 'ru', 'de', 'es', 'sh', 'sv', 'nl', 'el', 'pl', 'ku', 'lt', 'ca', 'it', 'fi', 'ta', 'hu', 'tr', 'ja', 'io', 'hy', 'ko', 'pt', 'kn', 'vi', 'sr', 'th', 'hi', 'ro', 'no', 'id', 'et', 'cs', 'ml', - 'my', 'uz', 'li', 'or', 'eo', 'te', 'fa', 'skr', 'gl', 'ar', 'oc', - 'jv', 'az', 'eu', 'uk', 'br', 'ast', 'is', 'da', 'lo', 'sg', 'simple', - 'bn', 'la', 'hr', 'fj', 'sk', 'tg', 'mnw', 'ky', 'shn', 'bg', 'wa', + 'my', 'uz', 'li', 'or', 'skr', 'eo', 'te', 'fa', 'gl', 'ar', 'oc', + 'jv', 'az', 'eu', 'uk', 'br', 'ast', 'is', 'da', 'sg', 'lo', 'simple', + 'bn', 'la', 'hr', 'fj', 'mnw', 'sk', 'tg', 'shn', 'ky', 'bg', 'wa', 'ur', 'ps', 'cy', 'vo', 'he', 'om', 'sl', 'af', 'zh-min-nan', 'lmo', 'scn', 'tl', 'pa', 'sw', 'fy', 'ms', 'nn', 'ka', 'lv', 'min', 'sq', 'nds', 'lb', 'co', 'mn', 'pnb', 'bs', 'nah', 'yue', 'sa', 'kk', 'km', - 'vec', 'diq', 'be', 'tk', 'mk', 'nia', 'sm', 'hsb', 'ks', 'shy', 'su', + 'vec', 'be', 'diq', 'tk', 'mk', 'nia', 'sm', 'hsb', 'ks', 'shy', 'su', 'gd', 'ga', 'bcl', 'an', 'gom', 'mr', 'wo', 'mni', 'ia', 'ang', 'mt', - 'sd', 'fo', 'tt', 'gn', 'so', 'ie', 'mi', 'csb', 'ug', 'bjn', 'si', + 'sd', 'fo', 'tt', 'gn', 'so', 'ie', 'mi', 'csb', 'bjn', 'ug', 'si', 'st', 'roa-rup', 'ha', 'tpi', 'hif', 'kl', 'guw', 'zu', 'ay', 'jbo', - 'yi', 'ln', 'gu', 'na', 'gv', 'kw', 'am', 'ne', 'rw', 'ts', 'qu', 'ig', + 'yi', 'ln', 'gu', 'na', 'gv', 'kw', 'am', 'ne', 'rw', 'ts', 'ig', 'qu', 'ss', 'iu', 'chr', 'dv', 'ti', 'tn', ] -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/855516 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: I85ef9d4ec43412ea094deca15562b94267b116de Gerrit-Change-Number: 855516 Gerrit-PatchSet: 2 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 5 months

[Gerrit] ...core[master]: [tests] Update github actions

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/855178 ) Change subject: [tests] Update github actions ...................................................................... [tests] Update github actions - Python 12 can be used with actions/setup-python - fix/add concurrency - split is not available for os other than ubuntu Change-Id: Icc95d5458b39cec7af08cd5e4aaec46325ee6d19 --- M .github/workflows/doctest.yml M .github/workflows/login_tests-ci.yml M .github/workflows/oauth_tests-ci.yml M .github/workflows/pywikibot-ci.yml 4 files changed, 12 insertions(+), 36 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml index 34c3aeb..27e3117 100644 --- a/.github/workflows/doctest.yml +++ b/.github/workflows/doctest.yml @@ -1,14 +1,15 @@ -# This workflow will install Python dependencies, run Pywikibot tests -# with a variety of Python versions. For more information see: -# https://docs.github.com/en/actions/automating-builds-and-tests/building-and… - name: Doctest CI +# Run Pywikibot doctests with a variety of Python versions on: push: branches: [ master ] +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + env: PYWIKIBOT_TEST_RUNNING: 1 PYWIKIBOT_USERNAME: Pywikibot-test @@ -26,7 +27,7 @@ os: [ "windows-latest", "macOS-latest", "ubuntu-latest" ] python-version: ["pypy3.7", "3.11", "3.6" ] include: - - python-version: "3.12" + - python-version: "3.12.0-alpha - 3.12.0" os: ubuntu-latest steps: @@ -37,14 +38,6 @@ - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 - if: ${{ matrix.python-version != '3.12' }} - with: - python-version: ${{ matrix.python-version }} - - # use deadsnakes/action until actions/setup-python supports Python 3.12 - - name: Set up development Python ${{ matrix.python-version }} - uses: deadsnakes/action(a)v2.1.1 - if: ${{ matrix.python-version == '3.12' }} with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/login_tests-ci.yml b/.github/workflows/login_tests-ci.yml index c5d1b6d..c1c9d80 100644 --- a/.github/workflows/login_tests-ci.yml +++ b/.github/workflows/login_tests-ci.yml @@ -23,7 +23,7 @@ max-parallel: 1 matrix: - python-version: ["pypy3.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["pypy3.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12.0-alpha - 3.12.0"] site: ['wikipedia:en', 'wikisource:zh'] include: - python-version: 3.6 @@ -46,7 +46,7 @@ site: wikidata:wikidata - python-version: 3.8 site: wowwiki:uk - - python-version: 3.12 + - python-version: "3.12.0-alpha - 3.12.0" site: wikipedia:test - python-version: 3 site: wikipedia:de @@ -60,14 +60,6 @@ - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 - if: ${{ matrix.python-version != '3.12' }} - with: - python-version: ${{ matrix.python-version }} - - # use deadsnakes/action until actions/setup-python supports Python 3.12 - - name: Set up development Python ${{ matrix.python-version }} - uses: deadsnakes/action(a)v2.1.1 - if: ${{ matrix.python-version == '3.12' }} with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/oauth_tests-ci.yml b/.github/workflows/oauth_tests-ci.yml index d04b23d..42d42c7 100644 --- a/.github/workflows/oauth_tests-ci.yml +++ b/.github/workflows/oauth_tests-ci.yml @@ -6,7 +6,7 @@ branches: [ master ] concurrency: - group: ${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true env: @@ -16,7 +16,7 @@ jobs: build: - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + runs-on: ubuntu-latest timeout-minutes: 2 strategy: @@ -24,7 +24,6 @@ max-parallel: 15 matrix: - os: [ "windows-latest", "macOS-latest", "ubuntu-latest" ] python-version: ["pypy3.7", "3.11", "3.10", "3.9", "3.8", "3.7", "3.6"] family: ['wikipedia'] code: ['test'] diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index 5e6f876..cb734b5 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -8,7 +8,7 @@ branches: [ master ] concurrency: - group: ${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true env: @@ -26,7 +26,7 @@ max-parallel: 15 matrix: - python-version: ["pypy3.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["pypy3.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12.0-alpha - 3.12.0"] site: ['wikipedia:en', 'wikisource:zh'] test_prod_only: [true] include: @@ -68,14 +68,6 @@ - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 - if: ${{ matrix.python-version != '3.12' }} - with: - python-version: ${{ matrix.python-version }} - - # use deadsnakes/action until actions/setup-python supports Python 3.12 - - name: Set up development Python ${{ matrix.python-version }} - uses: deadsnakes/action(a)v2.1.1 - if: ${{ matrix.python-version == '3.12' }} with: python-version: ${{ matrix.python-version }} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/855178 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: Icc95d5458b39cec7af08cd5e4aaec46325ee6d19 Gerrit-Change-Number: 855178 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 year, 5 months

[Gerrit] ...core[master]: [test] Improvements for oauth_tests-ci.yml

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/855036 ) Change subject: [test] Improvements for oauth_tests-ci.yml ...................................................................... [test] Improvements for oauth_tests-ci.yml - use PYWIKIBOT_TEST_OAUTH as environment variable instead of OAUTH_TOKEN_<site>_<code> within oauth_tests-ci.yml - update tests/README.rst - always run oauth_tests-ci - cancel job if new job was started - run tests on windows and macOS - use actions/setup-python because 3.12 is available now Change-Id: Ia912326678b0c71fe63574f2347fe8cfb604ff2f --- M .github/workflows/oauth_tests-ci.yml M tests/README.rst M tests/oauth_tests.py 3 files changed, 26 insertions(+), 21 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.github/workflows/oauth_tests-ci.yml b/.github/workflows/oauth_tests-ci.yml index 658ada7..d04b23d 100644 --- a/.github/workflows/oauth_tests-ci.yml +++ b/.github/workflows/oauth_tests-ci.yml @@ -2,16 +2,17 @@ # Run login tests using OAuth on: - workflow_run: - workflows: [ "Pywikibot CI" ] + push: branches: [ master ] - types: - - completed + +concurrency: + group: ${{ github.ref }} + cancel-in-progress: true env: PYWIKIBOT_TEST_RUNNING: 1 - PYWIKIBOT_LOGIN_LOGOUT: 1 PYWIKIBOT_USERNAME: Pywikibot-oauth + PYWIKIBOT_LOGIN_LOGOUT: 1 jobs: build: @@ -20,19 +21,24 @@ strategy: fail-fast: false - max-parallel: 8 + max-parallel: 15 matrix: - python-version: ["pypy3.7", "3.12", "3.11", "3.10", "3.9", "3.8", "3.7", "3.6"] + os: [ "windows-latest", "macOS-latest", "ubuntu-latest" ] + python-version: ["pypy3.7", "3.11", "3.10", "3.9", "3.8", "3.7", "3.6"] family: ['wikipedia'] code: ['test'] domain: ['test.wikipedia.org'] include: + - python-version: "3.12.0-alpha - 3.12.0" + family: wikipedia + code: test + domain: test.wikipedia.org - python-version: 3.6 family: wpbeta code: en domain: en.wikipedia.beta.wmflabs.org - - python-version: 3.11 + - python-version: 3.7 family: wpbeta code: zh domain: zh.wikipedia.beta.wmflabs.org @@ -45,20 +51,12 @@ - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 - if: ${{ matrix.python-version != '3.12' }} with: python-version: ${{ matrix.python-version }} - # use deadsnakes/action until actions/setup-python supports Python 3.12 - - name: Set up development Python ${{ matrix.python-version }} - uses: deadsnakes/action(a)v2.1.1 - if: ${{ matrix.python-version == '3.12' }} - with: - python-version: ${{ matrix.python-version }} - - name: Get token name env: - _oauth_token: OAUTH_TOKEN_${{ matrix.family }}_${{ matrix.code }} + _oauth_token: OAUTH_TOKEN_${{ matrix.family }}_${{ matrix.code }} uses: ASzc/change-string-case-action@v5 id: token with: @@ -100,7 +98,7 @@ - name: Test with unittest timeout-minutes: 1 env: - ${{ steps.token.outputs.uppercase }}: ${{ secrets[format('{0}', steps.token.outputs.uppercase)] }} + PYWIKIBOT_TEST_OAUTH: ${{ secrets[format('{0}', steps.token.outputs.uppercase)] }} run: | python pwb.py version coverage run -m unittest -vv tests/site_login_logout_tests.py diff --git a/tests/README.rst b/tests/README.rst index acc4b21..cd07199 100644 --- a/tests/README.rst +++ b/tests/README.rst @@ -123,6 +123,15 @@ .. note:: test names must be given without subsequent ``_tests``. +**PYWIKIBOT_TEST_OAUTH** + This environment variable holds the Oauth token. It is set by + ``oauth_tests-ci.yml`` CI config file and is solely used by + :mod:`tests.oauth_tests`. You can use it for your private tests. The + environment variabke must contain consumer key and secret and access + key and secret delimited by ``:`` as:: + + PYWIKIBOT_TEST_OAUTH=consumer_key:consumer_secret:access_key:access:secret + **PYWIKIBOT_TEST_RUNNING** This environment variable skips tests instead of raising :exc:`exceptions.MaxlagTimeoutError` when maximum retries attempted due to diff --git a/tests/oauth_tests.py b/tests/oauth_tests.py index 242c126..f66413c 100755 --- a/tests/oauth_tests.py +++ b/tests/oauth_tests.py @@ -26,9 +26,7 @@ def _get_oauth_tokens(self): """Get valid OAuth tokens from environment variables.""" - tokens_env = 'OAUTH_TOKEN_' + self.family.upper() - tokens = os.environ.get(tokens_env + '_' + self.code.upper()) - tokens = tokens or os.environ.get(tokens_env) + tokens = os.environ.get('PYWIKIBOT_TEST_OAUTH') return tuple(tokens.split(':')) if tokens is not None else None def setUp(self): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/855036 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: Ia912326678b0c71fe63574f2347fe8cfb604ff2f Gerrit-Change-Number: 855036 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 5 months

[Gerrit] ...core[master]: [tests] oauth does not have a logout function, no need to restrict pa...

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/854878 ) Change subject: [tests] oauth does not have a logout function, no need to restrict parallel runs ...................................................................... [tests] oauth does not have a logout function, no need to restrict parallel runs Change-Id: Ifffffbacde419d78b06ebd7723290495d6dea79b --- M .github/workflows/oauth_tests-ci.yml 1 file changed, 2 insertions(+), 2 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 e1eadaf..658ada7 100644 --- a/.github/workflows/oauth_tests-ci.yml +++ b/.github/workflows/oauth_tests-ci.yml @@ -20,10 +20,10 @@ strategy: fail-fast: false - max-parallel: 1 + max-parallel: 8 matrix: - python-version: ["pypy3.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["pypy3.7", "3.12", "3.11", "3.10", "3.9", "3.8", "3.7", "3.6"] family: ['wikipedia'] code: ['test'] domain: ['test.wikipedia.org'] -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/854878 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: Ifffffbacde419d78b06ebd7723290495d6dea79b Gerrit-Change-Number: 854878 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

1 year, 5 months

[Gerrit] ...core[master]: [tests] Update CI tests

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/854876 ) Change subject: [tests] Update CI tests ...................................................................... [tests] Update CI tests - add Python 3.12 to the test matrix - remove experimental flag for wikipedia:test site - remove 3.12 test on wikipedia:test due to matrix expansion - increase max-parallel because pypy3.7 tests are faster Change-Id: I6968b2d2452c054624fe622ca5c73fa81c36e62b --- M .github/workflows/pywikibot-ci.yml 1 file changed, 2 insertions(+), 5 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index 7bf3122..5e6f876 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -23,10 +23,10 @@ strategy: fail-fast: false - max-parallel: 11 + max-parallel: 15 matrix: - python-version: ["pypy3.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"] + python-version: ["pypy3.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] site: ['wikipedia:en', 'wikisource:zh'] test_prod_only: [true] include: @@ -46,7 +46,6 @@ - python-version: 3.7 site: wikipedia:test write-test: true - experimental: true - python-version: 3.7 site: wikidata:test - python-version: 3.9 @@ -57,8 +56,6 @@ - python-version: 3.8 site: wowwiki:uk experimental: true - - python-version: 3.12 - site: wikipedia:test - python-version: 3 site: wikipedia:de os: macOS-latest -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/854876 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: I6968b2d2452c054624fe622ca5c73fa81c36e62b Gerrit-Change-Number: 854876 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

1 year, 5 months

[Gerrit] ...core[master]: [doc] Fix version hints

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/854869 ) Change subject: [doc] Fix version hints ...................................................................... [doc] Fix version hints Change-Id: I34402143b7948715e53a8b7cec1f0fc13f7ecff1 --- M pywikibot/site/_siteinfo.py M pywikibot/time.py M pywikibot/tools/__init__.py M pywikibot/tools/itertools.py M scripts/checkimages.py 5 files changed, 14 insertions(+), 14 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/site/_siteinfo.py b/pywikibot/site/_siteinfo.py index 4c1ab93..3e3afac 100644 --- a/pywikibot/site/_siteinfo.py +++ b/pywikibot/site/_siteinfo.py @@ -63,7 +63,7 @@ def clear(self) -> None: """Remove all items from Siteinfo. - .. versionadded: 7.1 + .. versionadded:: 7.1 """ self._cache.clear() diff --git a/pywikibot/time.py b/pywikibot/time.py index 14f5371..cf90546 100644 --- a/pywikibot/time.py +++ b/pywikibot/time.py @@ -79,7 +79,7 @@ - ISO8601 format: YYYY-MM-DD[T ]HH:MM:SS[Z|±HH[MM[SS[.ffffff]]]] - POSIX format: seconds from Unix epoch S{1,13}[.ffffff]] - .. versionadded: 7.5 + .. versionadded:: 7.5 :param ts: Timestamp, datetime.datetime or str :return: Timestamp object @@ -98,7 +98,7 @@ def _from_datetime(dt: datetime.datetime) -> 'Timestamp': """Convert a datetime.datetime timestamp to a Timestamp object. - .. versionadded: 7.5 + .. versionadded:: 7.5 """ return Timestamp(dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second, dt.microsecond, @@ -110,7 +110,7 @@ Mediwiki timestamp format: YYYYMMDDHHMMSS - .. versionadded: 7.5 + .. versionadded:: 7.5 """ RE_MW = r'\d{14}$' # noqa: N806 m = re.match(RE_MW, timestr) @@ -128,7 +128,7 @@ ISO8601 format: - YYYY-MM-DD[T ]HH:MM:SS[[.,]ffffff][Z|±HH[MM[SS[.ffffff]]]] - .. versionadded: 7.5 + .. versionadded:: 7.5 """ RE_ISO8601 = (r'(?:\d{4}-\d{2}-\d{2})(?P<sep>[T ])' # noqa: N806 r'(?:\d{2}:\d{2}:\d{2})(?P<u>[.,]\d{1,6})?' @@ -170,7 +170,7 @@ POSIX format: SECONDS[.ffffff]] - .. versionadded: 7.5 + .. versionadded:: 7.5 """ RE_POSIX = r'(?P<S>-?\d{1,13})(?:\.(?P<u>\d{1,6}))?$' # noqa: N806 m = re.match(RE_POSIX, timestr) @@ -194,7 +194,7 @@ def _from_string(cls: Type['Timestamp'], timestr: str) -> 'Timestamp': """Convert a string to a Timestamp object. - .. versionadded: 7.5 + .. versionadded:: 7.5 """ handlers = [ cls._from_mw, @@ -280,14 +280,14 @@ See Note in datetime.timestamp(). - .. versionadded: 7.5 + .. versionadded:: 7.5 """ return self.replace(tzinfo=datetime.timezone.utc).timestamp() def posix_timestamp_format(self) -> str: """Convert object to a POSIX timestamp format. - .. versionadded: 7.5 + .. versionadded:: 7.5 """ return f'{self.posix_timestamp():.6f}' diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 72ce89b..f59c46e 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -602,7 +602,7 @@ The positional arguments are the dictionaries to be merged. It is also possible to define an additional dict using the keyword arguments. - .. versionadded: 3.0 + .. versionadded:: 3.0 """ args = list(args) + [dict(kwargs)] conflicts = set() @@ -625,7 +625,7 @@ ): """Check file mode and update it, if needed. - .. versionadded: 3.0 + .. versionadded:: 3.0 :param filename: filename path :param mode: requested file mode @@ -654,7 +654,7 @@ Result is expressed as hexdigest(). - .. versionadded: 3.0 + .. versionadded:: 3.0 :param filename: filename path :param sha: hashing function among the following in hashlib: diff --git a/pywikibot/tools/itertools.py b/pywikibot/tools/itertools.py index 7d8547d..50fb740 100644 --- a/pywikibot/tools/itertools.py +++ b/pywikibot/tools/itertools.py @@ -259,7 +259,7 @@ .. warning:: This is not thread safe. - .. versionadded: 3.0 + .. versionadded:: 3.0 :param iterable: the source iterable :type iterable: collections.abc.Iterable diff --git a/scripts/checkimages.py b/scripts/checkimages.py index d0fc38b..49c3985 100755 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -791,7 +791,7 @@ """ Get tuples of image and time, return the most used or oldest image. - .. versionchanged: 7.2 + .. versionchanged:: 7.2 itertools.zip_longest is used to stop `using_pages` as soon as possible. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/854869 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: I34402143b7948715e53a8b7cec1f0fc13f7ecff1 Gerrit-Change-Number: 854869 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 5 months

[Gerrit] ...core[master]: [test] Fix User.usercontribs test

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/854548 ) Change subject: [test] Fix User.usercontribs test ...................................................................... [test] Fix User.usercontribs test Change-Id: I74b74ceaa6066548ad7a5eb413bc21741703b22b --- M tests/user_tests.py 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/user_tests.py b/tests/user_tests.py index 0488dca..81c8443 100755 --- a/tests/user_tests.py +++ b/tests/user_tests.py @@ -173,15 +173,16 @@ def test_contribution(self): """Test the User.usercontribs() method.""" + total = 50 mysite = self.get_site() user = User(mysite, mysite.user()) - uc = list(user.contributions(total=50)) + uc = list(user.contributions(total=total)) if not uc: self.skipTest('User {} has no contributions on site {}.' .format(mysite.user(), mysite)) - self.assertLessEqual(len(uc), 10) + self.assertLessEqual(len(uc), total) self.assertEqual(uc[0], user.last_edit) - first_edit = uc[-1] if len(uc) < 50 else list( + first_edit = uc[-1] if len(uc) < total else list( user.contributions(total=1, reverse=True))[0] self.assertEqual(first_edit, user.first_edit) for contrib in uc: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/854548 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: I74b74ceaa6066548ad7a5eb413bc21741703b22b Gerrit-Change-Number: 854548 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 year, 5 months

[Gerrit] ...core[master]: [test] Run login tests even main tests were no successful

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/854469 ) Change subject: [test] Run login tests even main tests were no successful ...................................................................... [test] Run login tests even main tests were no successful Change-Id: I45400aa8980328b79c4b72cd5eb93fa81630e3ed --- M .github/workflows/login_tests-ci.yml M .github/workflows/oauth_tests-ci.yml 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/login_tests-ci.yml b/.github/workflows/login_tests-ci.yml index f89b920..c5d1b6d 100644 --- a/.github/workflows/login_tests-ci.yml +++ b/.github/workflows/login_tests-ci.yml @@ -16,7 +16,6 @@ jobs: build: runs-on: ${{ matrix.os || 'ubuntu-latest' }} - if: ${{ github.event.workflow_run.conclusion == 'success' }} timeout-minutes: 2 strategy: diff --git a/.github/workflows/oauth_tests-ci.yml b/.github/workflows/oauth_tests-ci.yml index 09dec5f..e1eadaf 100644 --- a/.github/workflows/oauth_tests-ci.yml +++ b/.github/workflows/oauth_tests-ci.yml @@ -16,7 +16,6 @@ jobs: build: runs-on: ${{ matrix.os || 'ubuntu-latest' }} - if: ${{ github.event.workflow_run.conclusion == 'success' }} timeout-minutes: 2 strategy: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/854469 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: I45400aa8980328b79c4b72cd5eb93fa81630e3ed Gerrit-Change-Number: 854469 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

1 year, 5 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits November 2022