Pywikibot-commits June 2025

pywikibot-commits@lists.wikimedia.org

1 participants
97 discussions

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 30 Jun '25

30 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/1164998?usp=email ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I77846635818f4f2bc27cdd761eae7110ea0b9d7f --- M blockpageschecker/tg.json M category/tg.json A cosmetic_changes/ps.json A movepages/tg.json A solve_disambiguation/tg.json A weblinkchecker/tg.json 6 files changed, 39 insertions(+), 2 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/blockpageschecker/tg.json b/blockpageschecker/tg.json index 279a4c8..c1e54d9 100644 --- a/blockpageschecker/tg.json +++ b/blockpageschecker/tg.json @@ -1,8 +1,11 @@ { "@metadata": { "authors": [ + "Farorud", "ToJack" ] }, - "blockpageschecker-deleting": "Бот: Шаблони куҳнашударо ҳазф мекунад" + "blockpageschecker-adding": "Бот: иловаи шаблони муҳофизати саҳифа", + "blockpageschecker-deleting": "Бот: Шаблони куҳнашударо ҳазф мекунад", + "blockpageschecker-modifying": "Бот: Шаблони куҳнашударо тағйир медиҳад" } diff --git a/category/tg.json b/category/tg.json index 5bd8a6c..5b8b999 100644 --- a/category/tg.json +++ b/category/tg.json @@ -1,9 +1,11 @@ { "@metadata": { "authors": [ + "Farorud", "ToJack" ] }, "category-adding": "Бот: Иловаи гурӯҳ [[:Category:%(newcat)s|%(newcat)s]]", - "category-also-in": "(ҳамчунин дар %(alsocat)s)" + "category-also-in": "(ҳамчунин дар %(alsocat)s)", + "category-clean": "Бот: Ҳазфи гурӯҳи %(category)s, ки аллакай ҳаст дар %(child)s" } diff --git a/cosmetic_changes/ps.json b/cosmetic_changes/ps.json new file mode 100644 index 0000000..24bacdf --- /dev/null +++ b/cosmetic_changes/ps.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "شاه زمان پټان" + ] + }, + "cosmetic_changes-standalone": "روباټ: سينگاري بدلونونه" +} diff --git a/movepages/tg.json b/movepages/tg.json new file mode 100644 index 0000000..b27903f --- /dev/null +++ b/movepages/tg.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Farorud" + ] + }, + "movepages-moving": "Бот: кӯчониши саҳифа" +} diff --git a/solve_disambiguation/tg.json b/solve_disambiguation/tg.json new file mode 100644 index 0000000..63ea12c --- /dev/null +++ b/solve_disambiguation/tg.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Farorud" + ] + }, + "solve_disambiguation-unknown-page": "(номаълум)" +} diff --git a/weblinkchecker/tg.json b/weblinkchecker/tg.json new file mode 100644 index 0000000..3e117d0 --- /dev/null +++ b/weblinkchecker/tg.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Farorud" + ] + }, + "weblinkchecker-caption": "Пайванди дастнорас" +} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/1164998?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/i18n Gerrit-Branch: master Gerrit-Change-Id: I77846635818f4f2bc27cdd761eae7110ea0b9d7f Gerrit-Change-Number: 1164998 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

1 0

[Gerrit] ...core[master]: Test: set threshold for cyclomatic complexity to 50
by jenkins-bot (Code Review) 29 Jun '25

29 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1164670?usp=email ) Change subject: Test: set threshold for cyclomatic complexity to 50 ...................................................................... Test: set threshold for cyclomatic complexity to 50 The threshold can be described with the following values: 1-5: low risk - No action needed. 6-15: medium risk - Review and monitor. 16-25: high risk - Review and refactor. Recommended to add comments if the function is absolutely needed to be kept as it is. 26-50: very-high risk - Refactor to reduce the complexity. >50: critical risk - Must refactor this. This can make the code untestable and very difficult to understand. n.b. there are 24 issues with threshold of 25. Change-Id: Ia96900950580dee6ec8fbeec13c46df6ef294390 --- M scripts/replace.py M tox.ini 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/replace.py b/scripts/replace.py index c771be0..7414bfc 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -161,7 +161,7 @@ the top of the help. """ # -# (C) Pywikibot team, 2004-2024 +# (C) Pywikibot team, 2004-2025 # # Distributed under the terms of the MIT license. # @@ -910,7 +910,7 @@ return pagegenerators.MySQLPageGenerator(sql) -def main(*args: str) -> None: # noqa: C901 +def main(*args: str) -> None: """Process command line arguments and invoke bot. If args is an empty list, sys.argv is used. diff --git a/tox.ini b/tox.ini index de53fd6..0c859e3 100644 --- a/tox.ini +++ b/tox.ini @@ -131,7 +131,7 @@ exclude = .tox,.git,./*.egg,build,./scripts/i18n/* color = always format = %(blue)s%(path)s%(reset)s: %(bold)sline %(row)d:%(reset)s%(col)d: %(bold)s%(red)s%(code)s%(reset)s %(text)s -max-complexity = 49 +max-complexity = 50 max-doc-length = 79 # The following are to be fixed -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1164670?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: Ia96900950580dee6ec8fbeec13c46df6ef294390 Gerrit-Change-Number: 1164670 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: IMPR: use items() to iterate over bib_source dictionary
by jenkins-bot (Code Review) 29 Jun '25

29 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1164664?usp=email ) Change subject: IMPR: use items() to iterate over bib_source dictionary ...................................................................... IMPR: use items() to iterate over bib_source dictionary Change-Id: I5a6d1fe2da991a996ee5708713e04248192403b0 --- M scripts/create_isbn_edition.py 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/create_isbn_edition.py b/scripts/create_isbn_edition.py index c435a54..a042a99 100755 --- a/scripts/create_isbn_edition.py +++ b/scripts/create_isbn_edition.py @@ -1596,10 +1596,9 @@ mainlang = bib_source[booklib][2] else: # Unknown bib reference - show implemented codes - for seq in bib_source: + for seq, ref in bib_source.items(): pywikibot.info( - f'{seq.ljust(10)}{bib_source[seq][2].ljust(4)}' - f'{bib_source[seq][3].ljust(20)}{bib_source[seq][1]}' + f'{seq.ljust(10)}{ref[2].ljust(4)}{ref[3].ljust(20)}{ref[1]}' ) fatal_error(3, f'Unknown Digital library ({REFPROP}) {booklib}') -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1164664?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: I5a6d1fe2da991a996ee5708713e04248192403b0 Gerrit-Change-Number: 1164664 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: fix: adjust comment in yml files
by Xqt (Code Review) 29 Jun '25

29 Jun '25

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1164662?usp=email ) Change subject: fix: adjust comment in yml files ...................................................................... fix: adjust comment in yml files Change-Id: If3f6a05346b4389567bb3cbe47ee8f3e4dd5c006 --- 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, 4 insertions(+), 4 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml index 6e2f854..dee414e 100644 --- a/.github/workflows/doctest.yml +++ b/.github/workflows/doctest.yml @@ -38,7 +38,7 @@ with: python-version: ${{ matrix.python-version }} - # use deadsnakes/action for development releases + # use deadsnakes/action for development releases - name: Set up development Python ${{ matrix.python-version }} uses: deadsnakes/action(a)v3.2.0 if: endsWith(matrix.python-version, '-dev') diff --git a/.github/workflows/login_tests-ci.yml b/.github/workflows/login_tests-ci.yml index 9ce854b..f167462 100644 --- a/.github/workflows/login_tests-ci.yml +++ b/.github/workflows/login_tests-ci.yml @@ -61,7 +61,7 @@ with: python-version: ${{ matrix.python-version }} - # use deadsnakes/action for development releases + # use deadsnakes/action for development releases - name: Set up development Python ${{ matrix.python-version }} uses: deadsnakes/action(a)v3.2.0 if: endsWith(matrix.python-version, '-dev') diff --git a/.github/workflows/oauth_tests-ci.yml b/.github/workflows/oauth_tests-ci.yml index 2006ca0..8fe4cd8 100644 --- a/.github/workflows/oauth_tests-ci.yml +++ b/.github/workflows/oauth_tests-ci.yml @@ -46,7 +46,7 @@ with: python-version: ${{ matrix.python-version }} - # use deadsnakes/action for development releases + # use deadsnakes/action for development releases - name: Set up development Python ${{ matrix.python-version }} uses: deadsnakes/action(a)v3.2.0 if: endsWith(matrix.python-version, '-dev') diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index 847ec66..6130c33 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -82,7 +82,7 @@ with: python-version: ${{ matrix.python-version }} - # use deadsnakes/action for development releases + # use deadsnakes/action for development releases - name: Set up development Python ${{ matrix.python-version }} uses: deadsnakes/action(a)v3.2.0 if: endsWith(matrix.python-version, '-dev') -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1164662?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: If3f6a05346b4389567bb3cbe47ee8f3e4dd5c006 Gerrit-Change-Number: 1164662 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de>

1 0

[Gerrit] ...core[master]: fix: fix yaml format using yamlfix
by jenkins-bot (Code Review) 29 Jun '25

29 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1164660?usp=email ) Change subject: fix: fix yaml format using yamlfix ...................................................................... fix: fix yaml format using yamlfix Change-Id: I119d17464540a0d25d8fffd872a10dc447df2544 --- M .codecov.yml M .github/workflows/doctest.yml M .github/workflows/login_tests-ci.yml M .github/workflows/oauth_tests-ci.yml M .github/workflows/pre-commit.yml M .github/workflows/pywikibot-ci.yml M .github/workflows/sysop_write_tests-ci.yml M .github/workflows/windows_tests.yml M .pre-commit-config.yaml 9 files changed, 415 insertions(+), 467 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.codecov.yml b/.codecov.yml index 0835193..322dcd0 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -1,3 +1,4 @@ +--- codecov: bot: jayvdb max_report_age: 48 @@ -10,14 +11,13 @@ status: project: default: - enabled: yes + enabled: true patch: default: - enabled: yes + enabled: true changes: default: - enabled: yes - + enabled: true ignore: - Users - pywikibot/daemonize.py @@ -28,7 +28,6 @@ - scripts/maintenance/make_i18n_dict.py - scripts/userscripts/ - tests/pwb/ - notify: irc: default: @@ -36,7 +35,6 @@ channel: pywikibot component_management: - individual_components: - component_id: Framework paths: diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml index ecfe729..6e2f854 100644 --- a/.github/workflows/doctest.yml +++ b/.github/workflows/doctest.yml @@ -1,9 +1,10 @@ -name: Doctest CI +--- # Run Pywikibot doctests with a variety of Python versions +name: Doctest CI on: push: - branches: [ master ] + branches: [master] concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -17,67 +18,58 @@ build: runs-on: ${{ matrix.os || 'ubuntu-latest' }} timeout-minutes: 10 - strategy: 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" ] - os: [ windows-latest, macOS-latest, ubuntu-latest ] + python-version: [pypy3.8, pypy3.10, '3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] + os: ['windows-latest', 'macOS-latest', 'ubuntu-latest'] include: - python-version: 3.14-dev - python-version: 3.15-dev - steps: - - name: Checkout Repository - uses: actions/checkout@v4 - with: - submodules: true - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - if: "!endsWith(matrix.python-version, '-dev')" - with: - python-version: ${{ matrix.python-version }} + - name: Checkout Repository + uses: actions/checkout@v4 + with: + submodules: true + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + if: "!endsWith(matrix.python-version, '-dev')" + with: + python-version: ${{ matrix.python-version }} # use deadsnakes/action for development releases - - name: Set up development Python ${{ matrix.python-version }} - uses: deadsnakes/action(a)v3.2.0 - if: endsWith(matrix.python-version, '-dev') - with: - python-version: ${{ matrix.python-version }} - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip --version - pip install "coverage == 7.6.1; python_version < '3.9'" - pip install "coverage >= 7.6.10; python_version > '3.8'" - pip install "tomli; python_version < '3.11'" - pip install mwparserfromhell - pip install packaging - pip install "PyMySQL >= 1.0.0" - pip install pytest - pip install requests-sse - pip install wikitextparser - - - name: Generate user files - run: | - python -Werror::UserWarning -m pwb generate_user_files -site:wikipedia:test -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; - - - name: doctest with pytest - timeout-minutes: 5 - run: | - python pwb.py version - pytest --version - coverage run -m pytest pywikibot --doctest-modules --ignore-glob="*gui.py" --ignore-glob="*memento.py" - - - name: Show coverage statistics - run: | - coverage report - - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v5 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + - name: Set up development Python ${{ matrix.python-version }} + uses: deadsnakes/action(a)v3.2.0 + if: endsWith(matrix.python-version, '-dev') + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip --version + pip install "coverage == 7.6.1; python_version < '3.9'" + pip install "coverage >= 7.6.10; python_version > '3.8'" + pip install "tomli; python_version < '3.11'" + pip install mwparserfromhell + pip install packaging + pip install "PyMySQL >= 1.0.0" + pip install pytest + pip install requests-sse + pip install wikitextparser + - name: Generate user files + run: | + python -Werror::UserWarning -m pwb generate_user_files -site:wikipedia:test -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; + - name: doctest with pytest + timeout-minutes: 5 + run: | + python pwb.py version + pytest --version + coverage run -m pytest pywikibot --doctest-modules --ignore-glob="*gui.py" --ignore-glob="*memento.py" + - name: Show coverage statistics + run: | + coverage report + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v5 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/login_tests-ci.yml b/.github/workflows/login_tests-ci.yml index bcda450..9ce854b 100644 --- a/.github/workflows/login_tests-ci.yml +++ b/.github/workflows/login_tests-ci.yml @@ -1,10 +1,11 @@ -name: Login CI +--- # Run login/logout tests +name: Login CI on: workflow_run: - workflows: [ Pywikibot CI ] - branches: [ master ] + workflows: [Pywikibot CI] + branches: [master] types: - completed @@ -17,111 +18,101 @@ build: runs-on: ${{ matrix.os || 'ubuntu-latest' }} timeout-minutes: 30 - strategy: 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] - site: [ "wikipedia:en", "wikisource:zh", "wikipedia:test" ] + python-version: [pypy3.8, pypy3.10, '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 3.14-dev, 3.15-dev] + site: ['wikipedia:en', 'wikisource:zh', 'wikipedia:test'] include: - - python-version: "3.8" - site: False + - python-version: '3.8' + site: false family: wpbeta code: en os: ubuntu-22.04 - - python-version: "3.8" - site: False + - python-version: '3.8' + site: false family: wpbeta code: zh os: ubuntu-22.04 - - python-version: "3.9" + - python-version: '3.9' site: wsbeta:en - - python-version: "3.8" + - python-version: '3.8' site: wikidata:test os: ubuntu-22.04 - - python-version: "3.10" + - python-version: '3.10' site: wiktionary:ar - - python-version: "3.8" + - python-version: '3.8' site: wikidata:wikidata os: ubuntu-22.04 - - python-version: "3.9" + - python-version: '3.9' site: wowwiki:uk - python-version: 3 site: wikipedia:de os: macOS-latest - steps: - - name: Checkout Repository - uses: actions/checkout@v4 - with: - submodules: true - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - if: "!endsWith(matrix.python-version, '-dev')" - with: - python-version: ${{ matrix.python-version }} + - name: Checkout Repository + uses: actions/checkout@v4 + with: + submodules: true + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + if: "!endsWith(matrix.python-version, '-dev')" + with: + python-version: ${{ matrix.python-version }} # use deadsnakes/action for development releases - - name: Set up development Python ${{ matrix.python-version }} - uses: deadsnakes/action(a)v3.2.0 - if: "endsWith(matrix.python-version, '-dev')" - with: - python-version: ${{ matrix.python-version }} - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip --version - pip install "coverage == 7.6.1; python_version < '3.9'" - pip install "coverage >= 7.6.10; python_version > '3.8'" - pip install "tomli; python_version < '3.11'" - pip install mwparserfromhell - pip install packaging - pip install requests - - - name: Generate family files - run: | + - name: Set up development Python ${{ matrix.python-version }} + uses: deadsnakes/action(a)v3.2.0 + if: endsWith(matrix.python-version, '-dev') + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip --version + pip install "coverage == 7.6.1; python_version < '3.9'" + pip install "coverage >= 7.6.10; python_version > '3.8'" + pip install "tomli; python_version < '3.11'" + pip install mwparserfromhell + pip install packaging + pip install requests + - name: Generate family files + run: | if [ ${{matrix.family || 0}} == wpbeta ]; then python pwb.py generate_family_file http://${{matrix.code}}.wikipedia.beta.wmflabs.org/ wpbeta y fi if [ ${{matrix.site || 0}} == 'wsbeta:en' ]; then python pwb.py generate_family_file http://en.wikisource.beta.wmflabs.org/ wsbeta y fi - - - name: Generate user files - run: | - if [ ${{matrix.site}} != false ]; then - python -Werror::UserWarning -m pwb generate_user_files -site:${{matrix.site}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; - else - python -Werror::UserWarning -m pwb generate_user_files -family:${{matrix.family}} -lang:${{matrix.code}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; - fi - echo "usernames['wikipedia']['en'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "usernames['wikisource']['zh'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "usernames['wikipedia']['test'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "usernames['wikidata']['test'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "usernames['commons']['commons'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "usernames['meta']['meta'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "noisysleep = float('inf')" >> user-config.py - echo "maximum_GET_length = 5000" >> user-config.py - echo "console_encoding = 'utf8'" >> user-config.py - echo "import os" >> user-config.py - echo "password_file = os.path.expanduser('passwordfile')" >> user-config.py - echo "('${{ env.PYWIKIBOT_USERNAME }}', '${{ secrets.PYWIKIBOT_USERPWD }}')" > passwordfile - - - name: Login test with unittest - timeout-minutes: 2 - run: | - python pwb.py version - coverage run -m unittest -vv tests/site_login_logout_tests.py - - - name: Show coverage statistics - run: | - coverage report - - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v5 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + - name: Generate user files + run: | + if [ ${{matrix.site}} != false ]; then + python -Werror::UserWarning -m pwb generate_user_files -site:${{matrix.site}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; + else + python -Werror::UserWarning -m pwb generate_user_files -family:${{matrix.family}} -lang:${{matrix.code}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; + fi + echo "usernames['wikipedia']['en'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "usernames['wikisource']['zh'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "usernames['wikipedia']['test'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "usernames['wikidata']['test'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "usernames['commons']['commons'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "usernames['meta']['meta'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "noisysleep = float('inf')" >> user-config.py + echo "maximum_GET_length = 5000" >> user-config.py + echo "console_encoding = 'utf8'" >> user-config.py + echo "import os" >> user-config.py + echo "password_file = os.path.expanduser('passwordfile')" >> user-config.py + echo "('${{ env.PYWIKIBOT_USERNAME }}', '${{ secrets.PYWIKIBOT_USERPWD }}')" > passwordfile + - name: Login test with unittest + timeout-minutes: 2 + run: | + python pwb.py version + coverage run -m unittest -vv tests/site_login_logout_tests.py + - name: Show coverage statistics + run: | + coverage report + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v5 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/oauth_tests-ci.yml b/.github/workflows/oauth_tests-ci.yml index 122d48c..2006ca0 100644 --- a/.github/workflows/oauth_tests-ci.yml +++ b/.github/workflows/oauth_tests-ci.yml @@ -1,9 +1,10 @@ -name: Oauth CI +--- # Run login tests using OAuth and non-sysop tests on test wiki +name: Oauth CI on: push: - branches: [ master ] + branches: [master] concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -18,103 +19,91 @@ runs-on: ${{ matrix.os || 'ubuntu-latest' }} continue-on-error: ${{ matrix.experimental || false }} timeout-minutes: 5 - 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 ] - family: [ wikipedia ] - code: [ test ] - domain: [ test.wikipedia.org ] + python-version: [pypy3.8, pypy3.10, '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 3.14-dev, 3.15-dev] + family: [wikipedia] + code: [test] + domain: [test.wikipedia.org] include: - - python-version: "3.8" + - python-version: '3.8' family: wpbeta code: en domain: en.wikipedia.beta.wmflabs.org - - python-version: "3.8" + - python-version: '3.8' family: wpbeta code: zh domain: zh.wikipedia.beta.wmflabs.org - steps: - - name: Checkout Repository - uses: actions/checkout@v4 - with: - submodules: true - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - if: "!endsWith(matrix.python-version, '-dev')" - with: - python-version: ${{ matrix.python-version }} + - name: Checkout Repository + uses: actions/checkout@v4 + with: + submodules: true + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + if: "!endsWith(matrix.python-version, '-dev')" + with: + python-version: ${{ matrix.python-version }} # use deadsnakes/action for development releases - - name: Set up development Python ${{ matrix.python-version }} - uses: deadsnakes/action(a)v3.2.0 - if: endsWith(matrix.python-version, '-dev') - with: - python-version: ${{ matrix.python-version }} - - - name: Get token name - env: - _oauth_token: OAUTH_TOKEN_${{ matrix.family }}_${{ matrix.code }} - uses: ASzc/change-string-case-action@v6 - id: token - with: - string: ${{ env._oauth_token }} - - - name: Split OAuth Token - uses: jungwinter/split@v2 - id: split - with: - msg: ${{ secrets[format('{0}', steps.token.outputs.uppercase)] }} - separator: ":" - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip --version - pip install "coverage == 7.6.1; python_version < '3.9'" - pip install "coverage >= 7.6.10; python_version > '3.8'" - # tomli required for coverage due to T380697 - pip install "tomli; python_version < '3.11'" - pip install mwparserfromhell - # PyJWT added due to T380270 - pip install "PyJWT != 2.10.0, != 2.10.1 ; python_version > '3.8'" - pip install mwoauth - pip install packaging - pip install requests - - - name: Generate family files - if: ${{ matrix.family == 'wpbeta' }} - run: | - python pwb.py generate_family_file http://${{matrix.code}}.wikipedia.beta.wmflabs.org/ wpbeta y - - - name: Generate user files - run: | - python -Werror::UserWarning -m pwb generate_user_files -family:${{matrix.family}} -lang:${{matrix.code}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; - echo "usernames['commons']['beta'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "authenticate['${{ matrix.domain }}'] = ('${{ steps.split.outputs._0 }}', '${{ steps.split.outputs._1 }}', '${{ steps.split.outputs._2 }}', '${{ steps.split.outputs._3 }}')" >> user-config.py - echo "noisysleep = float('inf')" >> user-config.py - echo "maximum_GET_length = 5000" >> user-config.py - echo "console_encoding = 'utf8'" >> user-config.py - - - name: Oauth tests with unittest - timeout-minutes: 2 - env: - PYWIKIBOT_TEST_WRITE: 1 - PYWIKIBOT_TEST_OAUTH: ${{ secrets[format('{0}', steps.token.outputs.uppercase)] }} - PYWIKIBOT_TEST_MODULES: edit_failure,file,oauth - run: | - python pwb.py version - coverage run -m unittest -vv - - - name: Show coverage statistics - run: | - coverage report - - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v5 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + - name: Set up development Python ${{ matrix.python-version }} + uses: deadsnakes/action(a)v3.2.0 + if: endsWith(matrix.python-version, '-dev') + with: + python-version: ${{ matrix.python-version }} + - name: Get token name + env: + _oauth_token: OAUTH_TOKEN_${{ matrix.family }}_${{ matrix.code }} + uses: ASzc/change-string-case-action@v6 + id: token + with: + string: ${{ env._oauth_token }} + - name: Split OAuth Token + uses: jungwinter/split@v2 + id: split + with: + msg: ${{ secrets[format('{0}', steps.token.outputs.uppercase)] }} + separator: ':' + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip --version + pip install "coverage == 7.6.1; python_version < '3.9'" + pip install "coverage >= 7.6.10; python_version > '3.8'" + # tomli required for coverage due to T380697 + pip install "tomli; python_version < '3.11'" + pip install mwparserfromhell + # PyJWT added due to T380270 + pip install "PyJWT != 2.10.0, != 2.10.1 ; python_version > '3.8'" + pip install mwoauth + pip install packaging + pip install requests + - name: Generate family files + if: ${{ matrix.family == 'wpbeta' }} + run: | + python pwb.py generate_family_file http://${{matrix.code}}.wikipedia.beta.wmflabs.org/ wpbeta y + - name: Generate user files + run: | + python -Werror::UserWarning -m pwb generate_user_files -family:${{matrix.family}} -lang:${{matrix.code}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; + echo "usernames['commons']['beta'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "authenticate['${{ matrix.domain }}'] = ('${{ steps.split.outputs._0 }}', '${{ steps.split.outputs._1 }}', '${{ steps.split.outputs._2 }}', '${{ steps.split.outputs._3 }}')" >> user-config.py + echo "noisysleep = float('inf')" >> user-config.py + echo "maximum_GET_length = 5000" >> user-config.py + echo "console_encoding = 'utf8'" >> user-config.py + - name: Oauth tests with unittest + timeout-minutes: 2 + env: + PYWIKIBOT_TEST_WRITE: 1 + PYWIKIBOT_TEST_OAUTH: ${{ secrets[format('{0}', steps.token.outputs.uppercase)] }} + PYWIKIBOT_TEST_MODULES: edit_failure,file,oauth + run: | + python pwb.py version + coverage run -m unittest -vv + - name: Show coverage statistics + run: | + coverage report + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v5 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 5237b1b..cc99546 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -1,15 +1,20 @@ +--- name: pre-commit + on: push: branches: - master - stable + concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true + env: PYWIKIBOT_TEST_RUNNING: 1 PYWIKIBOT_NO_USER_CONFIG: 2 + jobs: pre-commit: runs-on: ubuntu-latest @@ -17,9 +22,9 @@ fail-fast: false matrix: python-version: - - "3.13" - - "3.14-dev" - - "3.15-dev" + - '3.13' + - 3.14-dev + - 3.15-dev steps: - name: set up python ${{ matrix.python-version }} if: "!endsWith(matrix.python-version, '-dev')" @@ -27,7 +32,7 @@ with: python-version: ${{ matrix.python-version }} - name: set up development python ${{ matrix.python-version }} - if: "endsWith(matrix.python-version, '-dev')" + if: endsWith(matrix.python-version, '-dev') uses: deadsnakes/action(a)v3.2.0 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index b88463d..847ec66 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -1,11 +1,12 @@ -name: Pywikibot CI +--- # Run Pywikibot tests with a variety of Python versions +name: Pywikibot CI on: push: - branches: [ master, stable ] + branches: [master, stable] pull_request: - branches: [ master ] + branches: [master] concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -20,37 +21,35 @@ runs-on: ${{ matrix.os || 'ubuntu-latest' }} continue-on-error: ${{ matrix.experimental || false }} timeout-minutes: 100 - strategy: fail-fast: false max-parallel: 19 - matrix: - python-version: [ pypy3.10, "3.8", "3.9", "3.10", "3.11", "3.12", "3.13" ] - site: [ "wikipedia:en", "wikisource:zh" ] + python-version: [pypy3.10, '3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] + site: ['wikipedia:en', 'wikisource:zh'] include: - - python-version: "3.8" + - python-version: '3.8' site: wikipedia:test - - python-version: "3.8" - site: False + - python-version: '3.8' + site: false family: wpbeta code: en - - python-version: "3.8" - site: False + - python-version: '3.8' + site: false family: wpbeta code: zh - - python-version: "3.9" + - python-version: '3.9' site: wsbeta:en - - python-version: "3.8" + - python-version: '3.8' site: wikidata:test - - python-version: "3.10" + - python-version: '3.10' site: wiktionary:ar test_no_rc: true - - python-version: "3.8" + - python-version: '3.8' site: wikidata:wikidata - - python-version: "3.9" + - python-version: '3.9' site: wowwiki:uk - - python-version: "3" + - python-version: '3' site: wikipedia:de os: macOS-latest # ubuntu-22.04 required for pypy3.8 and 3.14-dev due to T382214 @@ -73,89 +72,79 @@ site: wikisource:zh os: ubuntu-22.04 steps: - - name: Checkout Repository - uses: actions/checkout@v4 - with: - submodules: true - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - if: "!endsWith(matrix.python-version, '-dev')" - with: - python-version: ${{ matrix.python-version }} + - name: Checkout Repository + uses: actions/checkout@v4 + with: + submodules: true + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + if: "!endsWith(matrix.python-version, '-dev')" + with: + python-version: ${{ matrix.python-version }} # use deadsnakes/action for development releases - - name: Set up development Python ${{ matrix.python-version }} - uses: deadsnakes/action(a)v3.2.0 - if: endsWith(matrix.python-version, '-dev') - with: - python-version: ${{ matrix.python-version }} - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip --version - if [ -f dev-requirements.txt ]; then pip install -r dev-requirements.txt; fi - if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - pip install wikitextparser - - - name: Install setuptools - if: ${{ (matrix.python-version >= '3.12') || (matrix.os == 'macOS-latest') }} - run: pip install setuptools - - - name: Generate family files - run: | + - name: Set up development Python ${{ matrix.python-version }} + uses: deadsnakes/action(a)v3.2.0 + if: endsWith(matrix.python-version, '-dev') + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip --version + if [ -f dev-requirements.txt ]; then pip install -r dev-requirements.txt; fi + if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + pip install wikitextparser + - name: Install setuptools + if: ${{ (matrix.python-version >= '3.12') || (matrix.os == 'macOS-latest') }} + run: pip install setuptools + - name: Generate family files + run: | if [ ${{matrix.family || 0}} == wpbeta ]; then python pwb.py generate_family_file http://${{matrix.code}}.wikipedia.beta.wmflabs.org/ wpbeta y fi if [ ${{matrix.site || 0}} == 'wsbeta:en' ]; then python pwb.py generate_family_file http://en.wikisource.beta.wmflabs.org/ wsbeta y fi - - - name: Generate user files - run: | - if [ ${{matrix.site}} != false ]; then - python -Werror::UserWarning -m pwb generate_user_files -site:${{matrix.site}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; - else - python -Werror::UserWarning -m pwb generate_user_files -family:${{matrix.family}} -lang:${{matrix.code}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; - fi - echo "usernames['wikipedia']['en'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "usernames['wikisource']['zh'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "usernames['wikipedia']['test'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "usernames['wikidata']['test'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "usernames['commons']['commons'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "usernames['meta']['meta'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "noisysleep = float('inf')" >> user-config.py - echo "maximum_GET_length = 5000" >> user-config.py - echo "console_encoding = 'utf8'" >> user-config.py - echo "import os" >> user-config.py - echo "password_file = os.path.expanduser('passwordfile')" >> user-config.py - echo "('${{ env.PYWIKIBOT_USERNAME }}', '${{ secrets.PYWIKIBOT_USERPWD }}')" > passwordfile - - - name: Test with unittest or pytest - id: ci_test - continue-on-error: true - timeout-minutes: 90 - env: - PYWIKIBOT_TEST_NO_RC: - ${{ (matrix.site == 'wikisource:zh' || matrix.test_no_rc) && 1 || 0 }} - run: | - python pwb.py version - if [ ${{matrix.site || 0}} != 'wikisource:zh' ]; then - coverage run -m unittest discover -vv -p \"*_tests.py\"; - else - coverage run -m pytest - fi - - - name: Show coverage statistics - run: | - coverage report - - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v5 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - - name: Check on failure - if: steps.ci_test.outcome == 'failure' - run: exit 1 + - name: Generate user files + run: | + if [ ${{matrix.site}} != false ]; then + python -Werror::UserWarning -m pwb generate_user_files -site:${{matrix.site}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; + else + python -Werror::UserWarning -m pwb generate_user_files -family:${{matrix.family}} -lang:${{matrix.code}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; + fi + echo "usernames['wikipedia']['en'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "usernames['wikisource']['zh'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "usernames['wikipedia']['test'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "usernames['wikidata']['test'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "usernames['commons']['commons'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "usernames['meta']['meta'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "noisysleep = float('inf')" >> user-config.py + echo "maximum_GET_length = 5000" >> user-config.py + echo "console_encoding = 'utf8'" >> user-config.py + echo "import os" >> user-config.py + echo "password_file = os.path.expanduser('passwordfile')" >> user-config.py + echo "('${{ env.PYWIKIBOT_USERNAME }}', '${{ secrets.PYWIKIBOT_USERPWD }}')" > passwordfile + - name: Test with unittest or pytest + id: ci_test + continue-on-error: true + timeout-minutes: 90 + env: + PYWIKIBOT_TEST_NO_RC: ${{ (matrix.site == 'wikisource:zh' || matrix.test_no_rc) && 1 || 0 }} + run: | + python pwb.py version + if [ ${{matrix.site || 0}} != 'wikisource:zh' ]; then + coverage run -m unittest discover -vv -p \"*_tests.py\"; + else + coverage run -m pytest + fi + - name: Show coverage statistics + run: | + coverage report + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v5 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + - name: Check on failure + if: steps.ci_test.outcome == 'failure' + run: exit 1 diff --git a/.github/workflows/sysop_write_tests-ci.yml b/.github/workflows/sysop_write_tests-ci.yml index 55aaa96..a08b124 100644 --- a/.github/workflows/sysop_write_tests-ci.yml +++ b/.github/workflows/sysop_write_tests-ci.yml @@ -1,9 +1,10 @@ -name: Sysop write test CI +--- # Run Pywikibot write tests on test wiki using sysop rights +name: Sysop write test CI on: push: - branches: [ master ] + branches: [master] concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -18,64 +19,54 @@ runs-on: ubuntu-latest continue-on-error: ${{ matrix.experimental || false }} timeout-minutes: 100 - strategy: fail-fast: false - matrix: - python-version: [ "3.8" ] - site: [ "wikipedia:test" ] - attr: [ write and not rights, write and rights, rights and not write ] - + python-version: ['3.8'] + site: ['wikipedia:test'] + attr: [write and not rights, write and rights, rights and not write] steps: - - name: Checkout Repository - uses: actions/checkout@v4 - with: - submodules: true - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip --version - if [ -f dev-requirements.txt ]; then pip install -r dev-requirements.txt; fi - if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - - - name: Generate user files - run: | - python -Werror::UserWarning -m pwb generate_user_files -site:${{matrix.site}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; - echo "usernames['wikipedia']['test'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "usernames['wikidata']['test'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "noisysleep = float('inf')" >> user-config.py - echo "maximum_GET_length = 5000" >> user-config.py - echo "console_encoding = 'utf8'" >> user-config.py - echo "import os" >> user-config.py - echo "password_file = os.path.expanduser('passwordfile')" >> user-config.py - echo "('${{ env.PYWIKIBOT_USERNAME }}', '${{ secrets.PYWIKIBOT_USERPWD }}')" > passwordfile - - - name: Sysop and write tests with pytest - id: ci_test - continue-on-error: true - timeout-minutes: 90 - env: - PYWIKIBOT_TEST_WRITE: ${{ matrix.site == 'wikipedia:test' && 1 || 0 }} - run: | - python pwb.py version - coverage run -m pytest -s -r A -a "${{ matrix.attr }}" - - - name: Show coverage statistics - run: | - coverage report - - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v5 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - - name: Check on failure - if: steps.ci_test.outcome == 'failure' - run: exit 1 + - name: Checkout Repository + uses: actions/checkout@v4 + with: + submodules: true + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip --version + if [ -f dev-requirements.txt ]; then pip install -r dev-requirements.txt; fi + if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + - name: Generate user files + run: | + python -Werror::UserWarning -m pwb generate_user_files -site:${{matrix.site}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; + echo "usernames['wikipedia']['test'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "usernames['wikidata']['test'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "noisysleep = float('inf')" >> user-config.py + echo "maximum_GET_length = 5000" >> user-config.py + echo "console_encoding = 'utf8'" >> user-config.py + echo "import os" >> user-config.py + echo "password_file = os.path.expanduser('passwordfile')" >> user-config.py + echo "('${{ env.PYWIKIBOT_USERNAME }}', '${{ secrets.PYWIKIBOT_USERPWD }}')" > passwordfile + - name: Sysop and write tests with pytest + id: ci_test + continue-on-error: true + timeout-minutes: 90 + env: + PYWIKIBOT_TEST_WRITE: ${{ matrix.site == 'wikipedia:test' && 1 || 0 }} + run: | + python pwb.py version + coverage run -m pytest -s -r A -a "${{ matrix.attr }}" + - name: Show coverage statistics + run: | + coverage report + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v5 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + - name: Check on failure + if: steps.ci_test.outcome == 'failure' + run: exit 1 diff --git a/.github/workflows/windows_tests.yml b/.github/workflows/windows_tests.yml index 35e512c..13a2405 100644 --- a/.github/workflows/windows_tests.yml +++ b/.github/workflows/windows_tests.yml @@ -1,9 +1,10 @@ -name: Windows Tests +--- # Successor for Appveyor Tests +name: Windows Tests on: push: - branches: [ master ] + branches: [master] concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -18,77 +19,67 @@ runs-on: windows-latest continue-on-error: ${{ matrix.experimental || false }} timeout-minutes: 100 - strategy: fail-fast: false - matrix: - python-version: [ 3.8.0, "3.8", "3.9", "3.10", "3.11", "3.12", "3.13" ] - python-arch: [ x64, x86 ] - site: [ "wikipedia:en" ] - + python-version: [3.8.0, '3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] + python-arch: [x64, x86] + site: ['wikipedia:en'] steps: - - name: Checkout Repository - uses: actions/checkout@v4 - with: - submodules: true - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - architecture: ${{ matrix.python-arch }} - - - name: Install dependencies - shell: powershell - run: | - git submodule update --init - python --version - python -c "import struct; print('PYTHON_ARCH:', struct.calcsize('P') << 3)" - python -m pip install --upgrade pip - pip --version - if ('${{ matrix.python-version }}' -ge '3.12') { - pip install -U setuptools; - } - pip install -r dev-requirements.txt - pip install -r requirements.txt - pip install wikitextparser - - - name: Generate user files - run: | - python -Werror::UserWarning -m pwb generate_user_files -site:${{matrix.site}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; - echo "usernames['wikisource']['zh'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "usernames['wikipedia']['test'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "usernames['wikidata']['test'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "usernames['commons']['commons'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "usernames['meta']['meta'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py - echo "noisysleep = float('inf')" >> user-config.py - echo "maximum_GET_length = 5000" >> user-config.py - echo "transliteration_target = None" >> user-config.py - echo "console_encoding = 'utf8'" >> user-config.py - echo "import os" >> user-config.py - echo "password_file = os.path.expanduser('passwordfile')" >> user-config.py - echo "('${{ env.PYWIKIBOT_USERNAME }}', '${{ secrets.PYWIKIBOT_USERPWD }}')" > passwordfile - - - name: Test with unittest - id: ci_test - continue-on-error: true - timeout-minutes: 90 - env: - PYTHONIOENCODING: utf-8 - run: | - python pwb.py version - coverage run -m unittest discover -vv -p \"*_tests.py\"; - - - name: Show coverage statistics - run: | - coverage report - - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v5 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - - name: Check on failure - if: steps.ci_test.outcome == 'failure' - run: exit 1 + - name: Checkout Repository + uses: actions/checkout@v4 + with: + submodules: true + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + architecture: ${{ matrix.python-arch }} + - name: Install dependencies + shell: powershell + run: | + git submodule update --init + python --version + python -c "import struct; print('PYTHON_ARCH:', struct.calcsize('P') << 3)" + python -m pip install --upgrade pip + pip --version + if ('${{ matrix.python-version }}' -ge '3.12') { + pip install -U setuptools; + } + pip install -r dev-requirements.txt + pip install -r requirements.txt + pip install wikitextparser + - name: Generate user files + run: | + python -Werror::UserWarning -m pwb generate_user_files -site:${{matrix.site}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; + echo "usernames['wikisource']['zh'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "usernames['wikipedia']['test'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "usernames['wikidata']['test'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "usernames['commons']['commons'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "usernames['meta']['meta'] = '${{ env.PYWIKIBOT_USERNAME }}'" >> user-config.py + echo "noisysleep = float('inf')" >> user-config.py + echo "maximum_GET_length = 5000" >> user-config.py + echo "transliteration_target = None" >> user-config.py + echo "console_encoding = 'utf8'" >> user-config.py + echo "import os" >> user-config.py + echo "password_file = os.path.expanduser('passwordfile')" >> user-config.py + echo "('${{ env.PYWIKIBOT_USERNAME }}', '${{ secrets.PYWIKIBOT_USERPWD }}')" > passwordfile + - name: Test with unittest + id: ci_test + continue-on-error: true + timeout-minutes: 90 + env: + PYTHONIOENCODING: utf-8 + run: | + python pwb.py version + coverage run -m unittest discover -vv -p \"*_tests.py\"; + - name: Show coverage statistics + run: | + coverage report + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v5 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + - name: Check on failure + if: steps.ci_test.outcome == 'failure' + run: exit 1 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f92ce04..04b0fe6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,8 @@ +--- default_install_hook_types: - commit-msg - pre-commit + repos: - repo: meta hooks: @@ -33,12 +35,12 @@ - id: double-quote-string-fixer - id: end-of-file-fixer - id: fix-byte-order-marker - exclude: '^tests/data/' + exclude: ^tests/data/ - id: forbid-new-submodules - id: mixed-line-ending - id: pretty-format-json # list required for tab - args: ["--autofix", "--indent", "\t", "--no-ensure-ascii"] + args: [--autofix, --indent, "\t", --no-ensure-ascii] - id: trailing-whitespace args: - --markdown-linebreak-ext=rst @@ -62,12 +64,12 @@ files: .+\.py$ language: python - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.12.0 + rev: v0.12.1 hooks: - id: ruff-check alias: ruff args: - - --fix + - --fix - repo: https://github.com/asottile/pyupgrade rev: v3.20.0 hooks: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1164660?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: I119d17464540a0d25d8fffd872a10dc447df2544 Gerrit-Change-Number: 1164660 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: IMPR: Remove unnecessary assignment before return statement
by jenkins-bot (Code Review) 28 Jun '25

28 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1164610?usp=email ) Change subject: IMPR: Remove unnecessary assignment before return statement ...................................................................... IMPR: Remove unnecessary assignment before return statement Change-Id: I378812aeefc10d60def34c30dfe7d0542391a346 --- M pywikibot/_wbtypes.py M pywikibot/comms/http.py M pywikibot/cosmetic_changes.py M pywikibot/diff.py M pywikibot/page/_links.py M pywikibot/pagegenerators/_generators.py M pywikibot/proofreadpage.py M pywikibot/site/_datasite.py M pywikibot/site/_generators.py M pywikibot/textlib.py M pywikibot/time.py M pywikibot/xmlreader.py M scripts/category_graph.py M scripts/create_isbn_edition.py M scripts/noreferences.py M scripts/nowcommons.py M scripts/transwikiimport.py M tests/link_tests.py M tests/logentries_tests.py M tests/memento_tests.py M tests/script_tests.py 21 files changed, 103 insertions(+), 131 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/_wbtypes.py b/pywikibot/_wbtypes.py index e39e1b4..8ca7557 100644 --- a/pywikibot/_wbtypes.py +++ b/pywikibot/_wbtypes.py @@ -1,6 +1,6 @@ """Wikibase data type classes.""" # -# (C) Pywikibot team, 2013-2024 +# (C) Pywikibot team, 2013-2025 # # Distributed under the terms of the MIT license. # @@ -778,14 +778,14 @@ :return: Wikibase JSON """ - json = {'time': self.toTimestr(), - 'precision': self.precision, - 'after': self.after, - 'before': self.before, - 'timezone': self.timezone, - 'calendarmodel': self.calendarmodel - } - return json + return { + 'time': self.toTimestr(), + 'precision': self.precision, + 'after': self.after, + 'before': self.before, + 'timezone': self.timezone, + 'calendarmodel': self.calendarmodel, + } @classmethod def fromWikibase(cls, data: dict[str, Any], @@ -908,12 +908,12 @@ :return: Wikibase JSON """ - json = {'amount': self._fromdecimal(self.amount), - 'upperBound': self._fromdecimal(self.upperBound), - 'lowerBound': self._fromdecimal(self.lowerBound), - 'unit': self.unit - } - return json + return { + 'amount': self._fromdecimal(self.amount), + 'upperBound': self._fromdecimal(self.upperBound), + 'lowerBound': self._fromdecimal(self.lowerBound), + 'unit': self.unit, + } @classmethod def fromWikibase(cls, data: dict[str, Any], @@ -956,10 +956,10 @@ :return: Wikibase JSON """ - json = {'text': self.text, - 'language': self.language - } - return json + return { + 'text': self.text, + 'language': self.language, + } @classmethod def fromWikibase(cls, data: dict[str, Any], @@ -1109,12 +1109,11 @@ :param site: The Wikibase site """ - specifics = { + return { 'ending': '.map', 'label': 'geo-shape', - 'data_site': cls._get_data_site(site) + 'data_site': cls._get_data_site(site), } - return specifics class WbTabularData(WbDataPage): @@ -1135,12 +1134,11 @@ :param site: The Wikibase site """ - specifics = { + return { 'ending': '.tab', 'label': 'tabular-data', - 'data_site': cls._get_data_site(site) + 'data_site': cls._get_data_site(site), } - return specifics class WbUnknown(WbRepresentation): diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index ef9802a..f6d4bc0 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -237,11 +237,10 @@ values['script_comments'] = '; '.join(script_comments) format_string = format_string or config.user_agent_format - formatted = _USER_AGENT_FORMATTER.format(format_string, **values) + # clean up after any blank components - formatted = formatted.replace('()', '').replace(' ', ' ').strip() - return formatted + return formatted.replace('()', '').replace(' ', ' ').strip() def fake_user_agent() -> str: @@ -576,7 +575,5 @@ ' in the response header.' ) - _encoding = _try_decode(response.content, header_encoding) \ + return _try_decode(response.content, header_encoding) \ or _try_decode(response.content, charset) - - return _encoding diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py index c128860..55ea751 100644 --- a/pywikibot/cosmetic_changes.py +++ b/pywikibot/cosmetic_changes.py @@ -673,10 +673,9 @@ r'(\|(?P<label>[^\]\|]*))?\]\](?P<linktrail>' + self.site.linktrail() + ')') - text = textlib.replaceExcept(text, linkR, handleOneLink, + return textlib.replaceExcept(text, linkR, handleOneLink, ['comment', 'math', 'nowiki', 'pre', 'startspace']) - return text def resolveHtmlEntities(self, text: str) -> str: """Replace HTML entities with string.""" @@ -702,9 +701,8 @@ ignore.append(58) # Colon (:) # TODO: T254350 - what other extension tags should be avoided? # (graph, math, score, timeline, etc.) - text = pywikibot.html2unicode( + return pywikibot.html2unicode( text, ignore=ignore, exceptions=['comment', 'syntaxhighlight']) - return text def removeEmptySections(self, text: str) -> str: """Cleanup empty sections.""" @@ -759,9 +757,9 @@ 'startspace', 'table'] if self.site.sitename != 'wikipedia:cs': exceptions.append('template') - text = textlib.replaceExcept(text, r'(?m)[\t ]+( |$)', r'\1', + + return textlib.replaceExcept(text, r'(?m)[\t ]+( |$)', r'\1', exceptions, site=self.site) - return text def removeNonBreakingSpaceBeforePercent(self, text: str) -> str: """Remove a non-breaking space between number and percent sign. @@ -770,9 +768,8 @@ space in front of a percent sign, so it is no longer required to place it manually. """ - text = textlib.replaceExcept( + return textlib.replaceExcept( text, r'(\d)&(?:nbsp|#160|#x[Aa]0);%', r'\1 %', ['timeline']) - return text def cleanUpSectionHeaders(self, text: str) -> str: """Add a space between the equal signs and the section title. @@ -917,12 +914,13 @@ # this will cause mistakes. extensions = [fr'\.{ext}' for ext in ['pdf', 'html?', 'php', 'aspx?', 'jsp']] - text = textlib.replaceExcept( + + return textlib.replaceExcept( text, r'\[(?P<url>https?://[^\|\] ]+?(' + '|'.join(extensions) + r')) *' r'\| *(?P<label>[^\|\]]+?)\]', - r'[\g<url> \g<label>]', exceptions) - return text + r'[\g<url> \g<label>]', exceptions + ) def fixHtml(self, text: str) -> str: """Replace html markups with wikitext markups.""" diff --git a/pywikibot/diff.py b/pywikibot/diff.py index e142a4d..052e934 100644 --- a/pywikibot/diff.py +++ b/pywikibot/diff.py @@ -166,8 +166,7 @@ if line_ref is None: if color in self.colors: - colored_line = f'<<{self.colors[color]}>>{line}<<default>>' - return colored_line + return f'<<{self.colors[color]}>>{line}<<default>>' return line colored_line = '' diff --git a/pywikibot/page/_links.py b/pywikibot/page/_links.py index 67657bb..639cd30 100644 --- a/pywikibot/page/_links.py +++ b/pywikibot/page/_links.py @@ -736,12 +736,11 @@ :return: Wikibase JSON """ - json = { + return { 'site': self._sitekey, 'title': self._rawtitle, 'badges': [badge.title() for badge in self.badges] } - return json # Utility functions for parsing page titles diff --git a/pywikibot/pagegenerators/_generators.py b/pywikibot/pagegenerators/_generators.py index a6c60b5..4e04b8c 100644 --- a/pywikibot/pagegenerators/_generators.py +++ b/pywikibot/pagegenerators/_generators.py @@ -1478,15 +1478,13 @@ :return: Dictionary of querystring parameters to use in the query """ - query = { + return { 'id': id, 'action': 'get_data', 'format': 'json', 'doit': '' } - return query - def query(self) -> Generator[str, None, None]: """Query PagePile. diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index 2e55202..024dd8b 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -10,7 +10,7 @@ .. seealso:: https://wikisource.org/wiki/Wikisource:Google_OCR """ # -# (C) Pywikibot team, 2015-2024 +# (C) Pywikibot team, 2015-2025 # # Distributed under the terms of the MIT license. # @@ -303,9 +303,8 @@ @classmethod def get_descriptors(cls): """Get TagAttrDesc descriptors.""" - res = {k: v for k, v in cls.__dict__.items() - if isinstance(v, TagAttrDesc)} - return res + return {k: v for k, v in cls.__dict__.items() + if isinstance(v, TagAttrDesc)} def __contains__(self, attr) -> bool: return getattr(self, attr) is not None diff --git a/pywikibot/site/_datasite.py b/pywikibot/site/_datasite.py index 92f9693..d67f2ba 100644 --- a/pywikibot/site/_datasite.py +++ b/pywikibot/site/_datasite.py @@ -1,6 +1,6 @@ """Objects representing API interface to Wikibase site.""" # -# (C) Pywikibot team, 2012-2024 +# (C) Pywikibot team, 2012-2025 # # Distributed under the terms of the MIT license. # @@ -827,11 +827,10 @@ del kwargs['site'] parameters = dict(search=search, language=language, **kwargs) - gen = self._generator(api.APIGenerator, - type_arg='wbsearchentities', - data_name='search', - total=total, parameters=parameters) - return gen + return self._generator(api.APIGenerator, + type_arg='wbsearchentities', + data_name='search', + total=total, parameters=parameters) def parsevalue(self, datatype: str, values: list[str], options: dict[str, Any] | None = None, diff --git a/pywikibot/site/_generators.py b/pywikibot/site/_generators.py index 7d8534c..bf76ec7 100644 --- a/pywikibot/site/_generators.py +++ b/pywikibot/site/_generators.py @@ -1608,11 +1608,11 @@ sort = 'none' if sort != 'relevance': parameters['gsrsort'] = sort - srgen = self._generator(api.PageGenerator, type_arg='search', - namespaces=namespaces, - total=total, g_content=content, - parameters=parameters) - return srgen + + return self._generator(api.PageGenerator, type_arg='search', + namespaces=namespaces, + total=total, g_content=content, + parameters=parameters) def usercontribs( self, @@ -1892,10 +1892,10 @@ """ usprop = ['blockinfo', 'gender', 'groups', 'editcount', 'registration', 'rights', 'emailable'] - usgen = api.ListGenerator( - 'users', site=self, parameters={ - 'ususers': usernames, 'usprop': usprop}) - return usgen + return api.ListGenerator( + 'users', site=self, + parameters={'ususers': usernames, 'usprop': usprop} + ) def randompages( self, diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 257e1a7..039bc25 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -211,8 +211,7 @@ r'((({{{[^{}]+?}}}|{{[^{}]+?}}|{[^{}]*?})[^{]*?)*?)?' r'|)\s*}}' ) % {'namespace': ':|'.join(namespaces), 'pattern': pattern} - templateRegex = re.compile(templateRegexP, flags) - return templateRegex + return re.compile(templateRegexP, flags) def search_any_predicate(self, templates): """Return a predicate that matches any template.""" diff --git a/pywikibot/time.py b/pywikibot/time.py index 62bd7b4..2e6832b 100644 --- a/pywikibot/time.py +++ b/pywikibot/time.py @@ -3,7 +3,7 @@ .. versionadded:: 7.5 """ # -# (C) Pywikibot team, 2007-2024 +# (C) Pywikibot team, 2007-2025 # # Distributed under the terms of the MIT license. # @@ -197,9 +197,8 @@ sec -= 1 usec = 1_000_000 - usec - ts = cls(1970, 1, 1) + datetime.timedelta(seconds=sec, - microseconds=usec) - return ts + return cls(1970, 1, 1) + datetime.timedelta(seconds=sec, + microseconds=usec) @classmethod def _from_string(cls, timestr: str) -> Timestamp: diff --git a/pywikibot/xmlreader.py b/pywikibot/xmlreader.py index a1994cf..47f04b8 100644 --- a/pywikibot/xmlreader.py +++ b/pywikibot/xmlreader.py @@ -11,7 +11,7 @@ vulnerable XML attacks. *defusedxml* 0.7.1 or higher is recommended. """ # -# (C) Pywikibot team, 2005-2024 +# (C) Pywikibot team, 2005-2025 # # Distributed under the terms of the MIT license. # @@ -290,7 +290,7 @@ elem.findtext(f'{uri}restrictions') ) - headers = Headers( + return Headers( title=elem.findtext(f'{uri}title'), ns=elem.findtext(f'{uri}ns'), pageid=elem.findtext(f'{uri}id'), @@ -299,8 +299,6 @@ move_restriction=move_restriction, ) - return headers - def _create_revision( self, headers: Headers, revision: Element ) -> XmlEntry: @@ -311,7 +309,7 @@ username = ip_editor or contributor.findtext(f'{uri}username') username = username or '' # username might be deleted - xml_entry = XmlEntry( + return XmlEntry( title=headers.title, ns=headers.ns, id=headers.pageid, @@ -327,8 +325,6 @@ # could get comment, minor as well ) - return xml_entry - wrapper = ModuleDeprecationWrapper(__name__) wrapper.add_deprecated_attr( diff --git a/scripts/category_graph.py b/scripts/category_graph.py index 65c6206..0a8f8ab 100755 --- a/scripts/category_graph.py +++ b/scripts/category_graph.py @@ -43,7 +43,7 @@ .. versionadded:: 8.0 """ # -# (C) Pywikibot team, 2022-2024 +# (C) Pywikibot team, 2022-2025 # # Distributed under the terms of the MIT license. # @@ -126,28 +126,26 @@ def node(): subs = ', '.join([c.title(with_ns=False).replace(' ', ' ') for c in subcats]) - n = pydot.Node(title, - label=rf'"{title}\n{len(subcats)} C"', - tooltip=title + '\n\n' + subs, - URL=cat.full_url(), - fontsize=int(10 * size)) - return n + return pydot.Node(title, + label=f'"{title}\n{len(subcats)} C"', + tooltip=f'{title}\n\n{subs}', + URL=cat.full_url(), + fontsize=int(10 * size)) def edge(n, h): minlen = n % columns + 1 if level != self.args.depth else 1 - e = pydot.Edge(title, - subcat.title(with_ns=False), - tooltip=title + ' ⟶ ' - + subcat.title(with_ns=False), - headlabel=title, - # distribute the graph to depth - minlen=minlen, - penwidth=round(size / 2, 2), - arrowsize=round(size / 4, 2), - color=str(round(h, 2)) + ' 1 0.7', - labelfontsize=int(3 * size), - labelfontcolor=str(round(h, 2)) + ' 1 0.5') - return e + return pydot.Edge(title, + subcat.title(with_ns=False), + tooltip=title + ' ⟶ ' + + subcat.title(with_ns=False), + headlabel=title, + # distribute the graph to depth + minlen=minlen, + penwidth=round(size / 2, 2), + arrowsize=round(size / 4, 2), + color=str(round(h, 2)) + ' 1 0.7', + labelfontsize=int(3 * size), + labelfontcolor=str(round(h, 2)) + ' 1 0.5') if config.verbose_output: pywikibot.info('Adding ' + cat.title(with_ns=False)) diff --git a/scripts/create_isbn_edition.py b/scripts/create_isbn_edition.py index 1386492..c435a54 100755 --- a/scripts/create_isbn_edition.py +++ b/scripts/create_isbn_edition.py @@ -764,8 +764,7 @@ baselabel = baselabel.replace(',', ' ') # Remove remaining "," # Remove redundant spaces - baselabel = ' '.join(baselabel.split()) - return baselabel + return ' '.join(baselabel.split()) def get_item_list(item_name: str, diff --git a/scripts/noreferences.py b/scripts/noreferences.py index c251d64..bf4945b 100755 --- a/scripts/noreferences.py +++ b/scripts/noreferences.py @@ -670,12 +670,12 @@ templates_or_comments = re.compile( r'^((?:\s*(?:\{\{[^\{\}]*?\}\}|))*)', flags=re.DOTALL) - new_text = ( + return ( oldText[:match.end() - 1] + templates_or_comments.sub( fr'\1\n{self.referencesText}\n', - oldText[match.end() - 1:])) - return new_text + oldText[match.end() - 1:]) + ) else: break diff --git a/scripts/nowcommons.py b/scripts/nowcommons.py index 6abfbeb..cab5ff4 100755 --- a/scripts/nowcommons.py +++ b/scripts/nowcommons.py @@ -265,6 +265,7 @@ else: file_on_commons = val[1].strip() return file_on_commons + return None def init_page(self, item: pywikibot.Page) -> pywikibot.FilePage: """Ensure that generator retrieves FilePage objects.""" diff --git a/scripts/transwikiimport.py b/scripts/transwikiimport.py index fe07d7d..d3932ef 100755 --- a/scripts/transwikiimport.py +++ b/scripts/transwikiimport.py @@ -156,8 +156,7 @@ def api_query(site, params: dict[str, str]): """Request data from given site.""" query = api.Request(site, parameters=params) - datas = query.submit() - return datas + return query.submit() def main(*args: str) -> None: diff --git a/tests/link_tests.py b/tests/link_tests.py index bf04390..8b8a001 100755 --- a/tests/link_tests.py +++ b/tests/link_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """Test Link functionality.""" # -# (C) Pywikibot team, 2014-2024 +# (C) Pywikibot team, 2014-2025 # # Distributed under the terms of the MIT license. # @@ -123,30 +123,25 @@ """Test that invalid titles raise InvalidTitleError.""" # Bad characters forbidden regardless of wgLegalTitleChars def generate_contains_illegal_chars_exc_regex(text): - exc_regex = (rf'^(u|)\'{re.escape(text)}\' contains illegal char' - rf'$s$ (u|)\'{re.escape(text[2])}\'$') - return exc_regex + return (rf'^(u|)\'{re.escape(text)}\' contains illegal char' + rf'$s$ (u|)\'{re.escape(text[2])}\'$') # Directory navigation def generate_contains_dot_combinations_exc_regex(text): - exc_regex = (rf'^$contains \. / combinations$: (u|)' - rf'\'{re.escape(text)}\'$') - return exc_regex + return (rf'^$contains \. / combinations$: (u|)' + rf'\'{re.escape(text)}\'$') # Tilde def generate_contains_tilde_exc_regex(text): - exc_regex = rf'^$contains ~~~$: (u|)\'{re.escape(text)}\'$' - return exc_regex + return rf'^$contains ~~~$: (u|)\'{re.escape(text)}\'$' # Overlength def generate_overlength_exc_regex(text): - exc_regex = rf'^$over 255 bytes$: (u|)\'{re.escape(text)}\'$' - return exc_regex + return rf'^$over 255 bytes$: (u|)\'{re.escape(text)}\'$' # Namespace prefix without actual title def generate_has_no_title_exc_regex(text): - exc_regex = rf'^(u|)\'{re.escape(text.strip())}\' has no title\.$' - return exc_regex + return rf'^(u|)\'{re.escape(text.strip())}\' has no title\.$' title_tests = [ # Empty title diff --git a/tests/logentries_tests.py b/tests/logentries_tests.py index 3fafb13..9b4447e 100755 --- a/tests/logentries_tests.py +++ b/tests/logentries_tests.py @@ -68,8 +68,7 @@ with skipping(StopIteration, msg=f'No entry found for {logtype!r}'): - le = next(self.site.logevents(logtype=logtype, total=1)) - return le + return next(self.site.logevents(logtype=logtype, total=1)) def _test_logevent(self, logtype) -> None: """Test a single logtype entry.""" diff --git a/tests/memento_tests.py b/tests/memento_tests.py index 1e37fde..8647906 100755 --- a/tests/memento_tests.py +++ b/tests/memento_tests.py @@ -34,8 +34,7 @@ if date_string else None) with skipping(ReadTimeout, RequestsConnectionError, MementoClientException): - result = get_closest_memento_url(url, when, self.timegate_uri) - return result + return get_closest_memento_url(url, when, self.timegate_uri) class TestMementoArchive(MementoTestCase): diff --git a/tests/script_tests.py b/tests/script_tests.py index 4926930..19e4eed 100755 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """Test that each script can be compiled and executed.""" # -# (C) Pywikibot team, 2014-2024 +# (C) Pywikibot team, 2014-2025 # # Distributed under the terms of the MIT license. # @@ -53,11 +53,12 @@ def list_scripts(path, exclude=None): """Return list of scripts in given path.""" - scripts = [name[0:-3] for name in os.listdir(path) # strip '.py' - if name.endswith('.py') - and not name.startswith('_') # skip __init__.py and _* - and name != exclude] - return scripts + return [ + name[0:-3] for name in os.listdir(path) # strip '.py' + if name.endswith('.py') + and not name.startswith('_') # skip __init__.py and _* + and name != exclude + ] script_list = framework_scripts + list_scripts(scripts_path) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1164610?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: I378812aeefc10d60def34c30dfe7d0542391a346 Gerrit-Change-Number: 1164610 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: doc: update ROADMAP.rst and CHANGELOG.rst
by jenkins-bot (Code Review) 28 Jun '25

28 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1164580?usp=email ) Change subject: doc: update ROADMAP.rst and CHANGELOG.rst ...................................................................... doc: update ROADMAP.rst and CHANGELOG.rst Change-Id: I26a23809991f73f96bdb1c77bd08b80561731c1a --- M ROADMAP.rst M scripts/CHANGELOG.rst 2 files changed, 33 insertions(+), 11 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index f982227..fb6a0e9 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,7 +1,12 @@ Current Release Changes ======================= -* (no changes yet) +* Add -cookies option to :mod:`login<pywikibot.scripts.login>` script to login with cookies files only +* Create a Site using :func:`pywikibot.Site` constructor with a given url even if the url ends with + a slash (:phab:`T396592`) +* Remove hard-coded error messages from :meth:`login.LoginManager.login` and use API response instead +* Add additional informations to :meth:`Site.login()<pywikibot.site._apisite.APISite.login>` error message (:phab:`T395670`) +* i18n updates Current Deprecations ==================== @@ -16,8 +21,8 @@ '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* -* 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.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 @@ -25,16 +30,16 @@ * 9.2.0: Imports of :mod:`logging` functions from :mod:`bot` module is 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: The *content* parameter of :meth:`proofreadpage.IndexPage.page_gen` is deprecated and will be + ignored (:phab:`T358635`) * 9.0.0: ``userinterfaces.transliteration.transliterator`` was renamed to :class:`Transliterator <userinterfaces.transliteration.Transliterator>` -* 9.0.0: ``next`` parameter of :meth:`userinterfaces.transliteration.transliterator.transliterate` was renamed to - ``succ`` +* 9.0.0: ``next`` parameter of :meth:`userinterfaces.transliteration.transliterator.transliterate` was + renamed to ``succ`` * 9.0.0: ``type`` parameter of :meth:`site.APISite.protectedpages() <pywikibot.site._generators.GeneratorsMixin.protectedpages>` was renamed to ``protect_type`` -* 9.0.0: ``all`` parameter of :meth:`site.APISite.namespace()<pywikibot.site._apisite.APISite.namespace>` was renamed to - ``all_ns`` +* 9.0.0: ``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: ``pywikibot.version.get_toolforge_hostname()`` is deprecated without replacement @@ -69,7 +74,7 @@ * 8.0.0: :meth:`LoginManager.get_login_token<login.ClientLoginManager.get_login_token>` was replaced by ``login.ClientLoginManager.site.tokens['login']`` * 8.0.0: ``data.api.LoginManager()`` is deprecated in favour of :class:`login.ClientLoginManager` -* 8.0.0: :meth:`APISite.messages()<pywikibot.site._apisite.APISite.messages>` method is deprecated in favour of - :attr:`userinfo['messages']<pywikibot.site._apisite.APISite.userinfo>` +* 8.0.0: :meth:`APISite.messages()<pywikibot.site._apisite.APISite.messages>` method is deprecated in + favour of :attr:`userinfo['messages']<pywikibot.site._apisite.APISite.userinfo>` * 8.0.0: :meth:`Page.editTime()<page.BasePage.editTime>` method is deprecated and should be replaced by :attr:`Page.latest_revision.timestamp<page.BasePage.latest_revision>` diff --git a/scripts/CHANGELOG.rst b/scripts/CHANGELOG.rst index 598a879..62f50ea 100644 --- a/scripts/CHANGELOG.rst +++ b/scripts/CHANGELOG.rst @@ -1,6 +1,23 @@ Scripts Changelog ================= +10.3.0 +------ + +* i18n updates + +archivebot +^^^^^^^^^^ + +* Use wikidata items for archive header templates (:phab:`T396399`) + +redirect +^^^^^^^^ + +* Try one more move to fix redirect targets (:phab:`T396473`) +* Don't fix broken redirects if namespace of source and target are different (:phab:`T396456`) + + 10.2.0 ------ -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1164580?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: I26a23809991f73f96bdb1c77bd08b80561731c1a Gerrit-Change-Number: 1164580 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 26 Jun '25

26 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/1164184?usp=email ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: Ia94b9c222174ce4552b0178c8fcbb275a79c13a4 --- M blockpageschecker/vi.json 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/blockpageschecker/vi.json b/blockpageschecker/vi.json index 043ae4a..256fb1c 100644 --- a/blockpageschecker/vi.json +++ b/blockpageschecker/vi.json @@ -5,7 +5,8 @@ "Flyplanevn27", "Keo010122", "Minh Nguyen", - "Nghiemtrongdai VN" + "Nghiemtrongdai VN", + "Nvdtn19" ] }, "blockpageschecker-adding": "Bot: Thêm bản mẫu khóa trang", -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/1164184?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/i18n Gerrit-Branch: master Gerrit-Change-Id: Ia94b9c222174ce4552b0178c8fcbb275a79c13a4 Gerrit-Change-Number: 1164184 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

1 0

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 23 Jun '25

23 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/1162879?usp=email ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: Ic99e6379e17da2b01976148fe4c99225575af75a --- M redirect/gl.json M redirect/mk.json 2 files changed, 6 insertions(+), 6 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/redirect/gl.json b/redirect/gl.json index cc457b4..6be069c 100644 --- a/redirect/gl.json +++ b/redirect/gl.json @@ -5,9 +5,9 @@ "Toliño" ] }, - "redirect-fix-broken-moved": "Arranxo a redirección rota cara á páxina de destino trasladada \"%(to)s\"", - "redirect-fix-double": "Arranxo a redirección dobre cara a \"%(to)s\"", - "redirect-fix-loop": "Arranxo a redirección en bucle cara a \"%(to)s\"", + "redirect-fix-broken-moved": "Arranxo a redirección rota desde \"%(from)s\" cara á páxina de destino \"%(to)s\"", + "redirect-fix-double": "Arranxo a redirección dobre desde \"%(from)s\" cara a \"%(to)s\"", + "redirect-fix-loop": "Arranxo a redirección en bucle desde \"%(from)s\" cara a \"%(to)s\"", "redirect-remove-broken": "Redirección cara a unha páxina eliminada ou que non existe", "redirect-remove-loop": "O destino da redirección crea un bucle" } diff --git a/redirect/mk.json b/redirect/mk.json index fd334c3..80edff8 100644 --- a/redirect/mk.json +++ b/redirect/mk.json @@ -6,9 +6,9 @@ "Xqt" ] }, - "redirect-fix-broken-moved": "Исправка на прекинато пренасочување кон преместена целна страница %(to)s", - "redirect-fix-double": "Исправка на двојни пренасочувања → %(to)s", - "redirect-fix-loop": "Поправа јамка на пренасочување кон %(to)s", + "redirect-fix-broken-moved": "Исправка на прекинато пренасочување од %(from)s кон преместена целна страница %(to)s", + "redirect-fix-double": "Исправка на двојни пренасочувања од %(from)s кон %(to)s", + "redirect-fix-loop": "Поправа јамка на пренасочување од %(from)s кон %(to)s", "redirect-remove-broken": "Пренасочување кон избришана или непостоечка страница", "redirect-remove-loop": "Одредницата за пренасочување образува јамка" } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/1162879?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/i18n Gerrit-Branch: master Gerrit-Change-Id: Ic99e6379e17da2b01976148fe4c99225575af75a Gerrit-Change-Number: 1162879 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

1 0

[Gerrit] ...core[master]: IMPR: Add -cookies option to login script to login with cookies files...
by jenkins-bot (Code Review) 22 Jun '25

22 Jun '25

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1157612?usp=email ) Change subject: IMPR: Add -cookies option to login script to login with cookies files only ...................................................................... IMPR: Add -cookies option to login script to login with cookies files only Change-Id: If38a806c9b222d39b50f7b464c3a4fb7b5985ab9 --- M pywikibot/scripts/login.py 1 file changed, 11 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/scripts/login.py b/pywikibot/scripts/login.py index a940fca..74c1583 100755 --- a/pywikibot/scripts/login.py +++ b/pywikibot/scripts/login.py @@ -9,6 +9,8 @@ -all Try to log in on all sites where a username is defined in user config file (user-config.py). +-cookies Only login from cookies file, don't ask for password + -logout Log out of the current site. Combine with ``-all`` to log out of all sites, or with :ref:`global options` ``-family``, ``-lang`` or ``-site`` to log out of a specific site. @@ -46,6 +48,8 @@ *-async* option was added. .. versionchanged:: 10.2 wildcard site codes in ``usernames`` dict are supported. +.. versionchanged:: 10.3 + the -cookies option """ # # (C) Pywikibot team, 2003-2025 @@ -95,7 +99,8 @@ ) -def login_one_site(code, family, oauth, logout, autocreate) -> None: +def login_one_site(code: str, family: str, oauth: bool, logout: bool, + autocreate: bool, cookies: bool) -> None: """Login on one site.""" try: site = pywikibot.Site(code, family) @@ -112,7 +117,7 @@ site.logout() else: try: - site.login(autocreate=autocreate) + site.login(autocreate=autocreate, cookie_only=cookies) except NoUsernameError as e: pywikibot.error(e) @@ -137,6 +142,7 @@ oauth = False autocreate = False asynchronous = False + cookies = False unknown_args = [] for arg in pywikibot.handle_args(args): if arg == '-all': @@ -149,6 +155,8 @@ autocreate = True elif arg == '-async': asynchronous = True + elif arg == '-cookies': + cookies = True else: unknown_args.append(arg) @@ -161,7 +169,7 @@ site = pywikibot.Site() namedict = {site.family.name: {site.code: None}} - params = oauth, logout, autocreate + params = oauth, logout, autocreate, cookies context = (nullcontext(), BoundedPoolExecutor('ThreadPoolExecutor'))[asynchronous] with context as executor: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1157612?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: If38a806c9b222d39b50f7b464c3a4fb7b5985ab9 Gerrit-Change-Number: 1157612 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits June 2025