Xqt has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1203269?usp=email )
Change subject: tests: always use actions/setup-python to install Python
releases
......................................................................
tests: always use actions/setup-python to install Python releases
For development releases allow-prereleases switch is used;
drop deadsnakes/action.
Change-Id: I40dcb2986efe03a8234c2336d2e641b2721ec091
---
M .github/workflows/doctest.yml
M .github/workflows/login_tests-ci.yml
M .github/workflows/oauth_tests-ci.yml
M .github/workflows/pre-commit.yml
M .github/workflows/pywikibot-ci.yml
M .github/workflows/sysop_write_tests-ci.yml
M .github/workflows/windows_tests.yml
7 files changed, 15 insertions(+), 46 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml
index 0828db4..95d1287 100644
--- a/.github/workflows/doctest.yml
+++ b/.github/workflows/doctest.yml
@@ -32,16 +32,9 @@
submodules: true
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v6
- if: "!endsWith(matrix.python-version, '-dev')"
with:
python-version: ${{ matrix.python-version }}
-
- # use deadsnakes/action for development releases
- - name: Set up development Python ${{ matrix.python-version }}
- uses: deadsnakes/[email protected]
- if: endsWith(matrix.python-version, '-dev')
- with:
- python-version: ${{ matrix.python-version }}
+ allow-prereleases: ${{ endsWith(matrix.python-version, '-dev') }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
diff --git a/.github/workflows/login_tests-ci.yml
b/.github/workflows/login_tests-ci.yml
index 702d9bf..25068f5 100644
--- a/.github/workflows/login_tests-ci.yml
+++ b/.github/workflows/login_tests-ci.yml
@@ -37,7 +37,7 @@
name: Run Login/Logout Tests
runs-on: ${{ matrix.os || 'ubuntu-latest' }}
needs: wait_for_all
- timeout-minutes: 30
+ timeout-minutes: 45
strategy:
fail-fast: false
max-parallel: 1
@@ -77,16 +77,9 @@
submodules: true
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v6
- if: "!endsWith(matrix.python-version, '-dev')"
with:
python-version: ${{ matrix.python-version }}
-
- # use deadsnakes/action for development releases
- - name: Set up development Python ${{ matrix.python-version }}
- uses: deadsnakes/[email protected]
- if: endsWith(matrix.python-version, '-dev')
- with:
- python-version: ${{ matrix.python-version }}
+ allow-prereleases: ${{ endsWith(matrix.python-version, '-dev') }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
diff --git a/.github/workflows/oauth_tests-ci.yml
b/.github/workflows/oauth_tests-ci.yml
index 6584f05..5b3a902 100644
--- a/.github/workflows/oauth_tests-ci.yml
+++ b/.github/workflows/oauth_tests-ci.yml
@@ -44,16 +44,9 @@
submodules: true
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v6
- if: "!endsWith(matrix.python-version, '-dev')"
with:
python-version: ${{ matrix.python-version }}
-
- # use deadsnakes/action for development releases
- - name: Set up development Python ${{ matrix.python-version }}
- uses: deadsnakes/[email protected]
- if: endsWith(matrix.python-version, '-dev')
- with:
- python-version: ${{ matrix.python-version }}
+ allow-prereleases: ${{ endsWith(matrix.python-version, '-dev') }}
- name: Get token name
env:
_oauth_token: OAUTH_TOKEN_${{ matrix.family }}_${{ matrix.code }}
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index d2880f0..3e6479d 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -17,6 +17,7 @@
jobs:
pre-commit:
+ timeout-minutes: 10
runs-on: ${{ matrix.os || 'ubuntu-latest' }}
continue-on-error: ${{ matrix.experimental || false }}
strategy:
@@ -35,15 +36,10 @@
- python-version: 3.15-dev
steps:
- name: set up python ${{ matrix.python-version }}
- if: "!endsWith(matrix.python-version, '-dev')"
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
- - name: set up development python ${{ matrix.python-version }}
- if: endsWith(matrix.python-version, '-dev')
- uses: deadsnakes/[email protected]
- with:
- python-version: ${{ matrix.python-version }}
+ allow-prereleases: ${{ endsWith(matrix.python-version, '-dev') }}
- name: checkout
uses: actions/checkout@v5
with:
@@ -53,4 +49,3 @@
env:
SKIP: copyright
timeout-minutes: 5
- timeout-minutes: 100
diff --git a/.github/workflows/pywikibot-ci.yml
b/.github/workflows/pywikibot-ci.yml
index de0939d..e704cd0 100644
--- a/.github/workflows/pywikibot-ci.yml
+++ b/.github/workflows/pywikibot-ci.yml
@@ -20,7 +20,7 @@
build:
runs-on: ${{ matrix.os || 'ubuntu-latest' }}
continue-on-error: ${{ matrix.experimental || false }}
- timeout-minutes: 100
+ timeout-minutes: 90
strategy:
fail-fast: false
matrix:
@@ -65,16 +65,9 @@
submodules: true
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v6
- if: "!endsWith(matrix.python-version, '-dev')"
with:
python-version: ${{ matrix.python-version }}
-
- # use deadsnakes/action for development releases
- - name: Set up development Python ${{ matrix.python-version }}
- uses: deadsnakes/[email protected]
- if: endsWith(matrix.python-version, '-dev')
- with:
- python-version: ${{ matrix.python-version }}
+ allow-prereleases: ${{ endsWith(matrix.python-version, '-dev') }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
@@ -115,7 +108,7 @@
- name: Test with unittest or pytest
id: ci_test
continue-on-error: true
- timeout-minutes: 90
+ timeout-minutes: 45
env:
PYWIKIBOT_TEST_NO_RC: ${{ (matrix.site == 'wikisource:zh' ||
matrix.test_no_rc) && 1 || 0 }}
run: |
diff --git a/.github/workflows/sysop_write_tests-ci.yml
b/.github/workflows/sysop_write_tests-ci.yml
index 2645b80..2ae6b6f 100644
--- a/.github/workflows/sysop_write_tests-ci.yml
+++ b/.github/workflows/sysop_write_tests-ci.yml
@@ -18,7 +18,7 @@
build:
runs-on: ubuntu-latest
continue-on-error: ${{ matrix.experimental || false }}
- timeout-minutes: 100
+ timeout-minutes: 30
strategy:
fail-fast: false
matrix:
@@ -34,6 +34,7 @@
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
+ allow-prereleases: ${{ endsWith(matrix.python-version, '-dev') }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
@@ -54,7 +55,7 @@
- name: Sysop and write tests with pytest
id: ci_test
continue-on-error: true
- timeout-minutes: 90
+ timeout-minutes: 25
env:
PYWIKIBOT_TEST_WRITE: ${{ matrix.site == 'wikipedia:test' && 1 || 0
}}
run: |
diff --git a/.github/workflows/windows_tests.yml
b/.github/workflows/windows_tests.yml
index 9eac771..cccc1ff 100644
--- a/.github/workflows/windows_tests.yml
+++ b/.github/workflows/windows_tests.yml
@@ -18,7 +18,7 @@
build:
runs-on: windows-latest
continue-on-error: ${{ matrix.experimental || false }}
- timeout-minutes: 100
+ timeout-minutes: 45
strategy:
fail-fast: false
matrix:
@@ -34,6 +34,7 @@
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
+ allow-prereleases: ${{ endsWith(matrix.python-version, '-dev') }}
architecture: ${{ matrix.python-arch }}
- name: Install dependencies
shell: powershell
@@ -67,7 +68,7 @@
- name: Test with unittest
id: ci_test
continue-on-error: true
- timeout-minutes: 90
+ timeout-minutes: 40
env:
PYTHONIOENCODING: utf-8
run: |
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1203269?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: I40dcb2986efe03a8234c2336d2e641b2721ec091
Gerrit-Change-Number: 1203269
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
