Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13430 discussions

[Gerrit] ...core[master]: [tests] fix windows_tests.yml
by Xqt (Code Review) 29 Jun '24

29 Jun '24

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1050706?usp=email ) Change subject: [tests] fix windows_tests.yml ...................................................................... [tests] fix windows_tests.yml Change-Id: I0e4e33444b8730e97b004439d6fa3755fdeefeb4 --- M .github/workflows/windows_tests.yml 1 file changed, 2 insertions(+), 22 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/windows_tests.yml b/.github/workflows/windows_tests.yml index f8a4da4..9c2fea2 100644 --- a/.github/workflows/windows_tests.yml +++ b/.github/workflows/windows_tests.yml @@ -66,22 +66,9 @@ if [ -f requirements.txt ]; then pip install -r requirements.txt; fi pip install wikitextparser - - 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 + python -Werror::UserWarning -m pwb generate_user_files -site:${{matrix.site}} -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; 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 @@ -99,16 +86,9 @@ 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}} != 'wikipedia:test' ]; then - coverage run -m unittest discover -vv -p \"*_tests.py\"; - else - pytest --cov=.; - fi + coverage run -m unittest discover -vv -p \"*_tests.py\"; - name: Show coverage statistics run: | -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1050706?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: I0e4e33444b8730e97b004439d6fa3755fdeefeb4 Gerrit-Change-Number: 1050706 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de>

1 0

[Gerrit] ...core[master]: [tests] Remove PYWIKIBOT_TEST_PROD_ONLY test directive
by Xqt (Code Review) 29 Jun '24

29 Jun '24

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1050704?usp=email ) Change subject: [tests] Remove PYWIKIBOT_TEST_PROD_ONLY test directive ...................................................................... [tests] Remove PYWIKIBOT_TEST_PROD_ONLY test directive Prod only tests were introduced as temporary workaround for a bug on Travis with test sites. Tests on Travis was dropped, therefor this teporary fix can be removed after 9 years. Bug: T96943 Change-Id: I25026b59b6bfc0049b16ea3ff8034189d3a00264 --- M .github/workflows/pywikibot-ci.yml M .github/workflows/windows_tests.yml M tests/aspects.py 3 files changed, 0 insertions(+), 10 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index 511f07b..c85c233 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -28,7 +28,6 @@ matrix: python-version: [ "pypy3.7", "pypy3.10", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13.0-alpha - 3.13.0", "3.14-dev" ] site: [ "wikipedia:en", "wikisource:zh" ] - test_prod_only: [ true ] include: - python-version: "3.7" site: wikipedia:test @@ -122,7 +121,6 @@ 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 if [ ${{matrix.site || 0}} != 'wikipedia:test' ]; then diff --git a/.github/workflows/windows_tests.yml b/.github/workflows/windows_tests.yml index afa0b9a..f8a4da4 100644 --- a/.github/workflows/windows_tests.yml +++ b/.github/workflows/windows_tests.yml @@ -29,7 +29,6 @@ python-version: [ "3.7.0", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13.0-alpha - 3.13.0" ] python-arch: [ x64, x86 ] site: [ "wikipedia:en" ] - test_prod_only: [ false ] experimental: [ true ] steps: @@ -103,7 +102,6 @@ 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 if [ ${{matrix.site || 0}} != 'wikipedia:test' ]; then diff --git a/tests/aspects.py b/tests/aspects.py index 3b22a58..a64d9b9 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -893,13 +893,7 @@ if dry: interface = DrySite - prod_only = os.environ.get('PYWIKIBOT_TEST_PROD_ONLY', '0') == '1' for data in cls.sites.values(): - if (data.get('code') in ('test', 'mediawiki') - and prod_only and not dry): - raise unittest.SkipTest(f"Site code {data['code']!r} and" - ' PYWIKIBOT_TEST_PROD_ONLY is set.') - if 'site' not in data and 'code' in data and 'family' in data: with suppress_warnings(WARN_SITE_CODE, category=UserWarning): data['site'] = Site(data['code'], data['family'], -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1050704?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: I25026b59b6bfc0049b16ea3ff8034189d3a00264 Gerrit-Change-Number: 1050704 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
by jenkins-bot (Code Review) 29 Jun '24

29 Jun '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1050564?usp=email ) Change subject: [doc] Update ROADMAP.rst ...................................................................... [doc] Update ROADMAP.rst Change-Id: I37bcef3d36aa022682d9c3839d89bd4f67d089ee --- M ROADMAP.rst 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/ROADMAP.rst b/ROADMAP.rst index 29cc47f..4c59145 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,7 +1,12 @@ Current Release Changes ======================= -* (no changes yet) +* use :meth:`page.BasePage.templates` in :meth:`Page.templatesWithParams<page.Page.templatesWithParams>` to cache + templates +* Re-implement :meth:`Page.main_authors()<page._toolforge.WikiBlameMixin.main_authors>` as + :meth:`Page.authorship()<page._toolforge.WikiBlameMixin.authorship>` using ``xtools`` (:phab:`T366100`); + ``wikitextparser`` packages is required for it. + Current Deprecations ==================== -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1050564?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: I37bcef3d36aa022682d9c3839d89bd4f67d089ee Gerrit-Change-Number: 1050564 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] Fix url_image url
by jenkins-bot (Code Review) 29 Jun '24

29 Jun '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1050699?usp=email ) Change subject: [fix] Fix url_image url ...................................................................... [fix] Fix url_image url Bug: T368814 Change-Id: I8b467c11810e2c9cc1987474efd1aad7d5e8344c --- M tests/proofreadpage_tests.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py index ac576da..c6811d8 100755 --- a/tests/proofreadpage_tests.py +++ b/tests/proofreadpage_tests.py @@ -249,7 +249,7 @@ 'footer': '\n{{smallrefs}}', 'url_image': ('https://upload.wikimedia.org/wikipedia/commons/' 'thumb/a/ac/Popular_Science_Monthly_Volume_1.djvu/' - 'page12-2267px-Popular_Science_Monthly_Volume_1.djvu' + 'page12-2012px-Popular_Science_Monthly_Volume_1.djvu' '.jpg'), } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1050699?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: I8b467c11810e2c9cc1987474efd1aad7d5e8344c Gerrit-Change-Number: 1050699 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Mpaa <mpaa.wiki(a)gmail.com>

1 0

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

27 Jun '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/1050342?usp=email ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: Idd94cdb49709f186e13dd740563184e8c5f24b8a --- M weblinkchecker/he.json 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/weblinkchecker/he.json b/weblinkchecker/he.json index 2226aa9..a6a8c7a 100644 --- a/weblinkchecker/he.json +++ b/weblinkchecker/he.json @@ -4,9 +4,9 @@ "Amire80" ] }, - "weblinkchecker-archive_msg": "עמוד האינטרנט נשמר על־ידי ארכיון האינטרנט. אנא שקלו לקשר לגרסה המאורכבת המתאימה: [%(URL)s]", + "weblinkchecker-archive_msg": "דף הווב נשמר על־ידי ארכיון האינטרנט. נא לשקול לקשר לגרסה המאורכבת המתאימה: [%(URL)s].", "weblinkchecker-badurl": "נראה שהקישור שניתן הוא לא URL תקין", "weblinkchecker-caption": "קישור שבור", - "weblinkchecker-report": "במהלך כמה ריצות אוטומטיות של הבוט, נמצא שהקישור החיצוני הבא אינו זמין. אנא בדקו אם הקישור אכן שבור, ותקנו אותו או הסירו אותו במקרה הזה!", + "weblinkchecker-report": "במהלך כמה ריצות אוטומטיות של הבוט, נמצא שהקישור החיצוני הבא אינו זמין. נא לבדוק אם הקישור אכן שבור, ולתקן אותו או להסיר אותו במקרה הזה!", "weblinkchecker-summary": "בוט: מדווח על קישור חיצוני בלתי זמין" } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/1050342?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: Idd94cdb49709f186e13dd740563184e8c5f24b8a Gerrit-Change-Number: 1050342 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]: [tests] Simplify TestCaseBase._get_gen_pages() method
by jenkins-bot (Code Review) 26 Jun '24

26 Jun '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1049916?usp=email ) Change subject: [tests] Simplify TestCaseBase._get_gen_pages() method ...................................................................... [tests] Simplify TestCaseBase._get_gen_pages() method - remove count parameter of TestCaseBase._get_gen_pages() because it was never used within the last 9 years - update the calling methods accordingly Change-Id: I3bb43a1eb07784ea525511cafdd1dfbb30ebaa2d --- M tests/aspects.py 1 file changed, 27 insertions(+), 42 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/aspects.py b/tests/aspects.py index 18da72f..3b22a58 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -12,7 +12,6 @@ from __future__ import annotations import inspect -import itertools import os import re import sys @@ -27,7 +26,7 @@ import pywikibot from pywikibot import Site, config -from pywikibot.backports import removeprefix, removesuffix +from pywikibot.backports import Iterable, Iterator, removeprefix, removesuffix from pywikibot.comms import http from pywikibot.data.api import Request as _original_Request from pywikibot.exceptions import ( @@ -133,33 +132,21 @@ self.assertIn(page.namespace(), namespaces, f'{page} not in namespace {namespaces!r}') - def _get_gen_pages(self, gen, count: int = None, site=None): - """ - Get pages from gen, asserting they are Page from site. + def _get_gen_pages(self, + gen: Iterable[pywikibot.Page], + site: pywikibot.site.APISite = None) -> None: + """Get pages from gen, asserting they are Page from site. - Iterates at most two greater than count, including the - Page after count if it exists, and then a Page with title '...' - if additional items are in the iterator. + .. versionchanged:: 9.3 + the *count* parameter was dropped; all pages from *gen* are + tested. :param gen: Page generator - :type gen: typing.Iterable[pywikibot.Page] - :param count: number of pages to get :param site: Site of expected pages - :type site: pywikibot.site.APISite + :meta public: """ - original_iter = iter(gen) - - gen = itertools.islice(original_iter, 0, count) - gen_pages = list(gen) - with suppress(StopIteration): - gen_pages.append(next(original_iter)) - next(original_iter) - if not site: - site = gen_pages[0].site - gen_pages.append(pywikibot.Page(site, '...')) - for page in gen_pages: self.assertIsInstance(page, pywikibot.Page) if site: @@ -167,9 +154,9 @@ return gen_pages - def _get_gen_titles(self, gen, count: int, site=None) -> list[str]: + def _get_gen_titles(self, gen, site=None) -> list[str]: """Return a list of page titles of given iterable.""" - return [page.title() for page in self._get_gen_pages(gen, count, site)] + return [page.title() for page in self._get_gen_pages(gen, site)] @staticmethod def _get_canonical_titles(titles, site=None): @@ -220,38 +207,36 @@ self.assertEqual(page_namespaces, namespaces) - def assertPageTitlesEqual(self, gen, titles, site=None): - """ - Test that pages in gen match expected titles. - - Only iterates to the length of titles plus two. + def assertPageTitlesEqual( + self, + gen: Iterable[pywikibot.Page], + titles: Iterator[str], + site: pywikibot.site.APISite | None = None + ) -> None: + """Test that pages in gen match expected titles. :param gen: Page generator - :type gen: typing.Iterable[pywikibot.Page] :param titles: Expected titles - :type titles: iterator :param site: Site of expected pages - :type site: pywikibot.site.APISite """ titles = self._get_canonical_titles(titles, site) - gen_titles = self._get_gen_titles(gen, len(titles), site) + gen_titles = self._get_gen_titles(gen, site) self.assertEqual(gen_titles, titles) - def assertPageTitlesCountEqual(self, gen, titles, site=None): - """ - Test that pages in gen match expected titles, regardless of order. - - Only iterates to the length of titles plus two. + def assertPageTitlesCountEqual( + self, + gen: Iterable[pywikibot.Page], + titles: Iterator[str], + site: pywikibot.site.APISite | None = None + ) -> None: + """Test that pages in gen match expected titles, regardless of order. :param gen: Page generator - :type gen: typing.Iterable[pywikibot.Page] :param titles: Expected titles - :type titles: iterator :param site: Site of expected pages - :type site: pywikibot.site.APISite """ titles = self._get_canonical_titles(titles, site) - gen_titles = self._get_gen_titles(gen, len(titles), site) + gen_titles = self._get_gen_titles(gen, site) self.assertCountEqual(gen_titles, titles) def assertAPIError(self, code, info=None, callable_obj=None, *args, -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1049916?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: I3bb43a1eb07784ea525511cafdd1dfbb30ebaa2d Gerrit-Change-Number: 1049916 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: [tests] fix github action config file
by Xqt (Code Review) 24 Jun '24

24 Jun '24

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1049256?usp=email ) Change subject: [tests] fix github action config file ...................................................................... [tests] fix github action config file Change-Id: I5c2f06d2d9767acf88a21bdb71167768c261e1c3 Signed-off-by: Xqt <info(a)gno.de> --- M .github/workflows/windows_tests.yml 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/windows_tests.yml b/.github/workflows/windows_tests.yml index e61495a..afa0b9a 100644 --- a/.github/workflows/windows_tests.yml +++ b/.github/workflows/windows_tests.yml @@ -60,9 +60,9 @@ python -c "import struct; print('PYTHON_ARCH:', struct.calcsize('P') << 3)" python -m pip install --upgrade pip pip --version - if [ ${{matrix.python-version}} == '3.7.0'; then pip install "urllib3<2.0"; fi - if [ ${{matrix.python-version}} == '3.7.0'; then pip install -U setuptools; fi - if [ ${{matrix.python-version}} >= '3.12'; then pip install -U setuptools; fi + if [ ${{matrix.python-version}} == '3.7.0' ]; then pip install "urllib3<2.0"; fi + if [ ${{matrix.python-version}} == '3.7.0' ]; then pip install -U setuptools; fi + if [ ${{matrix.python-version}} >= '3.12' ]; then pip install -U setuptools; fi 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 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1049256?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: I5c2f06d2d9767acf88a21bdb71167768c261e1c3 Gerrit-Change-Number: 1049256 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: [tests] Run windows tests on windows
by Xqt (Code Review) 24 Jun '24

24 Jun '24

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1049233?usp=email ) Change subject: [tests] Run windows tests on windows ...................................................................... [tests] Run windows tests on windows Change-Id: I97fa8b82401c97b2168b2e7bd933677bbec91854 --- M .github/workflows/windows_tests.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/windows_tests.yml b/.github/workflows/windows_tests.yml index 661f476..e61495a 100644 --- a/.github/workflows/windows_tests.yml +++ b/.github/workflows/windows_tests.yml @@ -17,7 +17,7 @@ jobs: build: - runs-on: ${{ matrix.os || 'ubuntu-latest' }} + runs-on: ${{ matrix.os || 'windows-latest' }} continue-on-error: ${{ matrix.experimental || false }} timeout-minutes: 100 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1049233?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: I97fa8b82401c97b2168b2e7bd933677bbec91854 Gerrit-Change-Number: 1049233 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: [tests] Add experimental Windows tests as successor for Appveyor tests
by Xqt (Code Review) 24 Jun '24

24 Jun '24

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1049229?usp=email ) Change subject: [tests] Add experimental Windows tests as successor for Appveyor tests ...................................................................... [tests] Add experimental Windows tests as successor for Appveyor tests Bug: T368192 Change-Id: Ieb737cbebb734cc0babcfab063102d683f70b687 --- M .github/workflows/doctest.yml M .github/workflows/oauth_tests-ci.yml M .github/workflows/pywikibot-ci.yml M .github/workflows/sysop_write_tests-ci.yml A .github/workflows/windows_tests.yml 5 files changed, 131 insertions(+), 3 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml index 56c5c54..a8c91f0 100644 --- a/.github/workflows/doctest.yml +++ b/.github/workflows/doctest.yml @@ -20,7 +20,7 @@ strategy: fail-fast: false - max-parallel: 14 + max-parallel: 17 matrix: python-version: [ "pypy3.7", "pypy3.10", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13.0-alpha - 3.13.0" ] diff --git a/.github/workflows/oauth_tests-ci.yml b/.github/workflows/oauth_tests-ci.yml index 64598d0..598833d 100644 --- a/.github/workflows/oauth_tests-ci.yml +++ b/.github/workflows/oauth_tests-ci.yml @@ -20,6 +20,7 @@ strategy: fail-fast: false + max-parallel: 8 matrix: python-version: [ "pypy3.7", "pypy3.10", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13.0-alpha - 3.13.0", "3.14-dev" ] diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index d45d1ef..511f07b 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -1,5 +1,5 @@ name: Pywikibot CI -# Run Pywikibot tests with a variety of Python versions +# Run Pywikibot tests with a variety of Python versions on: push: @@ -23,7 +23,7 @@ strategy: fail-fast: false - max-parallel: 17 + max-parallel: 18 matrix: python-version: [ "pypy3.7", "pypy3.10", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13.0-alpha - 3.13.0", "3.14-dev" ] diff --git a/.github/workflows/sysop_write_tests-ci.yml b/.github/workflows/sysop_write_tests-ci.yml index 6d692cb..9d6219f 100644 --- a/.github/workflows/sysop_write_tests-ci.yml +++ b/.github/workflows/sysop_write_tests-ci.yml @@ -21,6 +21,7 @@ strategy: fail-fast: false + max-parallel: 2 matrix: python-version: [ "3.7" ] diff --git a/.github/workflows/windows_tests.yml b/.github/workflows/windows_tests.yml new file mode 100644 index 0000000..661f476 --- /dev/null +++ b/.github/workflows/windows_tests.yml @@ -0,0 +1,126 @@ +name: Windows Tests +# Successor for Appveyor Tests + +on: + push: + branches: [ master, stable ] + pull_request: + branches: [ master ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +env: + PYWIKIBOT_TEST_RUNNING: 1 + PYWIKIBOT_USERNAME: Pywikibot-test + +jobs: + build: + runs-on: ${{ matrix.os || 'ubuntu-latest' }} + continue-on-error: ${{ matrix.experimental || false }} + timeout-minutes: 100 + + strategy: + fail-fast: false + max-parallel: 10 + + matrix: + python-version: [ "3.7.0", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13.0-alpha - 3.13.0" ] + python-arch: [ x64, x86 ] + site: [ "wikipedia:en" ] + test_prod_only: [ false ] + experimental: [ true ] + + 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 }} + architecture: ${{ matrix.python-arch }} + + # use deadsnakes/action for development releases + - name: Set up development Python ${{ matrix.python-version }} + uses: deadsnakes/action(a)v3.1.0 + if: "endsWith(matrix.python-version, '-dev')" + with: + python-version: ${{ matrix.python-version }} + architecture: ${{ matrix.python-arch }} + + - name: Install dependencies + 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}} == '3.7.0'; then pip install "urllib3<2.0"; fi + if [ ${{matrix.python-version}} == '3.7.0'; then pip install -U setuptools; fi + if [ ${{matrix.python-version}} >= '3.12'; then pip install -U setuptools; fi + 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: 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 }} + PYWIKIBOT_TEST_PROD_ONLY: ${{ matrix.test_prod_only && 1 || 0 }} + run: | + python pwb.py version + if [ ${{matrix.site || 0}} != 'wikipedia:test' ]; then + coverage run -m unittest discover -vv -p \"*_tests.py\"; + else + pytest --cov=.; + fi + + - name: Show coverage statistics + run: | + coverage report + + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v4 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + + - name: Check on failure + if: steps.ci_test.outcome == 'failure' + run: exit 1 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1049229?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: Ieb737cbebb734cc0babcfab063102d683f70b687 Gerrit-Change-Number: 1049229 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-CC: jenkins-bot

1 0

[Gerrit] ...core[master]: [make_dist] additional tests for make_dist.py
by Xqt (Code Review) 24 Jun '24

24 Jun '24

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1049191?usp=email ) Change subject: [make_dist] additional tests for make_dist.py ...................................................................... [make_dist] additional tests for make_dist.py also update coverage. Change-Id: Ifb12cec13ce6f61f021df3818a2f71b3554e58f0 --- M make_dist.py M tests/make_dist_tests.py 2 files changed, 29 insertions(+), 12 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/make_dist.py b/make_dist.py index cc498e2..2c0ca36 100755 --- a/make_dist.py +++ b/make_dist.py @@ -109,7 +109,7 @@ if self.local or self.remote or self.clear: self.clear_old_dist() if self.clear: - return True # pragma: no cover + return True if self.upgrade: # pragma: no cover check_call('python -m pip install --upgrade pip', shell=True) @@ -125,16 +125,22 @@ for module in ('build', 'twine'): try: import_module(module) - except ModuleNotFoundError as e: # pragma: no cover + except ModuleNotFoundError as e: error(f'<<lightred>>{e}') info('<<lightblue>>You may use -upgrade option to install') return False + return self.build() # pragma: no cover + def build(self) -> bool: # pragma: no cover + """Build the packages. + + .. versionadded:: 9.3 + """ self.copy_files() info('<<lightyellow>>Build package') try: check_call('python -m build') - except Exception as e: # pragma: no cover + except Exception as e: error(e) return False finally: @@ -142,7 +148,7 @@ info('<<lightyellow>>Check package and description') if run('twine check dist/*', shell=True).returncode: - return False # pragma: no cover + return False if self.local: info('<<lightyellow>>Install locally') @@ -153,7 +159,7 @@ if self.remote and input_yn( '<<lightblue>>Upload dist to pypi', automatic_quit=False): - check_call('twine upload dist/*', shell=True) # pragma: no cover + check_call('twine upload dist/*', shell=True) return True @@ -172,7 +178,7 @@ self.target = target self.source = source - def copy_files(self) -> None: + def copy_files(self) -> None: # pragma: no cover """Copy i18n files to pywikibot.scripts folder. Pywikibot i18n files are used for some translations. They are copied @@ -186,7 +192,7 @@ shutil.copytree(self.source, self.target) info('done') - def cleanup(self) -> None: + def cleanup(self) -> None: # pragma: no cover """Remove all copied files from pywikibot scripts folder.""" info('<<lightyellow>>Remove copied files... ', newline=False) shutil.rmtree(self.target) diff --git a/tests/make_dist_tests.py b/tests/make_dist_tests.py index 26d498f..699c666 100755 --- a/tests/make_dist_tests.py +++ b/tests/make_dist_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """Tests for fixes module.""" # -# (C) Pywikibot team, 2022-2023 +# (C) Pywikibot team, 2022-2024 # # Distributed under the terms of the MIT license. # @@ -10,6 +10,7 @@ import sys import unittest +import make_dist from pywikibot import __version__ from tests.aspects import TestCase @@ -22,20 +23,30 @@ def test_handle_args_empty(self): """Test make_dist handle_args function.""" - from make_dist import handle_args - args = handle_args() + args = make_dist.handle_args() self.assertEqual(args, (False, ) * 4) def test_handle_args(self): """Test make_dist handle_args function.""" - from make_dist import handle_args sys.argv += ['-clear', '-local', '-remote', '-upgrade'] - local, remote, clear, upgrade = handle_args() + local, remote, clear, upgrade = make_dist.handle_args() self.assertTrue(local) self.assertEqual(remote, 'dev' not in __version__) self.assertTrue(clear) self.assertTrue(upgrade) + def test_main(self): + """Test main result.""" + saved_argv = sys.argv + sys.argv = saved_argv + ['-clear'] + self.assertTrue(make_dist.main()) + + # no build or twine modules + self.assertFalse(make_dist.main()) + sys.argv = saved_argv + ['-local'] + self.assertFalse(make_dist.main()) + sys.argv = saved_argv + if __name__ == '__main__': unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1049191?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: Ifb12cec13ce6f61f021df3818a2f71b3554e58f0 Gerrit-Change-Number: 1049191 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

← Newer
1
2
3
4
5
6
7
...
1343
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits