Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13500 discussions

[Gerrit] ...core[master]: [tests] Update github actions
by Xqt (Code Review) 10 Nov '22

10 Nov '22

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

1 0

[Gerrit] ...core[master]: [test] Improvements for oauth_tests-ci.yml
by jenkins-bot (Code Review) 09 Nov '22

09 Nov '22

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

1 0

[Gerrit] ...core[master]: [tests] oauth does not have a logout function, no need to restrict pa...
by Xqt (Code Review) 09 Nov '22

09 Nov '22

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/854878 ) Change subject: [tests] oauth does not have a logout function, no need to restrict parallel runs ...................................................................... [tests] oauth does not have a logout function, no need to restrict parallel runs Change-Id: Ifffffbacde419d78b06ebd7723290495d6dea79b --- M .github/workflows/oauth_tests-ci.yml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/oauth_tests-ci.yml b/.github/workflows/oauth_tests-ci.yml index e1eadaf..658ada7 100644 --- a/.github/workflows/oauth_tests-ci.yml +++ b/.github/workflows/oauth_tests-ci.yml @@ -20,10 +20,10 @@ strategy: fail-fast: false - max-parallel: 1 + max-parallel: 8 matrix: - python-version: ["pypy3.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["pypy3.7", "3.12", "3.11", "3.10", "3.9", "3.8", "3.7", "3.6"] family: ['wikipedia'] code: ['test'] domain: ['test.wikipedia.org'] -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/854878 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Ifffffbacde419d78b06ebd7723290495d6dea79b Gerrit-Change-Number: 854878 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [tests] Update CI tests
by Xqt (Code Review) 09 Nov '22

09 Nov '22

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

1 0

[Gerrit] ...core[master]: [doc] Fix version hints
by Xqt (Code Review) 09 Nov '22

09 Nov '22

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

1 0

[Gerrit] ...core[master]: [test] Fix User.usercontribs test
by jenkins-bot (Code Review) 08 Nov '22

08 Nov '22

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

1 0

[Gerrit] ...core[master]: [test] Run login tests even main tests were no successful
by Xqt (Code Review) 08 Nov '22

08 Nov '22

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

1 0

[Gerrit] ...core[master]: [tests] Enable Appveyor tests with Python 3.11
by Xqt (Code Review) 08 Nov '22

08 Nov '22

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/854418 ) Change subject: [tests] Enable Appveyor tests with Python 3.11 ...................................................................... [tests] Enable Appveyor tests with Python 3.11 Change-Id: Ief0d74946709c0b83a70ed4fb3113b78ca60274d --- M .appveyor.yml 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.appveyor.yml b/.appveyor.yml index 2deca7a..e9544db 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -42,6 +42,10 @@ PYTHON_VERSION: "3.10.x" PYTHON_ARCH: "32" + - PYTHON: "C:\\Python311-x64" + PYTHON_VERSION: "3.11.x" + PYTHON_ARCH: "64" + matrix: fast_finish: false -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/854418 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: Ief0d74946709c0b83a70ed4fb3113b78ca60274d Gerrit-Change-Number: 854418 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [tests] Enable oauth_tests.py
by jenkins-bot (Code Review) 08 Nov '22

08 Nov '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/854415 ) Change subject: [tests] Enable oauth_tests.py ...................................................................... [tests] Enable oauth_tests.py Change-Id: I7a60a7740d2f756a09e07dac4d4eb1328c43a948 --- M .github/workflows/oauth_tests-ci.yml M tests/__init__.py M tests/oauth_tests.py 3 files changed, 5 insertions(+), 12 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.github/workflows/oauth_tests-ci.yml b/.github/workflows/oauth_tests-ci.yml index 465cdb7..09dec5f 100644 --- a/.github/workflows/oauth_tests-ci.yml +++ b/.github/workflows/oauth_tests-ci.yml @@ -69,7 +69,6 @@ uses: jungwinter/split@v2 id: split with: - # msg: ${{ env._oauth_token_val }} msg: ${{ secrets[format('{0}', steps.token.outputs.uppercase)] }} separator: ":" @@ -98,15 +97,15 @@ 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_OAUTHPWD }}')" > passwordfile - name: Test with unittest timeout-minutes: 1 + env: + ${{ steps.token.outputs.uppercase }}: ${{ secrets[format('{0}', steps.token.outputs.uppercase)] }} run: | python pwb.py version coverage run -m unittest -vv tests/site_login_logout_tests.py + coverage run -m unittest -vv tests/oauth_tests.py - name: Upload coverage to Codecov run: codecov \ No newline at end of file diff --git a/tests/__init__.py b/tests/__init__.py index 5b2b952..c4b9b3c 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -104,7 +104,6 @@ 'memento', 'mysql', 'namespace', - 'oauth', 'page', 'pagegenerators', 'paraminfo', diff --git a/tests/oauth_tests.py b/tests/oauth_tests.py index 2885c98..242c126 100755 --- a/tests/oauth_tests.py +++ b/tests/oauth_tests.py @@ -26,7 +26,7 @@ def _get_oauth_tokens(self): """Get valid OAuth tokens from environment variables.""" - tokens_env = 'OAUTH_TOKENS_' + self.family.upper() + tokens_env = 'OAUTH_TOKEN_' + self.family.upper() tokens = os.environ.get(tokens_env + '_' + self.code.upper()) tokens = tokens or os.environ.get(tokens_env) return tuple(tokens.split(':')) if tokens is not None else None @@ -45,12 +45,7 @@ self.access_token = tokens[2:] -class DefaultOAuthSiteTestCase(DefaultSiteTestCase, OAuthSiteTestCase): - - """Default OAuth site test.""" - - -class TestOauthLoginManger(DefaultOAuthSiteTestCase): +class TestOauthLoginManger(DefaultSiteTestCase, OAuthSiteTestCase): """Test OAuth login manager.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/854415 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: I7a60a7740d2f756a09e07dac4d4eb1328c43a948 Gerrit-Change-Number: 854415 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [test] Fix User.usercontribs test
by jenkins-bot (Code Review) 08 Nov '22

08 Nov '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/854152 ) Change subject: [test] Fix User.usercontribs test ...................................................................... [test] Fix User.usercontribs test Change-Id: I8c7ce01bc24bb637d72012412f6544ed7b323b37 --- M tests/user_tests.py 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/user_tests.py b/tests/user_tests.py index 2b35e1d..0488dca 100755 --- a/tests/user_tests.py +++ b/tests/user_tests.py @@ -175,13 +175,15 @@ """Test the User.usercontribs() method.""" mysite = self.get_site() user = User(mysite, mysite.user()) - uc = list(user.contributions(total=10)) + uc = list(user.contributions(total=50)) if not uc: self.skipTest('User {} has no contributions on site {}.' .format(mysite.user(), mysite)) self.assertLessEqual(len(uc), 10) self.assertEqual(uc[0], user.last_edit) - self.assertEqual(uc[-1], user.first_edit) + first_edit = uc[-1] if len(uc) < 50 else list( + user.contributions(total=1, reverse=True))[0] + self.assertEqual(first_edit, user.first_edit) for contrib in uc: self.assertIsInstance(contrib, tuple) self.assertLength(contrib, 4) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/854152 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: I8c7ce01bc24bb637d72012412f6544ed7b323b37 Gerrit-Change-Number: 854152 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits