Pywikibot-commits December 2021

pywikibot-commits@lists.wikimedia.org

1 participants
46 discussions

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/746848 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: Iefe82014077fb1e1043fe36bd6dd44bdca36a44b --- M archivebot/uz.json A blockpageschecker/uz.json M blockpageschecker/vi.json A casechecker/uz.json M casechecker/vi.json M category/uz.json A delete/uz.json 7 files changed, 54 insertions(+), 6 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/archivebot/uz.json b/archivebot/uz.json index 3b02bc9..0b39b53 100644 --- a/archivebot/uz.json +++ b/archivebot/uz.json @@ -1,9 +1,11 @@ { "@metadata": { "authors": [ - "CoderSI" + "CoderSI", + "Zafar Shamsiddinov" ] }, "archivebot-archive-full": "(ARXIV TOʻLGAN)", - "archivebot-older-than": "koʻra eskiroq" + "archivebot-older-than": "{{PLURAL:%(count)d|older}} dan %(duration)s koʻra eskiroq", + "archivebot-page-summary": "Bot: %(count)d ta {{PLURAL:%(count)d|oqim|oqimlar}} (%(why)s) dan %(archives)s gacha arxivlash" } diff --git a/blockpageschecker/uz.json b/blockpageschecker/uz.json new file mode 100644 index 0000000..dd91ab3 --- /dev/null +++ b/blockpageschecker/uz.json @@ -0,0 +1,10 @@ +{ + "@metadata": { + "authors": [ + "Zafar Shamsiddinov" + ] + }, + "blockpageschecker-adding": "Bot: sahifani bloklash shablonini qoʻshish", + "blockpageschecker-modifying": "Bot: Eskirgan shablonni yangilash", + "blockpageschecker-deleting": "Bot: Eskirgan shablonni oʻchirish" +} diff --git a/blockpageschecker/vi.json b/blockpageschecker/vi.json index 6eb5d47..3469538 100644 --- a/blockpageschecker/vi.json +++ b/blockpageschecker/vi.json @@ -1,8 +1,12 @@ { "@metadata": { "authors": [ - "Minh Nguyen" + "Keo010122", + "Minh Nguyen", + "Nghiemtrongdai VN" ] }, + "blockpageschecker-adding": "Bot: Thêm bản mẫu khóa trang", + "blockpageschecker-modifying": "Bot: Sửa bản mẫu lỗi thời", "blockpageschecker-deleting": "Bot: Xóa bản mẫu lỗi thời" } diff --git a/casechecker/uz.json b/casechecker/uz.json new file mode 100644 index 0000000..d456fcf --- /dev/null +++ b/casechecker/uz.json @@ -0,0 +1,12 @@ +{ + "@metadata": { + "authors": [ + "Zafar Shamsiddinov" + ] + }, + "casechecker-delete-reason": "Bu qayta yoʻnaltirish %(target)sʼga ishora qilish uchun ishlatilgan", + "casechecker-delete-summary": "Bot: Ushbu yoʻnaltirish sarlavhasida bir xil koʻrinishdagi kirill va lotin harflarini oʻz ichiga oladi", + "casechecker-rename": "Bot: aralash harflar nomini oʻzgartirish", + "casechecker-replacement-linklist": "%(source)s→%(target)s", + "casechecker-replacement-summary": "Bot: Harflar almashtirishlari:" +} diff --git a/casechecker/vi.json b/casechecker/vi.json index 1820702..5448a63 100644 --- a/casechecker/vi.json +++ b/casechecker/vi.json @@ -1,11 +1,12 @@ { "@metadata": { "authors": [ + "Keo010122", "Minh Nguyen" ] }, "casechecker-delete-reason": "Trang này từng đổi hướng đến %(target)s", - "casechecker-delete-summary": "Bot: Tên trang đổi hướng này có chữ Kirin và Latinh y hệt nhau", + "casechecker-delete-summary": "Bot: Tên trang đổi hướng này có chữ Kirin và Latinh giống nhau", "casechecker-rename": "Bot: Đổi tên hỗn hợp chữ hoa/thường", "casechecker-replacement-linklist": "%(source)s→%(target)s", "casechecker-replacement-summary": "Bot: Thay thế chữ hoa/thường:" diff --git a/category/uz.json b/category/uz.json index de66536..e880d85 100644 --- a/category/uz.json +++ b/category/uz.json @@ -1,8 +1,17 @@ { "@metadata": { "authors": [ - "Sociologist" + "Sociologist", + "Zafar Shamsiddinov" ] }, - "category-adding": "Bot: Turkum qoʻshish [[:Category:%(newcat)s|%(newcat)s]]" + "category-adding": "Bot: Turkum qoʻshish [[:Category:%(newcat)s|%(newcat)s]]", + "category-also-in": "(shunigdek %(alsocat)s)", + "category-listifying": "Bot: %(fromcat)sʼdan roʻyxatga olish ({{PLURAL:%(num)d|1 ta qayd|%(num)d ta qayd}})", + "category-removing": "Bot: %(oldcat)sʼdan oʻchirish", + "category-renamed": "Bot: %(oldcat)sʼdan koʻchirilgan. Mualliflar: %(authors)s", + "category-replacing": "Bot: %(oldcat)s toifasi %(newcat)s bilan almashtirish", + "category-section-title": "Sobiq %(oldcat)s sahifalari tarixi", + "category-strip-cfd-templates": "Bot: tugallangan harakat uchun CFD shablonlarini olib tashlash", + "category-strip-sort-keys": "Bot: Tugallangan amal uchun saralash tugmachalarini olib tashlash" } diff --git a/delete/uz.json b/delete/uz.json new file mode 100644 index 0000000..34cacc0 --- /dev/null +++ b/delete/uz.json @@ -0,0 +1,10 @@ +{ + "@metadata": { + "authors": [ + "Zafar Shamsiddinov" + ] + }, + "delete-from-file": "Bot: sahifalar roʻyxatini oʻchirish.", + "delete-images": "Bot: %(page)s sahifasidagi barcha rasmlarni oʻchirish", + "delete-linked-pages": "%(page)sʼdan bog‘langan barcha sahifalar o‘chirish" +} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/746848 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Change-Id: Iefe82014077fb1e1043fe36bd6dd44bdca36a44b Gerrit-Change-Number: 746848 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 5 months

[Gerrit] ...core[master]: [IMPR] Enable shell script with Pywikibot site package

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/743362 ) Change subject: [IMPR] Enable shell script with Pywikibot site package ...................................................................... [IMPR] Enable shell script with Pywikibot site package - move shell.py script to pywikibot/scripts - update tests - update docs Change-Id: I69a91037632bbe2d90ed231f51c119b255f7f3ad --- M docs/glossary.rst M docs/scripts/scripts.rst M docs/utilities/index.rst M pywikibot/CONTENT.rst M pywikibot/bot.py R pywikibot/scripts/shell.py M scripts/README.rst M tests/script_tests.py 8 files changed, 24 insertions(+), 15 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/glossary.rst b/docs/glossary.rst index a750eee..7361e7b 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -9,7 +9,8 @@ The default Python prompt of the interactive Pywikibot shell. Often seen for code examples which can be executed interactively in the interpreter. The :mod:`pywikibot` module is preloaded. The - :mod:`scripts.shell` script is part of the :mod:`scripts` module. + :mod:`pywikibot.scripts.shell` script is part of the + :ref:`Pywikibot Utility Scripts<utility_scripts>`. compat The first Pywikibot package formerly known as *Pywikipediabot* diff --git a/docs/scripts/scripts.rst b/docs/scripts/scripts.rst index 86ec7d3..1787469 100644 --- a/docs/scripts/scripts.rst +++ b/docs/scripts/scripts.rst @@ -207,11 +207,6 @@ .. automodule:: scripts.revertbot -shell script ------------- - -.. automodule:: scripts.shell - solve\_disambiguation script ---------------------------- diff --git a/docs/utilities/index.rst b/docs/utilities/index.rst index 5e61800..0a8cc7e 100644 --- a/docs/utilities/index.rst +++ b/docs/utilities/index.rst @@ -1,3 +1,5 @@ +.. _utility_scripts: + Utility scripts =============== @@ -6,11 +8,6 @@ .. automodule:: pwb -version script --------------- - -.. automodule:: pywikibot.scripts.version - generate\_family\_file script ----------------------------- @@ -20,3 +17,13 @@ ---------------------------- .. automodule:: pywikibot.scripts.generate_user_files + +shell script +------------ + +.. automodule:: pywikibot.scripts.shell + +version script +-------------- + +.. automodule:: pywikibot.scripts.version diff --git a/pywikibot/CONTENT.rst b/pywikibot/CONTENT.rst index 468259a..13a77df 100644 --- a/pywikibot/CONTENT.rst +++ b/pywikibot/CONTENT.rst @@ -119,6 +119,9 @@ +----------------------------+------------------------------------------------------+ | pwb.py | Code entry wrapper script (site-package only) | +----------------------------+------------------------------------------------------+ + | shell.py | Spawns an interactive Python shell with pywikibot | + | | imported | + +----------------------------+------------------------------------------------------+ | version.py | Outputs Pywikibot's revision number, Python's | | | version and OS used. | +----------------------------+------------------------------------------------------+ diff --git a/pywikibot/bot.py b/pywikibot/bot.py index b8df65d..d1e3699 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -1780,7 +1780,7 @@ # edit summary for the bot. summary = Bot: Aggiungo template Categorizzare - [shell] ; Shell options + [commonscat] ; commonscat options always: true The option values are interpreted in this order: diff --git a/scripts/shell.py b/pywikibot/scripts/shell.py similarity index 96% rename from scripts/shell.py rename to pywikibot/scripts/shell.py index f105182..58143ba 100755 --- a/scripts/shell.py +++ b/pywikibot/scripts/shell.py @@ -12,6 +12,9 @@ python pwb.py shell [args] If no arguments are given, the pywikibot library will not be loaded. + +.. versionchanged:: 7.0 + moved to pywikibot.scripts """ # (C) Pywikibot team, 2014-2021 # diff --git a/scripts/README.rst b/scripts/README.rst index c4bf53f..8c417a8 100644 --- a/scripts/README.rst +++ b/scripts/README.rst @@ -123,8 +123,6 @@ +------------------------+---------------------------------------------------------+ | revertbot.py | Script that can be used for reverting certain edits. | +------------------------+---------------------------------------------------------+ - | shell.py | Spawns an interactive Python shell. | - +------------------------+---------------------------------------------------------+ | solve_disambiguation.py| Interactive robot doing disambiguation. | +------------------------+---------------------------------------------------------+ | speedy_delete.py | Help sysops to quickly check and/or delete pages listed | diff --git a/tests/script_tests.py b/tests/script_tests.py index 6f9b47f..18a9e8e 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -17,6 +17,7 @@ scripts_path = join_root_path('scripts') +framework_scripts = ['shell'] # These dependencies are not always the package name which is in setup.py. # Here, the name given to the module which will be imported is required. @@ -55,7 +56,8 @@ return scripts -script_list = ['login'] + list_scripts(scripts_path, exclude='login.py') +script_list = ['login'] + list_scripts(scripts_path, + exclude='login.py') + framework_scripts script_input = { 'interwiki': 'Test page that should not exist\n', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/743362 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: I69a91037632bbe2d90ed231f51c119b255f7f3ad Gerrit-Change-Number: 743362 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

2 years, 5 months

[Gerrit] ...core[master]: [W1510] Don't ignore non-zero exit with subprocess.run()

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/743360 ) Change subject: [W1510] Don't ignore non-zero exit with subprocess.run() ...................................................................... [W1510] Don't ignore non-zero exit with subprocess.run() raise an exception instead which is intentional by default. https://deepsource.io/gh/ZabeMath/pywikibot/issue/PYL-W1510/occurrences Change-Id: Ia6c3ae37085244cb0131b2b23348f227b513baa4 --- M pywikibot/editor.py M scripts/shell.py 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/editor.py b/pywikibot/editor.py index db627e1..e40be73 100644 --- a/pywikibot/editor.py +++ b/pywikibot/editor.py @@ -95,7 +95,7 @@ tempFile.write(text) creationDate = os.stat(tempFilename).st_mtime cmd = self._command(tempFilename, text, jumpIndex) - subprocess.run(cmd, shell=platform == 'win32') + subprocess.run(cmd, shell=platform == 'win32', check=True) lastChangeDate = os.stat(tempFilename).st_mtime if lastChangeDate == creationDate: # Nothing changed diff --git a/scripts/shell.py b/scripts/shell.py index 26a582f..f105182 100755 --- a/scripts/shell.py +++ b/scripts/shell.py @@ -52,7 +52,8 @@ import platform import subprocess subprocess.run('title Python {} Shell' - .format(platform.python_version()), shell=True) + .format(platform.python_version()), + shell=True, check=True) del subprocess del platform args = [] -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/743360 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: Ia6c3ae37085244cb0131b2b23348f227b513baa4 Gerrit-Change-Number: 743360 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

2 years, 5 months

[Gerrit] ...core[master]: [doc] remove CircleCI test documentation

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/743569 ) Change subject: [doc] remove CircleCI test documentation ...................................................................... [doc] remove CircleCI test documentation CircleCI was never used by Pywikibot tests and can be removed. The documentation is outdated anyway. Change-Id: I39a0a122b44fd3fc44ad1485755c0c7d8f45d403 --- M tests/README.rst 1 file changed, 0 insertions(+), 25 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/README.rst b/tests/README.rst index 6267c07..c356cde 100644 --- a/tests/README.rst +++ b/tests/README.rst @@ -109,31 +109,6 @@ The 'user' tests are not yet enabled on AppVeyor builds. -CircleCI -======== - -After changes are published into a GitHub repository, tests may be run on -CircleCI Ubuntu servers. - -1. create a GitHub and CircleCI account -2. fork the main GitHub repository -3. create a project in circleci.com -4. go to https://circleci.com/gh/<username>/pywikibot/edit#env-vars - and add the following variables: - - - PYWIKIBOT_NO_USER_CONFIG=2 - - TOXENV=py27,py34 - -5. push changes into the forked git repository -6. watch the build at https://circleci.com/gh/<username>/pywikibot - -PYWIKIBOT_NO_USER_CONFIG=2 is needed because 'python -m unittest' is run. - -TOXENV=py27,py34 is a workaround because CircleCI runs 'tox', -but there is a bug in the CircleCI default 'py26' implementation. - -This approach does not include 'user' tests. - Environment variables ===================== -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/743569 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: I39a0a122b44fd3fc44ad1485755c0c7d8f45d403 Gerrit-Change-Number: 743569 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Rubin <rubin.happy(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 5 months

[Gerrit] ...core[master]: [doc] Update classifiers

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/745222 ) Change subject: [doc] Update classifiers ...................................................................... [doc] Update classifiers Change-Id: Ie92c54d4140b84bd34ac507b6225277edd934be0 --- M setup.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/setup.py b/setup.py index 83bfd78..e9164ee 100644 --- a/setup.py +++ b/setup.py @@ -277,7 +277,9 @@ 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: Implementation :: CPython', + 'Programming Language :: Python :: Implementation :: PyPy', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Wiki', 'Topic :: Software Development :: Libraries :: Python Modules', 'Topic :: Utilities', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/745222 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: Ie92c54d4140b84bd34ac507b6225277edd934be0 Gerrit-Change-Number: 745222 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 5 months

[Gerrit] ...core[master]: [doc] add github action badge

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/745221 ) Change subject: [doc] add github action badge ...................................................................... [doc] add github action badge Change-Id: If4f681099478cab7b5f075cf136eb42fd679caa7 --- M README.rst 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/README.rst b/README.rst index eebbf97..fba945b 100644 --- a/README.rst +++ b/README.rst @@ -1,3 +1,6 @@ +.. image:: https://github.com/wikimedia/pywikibot/actions/workflows/pywikibot-ci.yml/b… + :alt: Github CI + :target: https://github.com/wikimedia/pywikibot/actions/workflows/pywikibot-ci.yml .. image:: https://ci.appveyor.com/api/projects/status/xo2g4ctoom8k6yvw/branch/master?… :alt: AppVeyor Build Status :target: https://ci.appveyor.com/project/ladsgroup/pywikibot-g4xqx -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/745221 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: If4f681099478cab7b5f075cf136eb42fd679caa7 Gerrit-Change-Number: 745221 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 5 months

[Gerrit] ...core[master]: [tests] Add test environments to github actions

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/743686 ) Change subject: [tests] Add test environments to github actions ...................................................................... [tests] Add test environments to github actions - add PYWIKIBOT_TESTS_RUNNING environment variable - add PYWIKIBOT_TEST_NO_RC environment variable which is 1 for wikisource:zh site and matrix.test_no_rc setting and 0 otherwise - add PYWIKIBOT_TEST_PROD_ONLY for all tests except included tests - run version script before tests to get the PYWIKIBOT_TESTS_ settings - use github expressions to simplify settings Bug: T296371 Change-Id: I13143f91ae031e9698ff3c27a238f7e831278dfd --- M .github/workflows/pywikibot-ci.yml M tests/aspects.py 2 files changed, 22 insertions(+), 10 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index a688455..8c6d951 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -10,30 +10,31 @@ pull_request: branches: [ master ] +env: + PYWIKIBOT_TESTS_RUNNING: 1 + jobs: build: - runs-on: ubuntu-latest - continue-on-error: ${{ matrix.experimental }} + continue-on-error: ${{ matrix.experimental || false }} + strategy: fail-fast: false + matrix: python-version: ["3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"] site: ["wikipedia:en", "wikisource:zh"] - experimental: [false] + test_prod_only: [true] include: - python-version: "3.7" site: "wikipedia:test" - experimental: false - python-version: "3.7" site: "wikidata:test" - experimental: false - python-version: "3.9" site: "wiktionary:ar" - experimental: false + test_no_rc: true - python-version: "3.6" site: "wikidata:wikidata" - experimental: false - python-version: "3.8" site: "wowwiki:uk" experimental: true @@ -45,10 +46,12 @@ - uses: actions/checkout@v2 with: submodules: true + - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} + - name: Install dependencies run: | python -m pip install --upgrade pip @@ -58,12 +61,19 @@ if [ -f requirements.txt ]; then pip install -r requirements.txt; fi pip install wikitextparser python -c "import setuptools; print('setuptools:', setuptools.__version__)" + - name: Generate user files run: | python -Werror::UserWarning -m pwb generate_user_files -site:${{matrix.site}} -v -debug echo "max_retries = 3" >> user-config.py echo "maximum_GET_length = 5000" >> user-config.py echo "console_encoding = 'utf8'" >> user-config.py + - name: Test with unittest + env: + PYWIKIBOT_TEST_NO_RC: + ${{ (matrix.site == 'wikisource:zh' || matrix.test_no_rc) && 1 || 0 }} + PYWIKIBOT_TEST_PROD_ONLY: ${{ matrix.test_prod_only && 1 || 0 }} run: | + python pwb.py version coverage run -m unittest discover -vv -p \"*_tests.py\" diff --git a/tests/aspects.py b/tests/aspects.py index ef26423..dc9da6e 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -864,10 +864,11 @@ interface = DrySite for data in cls.sites.values(): + prod_only = os.environ.get('PYWIKIBOT_TEST_PROD_ONLY', '0') == '1' if (data.get('code') in ('test', 'mediawiki') - and 'PYWIKIBOT_TEST_PROD_ONLY' in os.environ and not dry): + and prod_only and not dry): raise unittest.SkipTest( - 'Site code "{}" and PYWIKIBOT_TEST_PROD_ONLY is set.' + 'Site code {!r} and PYWIKIBOT_TEST_PROD_ONLY is set.' .format(data['code'])) if 'site' not in data and 'code' in data and 'family' in data: @@ -1370,7 +1371,8 @@ def setUpClass(cls): """Set up test class.""" if os.environ.get('PYWIKIBOT_TEST_NO_RC', '0') == '1': - raise unittest.SkipTest('RecentChanges tests disabled.') + raise unittest.SkipTest( + 'PYWIKIBOT_TEST_NO_RC is set; RecentChanges tests disabled.') super().setUpClass() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/743686 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: I13143f91ae031e9698ff3c27a238f7e831278dfd Gerrit-Change-Number: 743686 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Legoktm <legoktm(a)debian.org> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 5 months

[Gerrit] ...core[master]: [doc] fix doc in preload_sites.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/743912 ) Change subject: [doc] fix doc in preload_sites.py ...................................................................... [doc] fix doc in preload_sites.py Change-Id: I73ca7224fa29fa183138b6da27ca05f8b274aaa6 --- M scripts/maintenance/preload_sites.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/maintenance/preload_sites.py b/scripts/maintenance/preload_sites.py index df4446b..c4914d0 100755 --- a/scripts/maintenance/preload_sites.py +++ b/scripts/maintenance/preload_sites.py @@ -8,7 +8,7 @@ Usage: - python pwb.py preload_sites [{<family>}] [-worker{<num>}] + python pwb.py preload_sites [{<family>}] [-worker:{<num>}] To force preloading, change the global expiry value to 0: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/743912 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: I73ca7224fa29fa183138b6da27ca05f8b274aaa6 Gerrit-Change-Number: 743912 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

2 years, 5 months

[Gerrit] ...core[master]: [IMPR] Move generate_family_file.py to pywkibot/scripts

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634544 ) Change subject: [IMPR] Move generate_family_file.py to pywkibot/scripts ...................................................................... [IMPR] Move generate_family_file.py to pywkibot/scripts - move generate_family_file.py to pywikibot/scripts/ This enables to run this scripts from the pywikibot site package using the already implemented pwb code entry point on any location with pwb generate_family_file <options> - Instead of pywikibot/families as target directory the families folder in the base directory is used; create the families folder if necessary. - update imports - update tests - update doc Bug: T107629 Change-Id: I8731ea58afca53da2c20a1ff614c1da4e020b5c5 --- M .gitignore M CONTENT.rst M docs/utilities/index.rst M pywikibot/CONTENT.rst R pywikibot/scripts/generate_family_file.py M tests/generate_family_file_tests.py M tox.ini 7 files changed, 23 insertions(+), 12 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index cefdbd2..9d20600 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ /*.egg /data* /category* +families/ logs* *apicache* *pycache* @@ -17,7 +18,6 @@ .cache .idea pywikibot.egg-info/ -pywikibot/families/ build dist docs/_build/ diff --git a/CONTENT.rst b/CONTENT.rst index 7f42248..9e02e4b 100644 --- a/CONTENT.rst +++ b/CONTENT.rst @@ -16,8 +16,6 @@ +---------------------------+-----------------------------------------------------------+ | Dockerfile-dev | Docker image including developement dependencies | +---------------------------+-----------------------------------------------------------+ - | generate_family_file.py | Creates a new family file | - +---------------------------+-----------------------------------------------------------+ | HISTORY.rst | PyPI version history file | +---------------------------+-----------------------------------------------------------+ | LICENSE | Reference to the MIT license | diff --git a/docs/utilities/index.rst b/docs/utilities/index.rst index 5e61800..0cbd533 100644 --- a/docs/utilities/index.rst +++ b/docs/utilities/index.rst @@ -14,7 +14,7 @@ generate\_family\_file script ----------------------------- -.. automodule:: generate_family_file +.. automodule:: pywikibot.scripts.generate_family_file generate\_user\_files script ---------------------------- diff --git a/pywikibot/CONTENT.rst b/pywikibot/CONTENT.rst index 468259a..0556e3d 100644 --- a/pywikibot/CONTENT.rst +++ b/pywikibot/CONTENT.rst @@ -115,6 +115,8 @@ +----------------------------+------------------------------------------------------+ | scripts | Framework helper scripts and entry points | +============================+======================================================+ + | generate_family_file.py | Creates a new family file | + +----------------------------+------------------------------------------------------+ | generate_user_files.py | Creates user-config.py or user-fixes.py | +----------------------------+------------------------------------------------------+ | pwb.py | Code entry wrapper script (site-package only) | diff --git a/generate_family_file.py b/pywikibot/scripts/generate_family_file.py similarity index 91% rename from generate_family_file.py rename to pywikibot/scripts/generate_family_file.py index f3125f8..f86e655 100755 --- a/generate_family_file.py +++ b/pywikibot/scripts/generate_family_file.py @@ -1,9 +1,11 @@ #!/usr/bin/python """This script generates a family file from a given URL. +This script must be invoked with the pwb wrapper script/code entry point. + Usage:: - generate_family_file.py [<url>] [<name>] [<dointerwiki>] [<verify>] + pwb generate_family_file.py [<url>] [<name>] [<dointerwiki>] [<verify>] Parameters are optional. They must be given consecutively but may be omitted if there is no successor parameter. The parameters are:: @@ -15,9 +17,14 @@ Example:: - generate_family_file.py https://www.mywiki.bogus/wiki/Main_Page mywiki + pwb generate_family_file.py https://www.mywiki.bogus/wiki/Main_Page mywiki -This will create the file mywiki_family.py in pywikibot/families folder +This will create the file mywiki_family.py in families folder of your +base directory. + +.. versionchanged:: 7.0 + moved to pywikibot.scripts folder; create family files in families + folder of your base directory instead of pywikibot/families. """ # # (C) Pywikibot team, 2010-2021 @@ -63,12 +70,15 @@ to keep it enabled. """ from pywikibot.scripts import _import_with_no_user_config - # from pywikibot.site_detect import MWSite + # from pywikibot.site_detect import MWSite and + # from pywikibot.config import base_dir # when required but disable user-config checks # so the family can be created first, # and then used when generating the user-config self.Wiki = _import_with_no_user_config( 'pywikibot.site_detect').site_detect.MWSite + self.base_dir = _import_with_no_user_config( + 'pywikibot.config').config.base_dir self.base_url = url self.name = name @@ -200,8 +210,7 @@ def writefile(self, verify): """Write the family file.""" - fn = os.path.join(os.path.dirname(os.path.realpath(__file__)), - 'pywikibot', 'families', + fn = os.path.join(self.base_dir, 'families', '{}_family.py'.format(self.name)) print('Writing %s... ' % fn) try: @@ -239,6 +248,7 @@ def verify_SSL_certificate(self, code: str) -> bool: return False """ + os.makedirs(os.path.dirname(fn), exist_ok=True) with codecs.open(fn, 'w', 'utf-8') as fh: fh.write(content) diff --git a/tests/generate_family_file_tests.py b/tests/generate_family_file_tests.py index f89341c..1e31ea9 100644 --- a/tests/generate_family_file_tests.py +++ b/tests/generate_family_file_tests.py @@ -9,8 +9,9 @@ from random import sample from urllib.parse import urlparse -import generate_family_file +from pywikibot.scripts import generate_family_file from pywikibot import Site + from tests.aspects import DefaultSiteTestCase diff --git a/tox.ini b/tox.ini index f109f51..5c9e621 100644 --- a/tox.ini +++ b/tox.ini @@ -137,7 +137,6 @@ # N816: mixedCase variable in global scope per-file-ignores = - generate_family_file.py: T001 pwb.py: FI53, T001 pywikibot/__init__.py: N802, N806, N815 pywikibot/_wbtypes.py: N802 @@ -156,6 +155,7 @@ pywikibot/page/__init__.py: N802 pywikibot/page/_collections.py: N802 pywikibot/pagegenerators.py: N802, N803, N806, N816 + pywikibot/scripts/generate_family_file.py: T001 pywikibot/site/_datasite.py: N802 pywikibot/textlib.py: N801, N802, N803, N806 pywikibot/throttle.py: N802 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634544 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: I8731ea58afca53da2c20a1ff614c1da4e020b5c5 Gerrit-Change-Number: 634544 Gerrit-PatchSet: 10 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: AbdealiJK <abdealikothari(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: Hazard-SJ <hazardsjwiki(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm(a)debian.org> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: RhinosF1 <rhinosf1(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: Zppix <Megadev44s.mail(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 5 months

[Gerrit] ...core[master]: [tests] Add Python 3.11 to test matrix

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/743595 ) Change subject: [tests] Add Python 3.11 to test matrix ...................................................................... [tests] Add Python 3.11 to test matrix Also always pass experimental runs Bug: T296371 Change-Id: I751aae0f6c6f7cf1f74a41dbb76468510971529f --- M .github/workflows/pywikibot-ci.yml 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index 059a6f0..a688455 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -14,22 +14,32 @@ build: runs-on: ubuntu-latest + continue-on-error: ${{ matrix.experimental }} strategy: fail-fast: false matrix: python-version: ["3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"] site: ["wikipedia:en", "wikisource:zh"] + experimental: [false] include: - python-version: "3.7" site: "wikipedia:test" + experimental: false - python-version: "3.7" site: "wikidata:test" + experimental: false - python-version: "3.9" site: "wiktionary:ar" + experimental: false - python-version: "3.6" site: "wikidata:wikidata" + experimental: false - python-version: "3.8" site: "wowwiki:uk" + experimental: true + - python-version: "3.11.0-alpha.2" + site: "wikipedia:test" + experimental: true steps: - uses: actions/checkout@v2 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/743595 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: I751aae0f6c6f7cf1f74a41dbb76468510971529f Gerrit-Change-Number: 743595 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Legoktm <legoktm(a)debian.org> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 5 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits December 2021