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

Change subject: tests: install fake_useragent != 2.0 for Python 3.8 ......................................................................

tests: install fake_useragent != 2.0 for Python 3.8

Bug: T381715 Change-Id: I5da177c5a1d2f7f09fa4ea7c45d6266c6b74a839 --- M .github/workflows/pywikibot-ci.yml M .github/workflows/sysop_write_tests-ci.yml M .github/workflows/windows_tests.yml M setup.py 4 files changed, 4 insertions(+), 4 deletions(-)

Approvals: jenkins-bot: Verified Xqt: Verified; Looks good to me, approved

diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index 4a1c62e..0c9e7da 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -82,7 +82,6 @@ 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 - pip install "fake_useragent != 2.0; python_version=='3.8'"

- name: Install setuptools if: ${{ (matrix.python-version >= '3.12') || (matrix.os == 'macOS-latest') }} diff --git a/.github/workflows/sysop_write_tests-ci.yml b/.github/workflows/sysop_write_tests-ci.yml index d0bf618..a840945 100644 --- a/.github/workflows/sysop_write_tests-ci.yml +++ b/.github/workflows/sysop_write_tests-ci.yml @@ -44,7 +44,6 @@ pip --version 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 "fake_useragent != 2.0; python_version=='3.8'"

- name: Generate user files run: | diff --git a/.github/workflows/windows_tests.yml b/.github/workflows/windows_tests.yml index d927743..1abdf46 100644 --- a/.github/workflows/windows_tests.yml +++ b/.github/workflows/windows_tests.yml @@ -53,7 +53,6 @@ pip install -r dev-requirements.txt pip install -r requirements.txt pip install wikitextparser - pip install "fake_useragent != 2.0; python_version=='3.8'"

- name: Generate user files run: | diff --git a/setup.py b/setup.py index f360bf8..6c6e4c2 100755 --- a/setup.py +++ b/setup.py @@ -54,7 +54,10 @@ 'mwoauth!=0.3.1,>=0.2.4', ], 'html': ['beautifulsoup4>=4.7.1'], - 'http': ['fake-useragent>=1.4.0'], + 'http': [ + 'fake-useragent>=1.4.0; python_version > "3.8"', + 'fake-useragent>=1.4.0, < 2.0.0; python_version < "3.9"', # T381715 + ], }