Xqt has submitted this change. ( 
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1031403?usp=email )

Change subject: [tests] include Python 3.14 to github action tests
......................................................................

[tests] include Python 3.14 to github action tests

Bug: T364812
Change-Id: I41cad5853f544dd3d33eaeebc26797c68b9d96fc
---
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
M .github/workflows/write_tests-ci.yml
5 files changed, 41 insertions(+), 45 deletions(-)

Approvals:
  Xqt: Verified; Looks good to me, approved




diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml
index 064b565..aedfa75 100644
--- a/.github/workflows/doctest.yml
+++ b/.github/workflows/doctest.yml
@@ -5,7 +5,6 @@
   push:
     branches: [ master ]

-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -16,7 +15,7 @@

 jobs:
   build:
-    runs-on: ${{ matrix.os || 'ubuntu-latest'}}
+    runs-on: ${{ matrix.os || ubuntu-latest }}
     timeout-minutes: 10

     strategy:
@@ -24,8 +23,8 @@
       max-parallel: 14

       matrix:
-        os: [ windows-latest, macOS-latest, ubuntu-latest ]
         python-version: [ "pypy3.7", "pypy3.10", "3.7", "3.8", "3.9", "3.10", 
"3.11", "3.12" ]
+        os: [ windows-latest, macOS-latest, ubuntu-latest ]
         include:
           - python-version: "3.13-dev"
           - python-version: "3.14-dev"
diff --git a/.github/workflows/login_tests-ci.yml 
b/.github/workflows/login_tests-ci.yml
index 5cc02a2..10ab653 100644
--- a/.github/workflows/login_tests-ci.yml
+++ b/.github/workflows/login_tests-ci.yml
@@ -23,32 +23,31 @@
       max-parallel: 1

       matrix:
-        python-version: ["pypy3.7", "3.7", "3.8", "3.9", "3.10", "3.11", 
"3.12", "3.13-dev"]
-        site: ['wikipedia:en', 'wikisource:zh', 'wikipedia:test']
+        python-version: [ "pypy3.7", "pypy3.10", "3.7", "3.8", "3.9", "3.10", 
"3.11", "3.12", "3.13-dev", "3.14-dev" ]
+        site: [ wikipedia:en, wikisource:zh, wikipedia:test" ]
         include:
-          - python-version: 3.7
+          - python-version: "3.7"
             site: False
             family: wpbeta
             code: en
-          - python-version: 3.7
+          - python-version: "3.7"
             site: False
             family: wpbeta
             code: zh
-          - python-version: 3.8
+          - python-version: "3.8"
             site: wsbeta:en
-          - python-version: 3.7
+          - python-version: "3.7"
             site: wikidata:test
-          - python-version: 3.9
+          - python-version: "3.9"
             site: wiktionary:ar
-          - python-version: 3.7
+          - python-version: "3.7"
             site: wikidata:wikidata
-          - python-version: 3.8
+          - python-version: "3.8"
             site: wowwiki:uk
           - python-version: 3
             site: wikipedia:de
             os: macOS-latest

-
     steps:
     - name: Checkout Repository
       uses: actions/checkout@v4
@@ -57,14 +56,14 @@

     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5
-      if: ${{ matrix.python-version != '3.13-dev' }}
+      if: "!endsWith(matrix.python-version, '-dev')"
       with:
         python-version: ${{ matrix.python-version }}

-    # use deadsnakes/action until actions/setup-python supports Python 3.13
+    # use deadsnakes/action for development releases
     - name: Set up development Python ${{ matrix.python-version }}
       uses: deadsnakes/action@v3.1.0
-      if: ${{ matrix.python-version == '3.13-dev' }}
+      if: "endsWith(matrix.python-version, '-dev')"
       with:
         python-version: ${{ matrix.python-version }}

@@ -107,7 +106,7 @@
         echo "password_file = os.path.expanduser('passwordfile')" >> 
user-config.py
         echo "('${{ env.PYWIKIBOT_USERNAME }}', '${{ secrets.PYWIKIBOT_USERPWD 
}}')" > passwordfile

-    - name: Test with unittest
+    - name: Login test with unittest
       timeout-minutes: 2
       run: |
         python pwb.py version
diff --git a/.github/workflows/oauth_tests-ci.yml 
b/.github/workflows/oauth_tests-ci.yml
index db48feb..3b32ceb 100644
--- a/.github/workflows/oauth_tests-ci.yml
+++ b/.github/workflows/oauth_tests-ci.yml
@@ -21,19 +21,18 @@

     strategy:
       fail-fast: false
-      max-parallel: 7

       matrix:
-        python-version: ["pypy3.7", "3.7", "3.8", "3.9", "3.10", "3.11", 
"3.12", "3.13-dev"]
-        family: ['wikipedia']
-        code: ['test']
-        domain: ['test.wikipedia.org']
+        python-version: [ "pypy3.7", "pypy3.10", "3.7", "3.8", "3.9", "3.10", 
"3.11", "3.12", "3.13-dev", "3.14-dev" ]
+        family: [ wikipedia ]
+        code: [ test ]
+        domain: [ test.wikipedia.org ]
         include:
-          - python-version: 3.7
+          - python-version: "3.7"
             family: wpbeta
             code: en
             domain: en.wikipedia.beta.wmflabs.org
-          - python-version: 3.7
+          - python-version: "3.7"
             family: wpbeta
             code: zh
             domain: zh.wikipedia.beta.wmflabs.org
@@ -46,14 +45,14 @@

     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5
-      if: ${{ matrix.python-version != '3.13-dev' }}
+      if: "!endsWith(matrix.python-version, '-dev')"
       with:
         python-version: ${{ matrix.python-version }}

-    # use deadsnakes/action until actions/setup-python supports Python 3.13
+    # use deadsnakes/action for development releases
     - name: Set up development Python ${{ matrix.python-version }}
       uses: deadsnakes/action@v3.1.0
-      if: ${{ matrix.python-version == '3.13-dev' }}
+      if: "endsWith(matrix.python-version, '-dev')"
       with:
         python-version: ${{ matrix.python-version }}

diff --git a/.github/workflows/pywikibot-ci.yml 
b/.github/workflows/pywikibot-ci.yml
index c57535b..ecc87ff 100644
--- a/.github/workflows/pywikibot-ci.yml
+++ b/.github/workflows/pywikibot-ci.yml
@@ -26,30 +26,30 @@
       max-parallel: 17

       matrix:
-        python-version: ["pypy3.7", "3.7", "3.8", "3.9", "3.10", "3.11", 
"3.12", "3.13-dev"]
-        site: ['wikipedia:en', 'wikisource:zh']
-        test_prod_only: [true]
+        python-version: [ "pypy3.7", "pypy3.10", "3.7", "3.8", "3.9", "3.10", 
"3.11", "3.12", "3.13-dev", "3.14-dev" ]
+        site: [ wikipedia:en, wikisource:zh ]
+        test_prod_only: [ true ]
         include:
-          - python-version: 3.7
+          - python-version: "3.7"
             site: wikipedia:test
-          - python-version: 3.7
+          - python-version: "3.7"
             site: False
             family: wpbeta
             code: en
-          - python-version: 3.7
+          - python-version: "3.7"
             site: False
             family: wpbeta
             code: zh
-          - python-version: 3.8
+          - python-version: "3.8"
             site: wsbeta:en
-          - python-version: 3.7
+          - python-version: "3.7"
             site: wikidata:test
-          - python-version: 3.9
+          - python-version: "3.9"
             site: wiktionary:ar
             test_no_rc: true
-          - python-version: 3.7
+          - python-version: "3.7"
             site: wikidata:wikidata
-          - python-version: 3.8
+          - python-version: "3.8"
             site: wowwiki:uk
           - python-version: "3"
             site: wikipedia:de
@@ -63,14 +63,14 @@

     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5
-      if: ${{ matrix.python-version != '3.13-dev' }}
+      if: "!endsWith(matrix.python-version, '-dev')"
       with:
         python-version: ${{ matrix.python-version }}

-    # use deadsnakes/action until actions/setup-python supports Python 3.13
+    # use deadsnakes/action for development releases
     - name: Set up development Python ${{ matrix.python-version }}
       uses: deadsnakes/action@v3.1.0
-      if: ${{ matrix.python-version == '3.13-dev' }}
+      if: "endsWith(matrix.python-version, '-dev')"
       with:
         python-version: ${{ matrix.python-version }}

diff --git a/.github/workflows/write_tests-ci.yml 
b/.github/workflows/write_tests-ci.yml
index d5bbf07..27a5623 100644
--- a/.github/workflows/write_tests-ci.yml
+++ b/.github/workflows/write_tests-ci.yml
@@ -21,12 +21,11 @@

     strategy:
       fail-fast: false
-      max-parallel: 1

       matrix:
-        python-version: ["3.7"]
-        site: ['wikipedia:test']
-        experimental: [true]
+        python-version: [ "3.7" ]
+        site: [ wikipedia:test ]
+        experimental: [ true ]

     steps:
     - name: Checkout Repository

--
To view, visit 
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1031403?usp=email
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: I41cad5853f544dd3d33eaeebc26797c68b9d96fc
Gerrit-Change-Number: 1031403
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <i...@gno.de>
Gerrit-Reviewer: Xqt <i...@gno.de>
Gerrit-MessageType: merged
_______________________________________________
Pywikibot-commits mailing list -- pywikibot-commits@lists.wikimedia.org
To unsubscribe send an email to pywikibot-commits-le...@lists.wikimedia.org

Reply via email to