Adapt requirements and tests

Author: Cito

.github/workflows/release-docs.yml

@@ -8,14 +8,14 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@v5
-    - name: Set up Python 3.12
+    - name: Set up Python 3.11
       uses: actions/setup-python@v6
       with:
-        python-version: "3.12"
+        python-version: "3.11"
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

.github/workflows/test-package.yml

@@ -5,12 +5,12 @@ on: [push]
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     timeout-minutes: 5
     strategy:
       max-parallel: 6
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.9', 'pypy-3.10', 'pypy-3.11']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.9', 'pypy-3.10', 'pypy-3.11']
 
     steps:
     - uses: actions/checkout@v5
@@ -23,11 +23,11 @@ jobs:
         python -m pip install --upgrade pip
         pip install .[tests] --use-pep517
     - name: Lint with flake8
-      if: matrix.python-version == '3.12'
+      if: matrix.python-version == '3.11'
       run: |
         flake8 webware setup.py --count --exit-zero --statistics
     - name: Lint with pylint
-      if: matrix.python-version == '3.12'
+      if: matrix.python-version == '3.11'
       run: |
         pylint webware
     - name: Run all unit tests

setup.py

@@ -11,18 +11,18 @@
     long_description = fh.read()
 
 requireDocs = [
-    'Sphinx>=5,<7', 'sphinx_rtd_theme>=1.1'
+    'Sphinx>=5,<9', 'sphinx_rtd_theme>=1.1,<4'
 ]
 requireDev = [
     'Pygments>=2.14,<3', 'WebTest>=3,<4',
-    'waitress>=2,<3', 'hupper>=1.10,<2',
+    'waitress>=2,<4', 'hupper>=1.10,<2',
 ]
 requireExamples = [
     'DBUtils>=3,<4', 'dominate>=2.7,<3', 'yattag>=1.15,<2',
-    'Pygments>=2.14,<3', 'Pillow>=8,<10'
+    'Pygments>=2.14,<3', 'Pillow>=8,<11'
 ]
 requireTests = [
-    'psutil>=5.9,<6', 'flake8>=5,<7', 'pylint>=2.13,<3', 'tox>=3.28,<5',
+    'psutil>=5.9,<8', 'flake8>=7,<9', 'pylint>=2.16,<3', 'tox>=3.28,<5',
     'pywin32>=300,<400;'
     'sys_platform=="win32" and implementation_name=="cpython"'
 ] + requireDev + requireExamples

tox.ini

@@ -1,27 +1,27 @@
 [tox]
-envlist = py{36,37,38,39,310,311,312}, pypy3, flake8, pylint, docs, manifest
+envlist = py3{6,7,8,9,10,11,12}, pypy3{9,10}, flake8, pylint, docs, manifest
 
 [testenv:flake8]
-basepython = python3.12
-deps = flake8>=6,<7
+basepython = python3.11
+deps = flake8>=7,<9
 commands =
     flake8 webware setup.py
 
 [testenv:pylint]
-basepython = python3.12
+basepython = python3.11
 deps = pylint>=2.16,<3
 commands =
     pylint webware
 
 [testenv:docs]
-basepython = python3.12
+basepython = python3.11
 extras =
     docs
 commands =
     sphinx-build -b html -nEW docs docs/_build/html
 
 [testenv:manifest]
-basepython = python3.12
+basepython = python3.11
 deps = check-manifest>=0.49
 commands =
     check-manifest -v

webware/Tests/TestEndToEnd/TestExamples.py

@@ -419,7 +419,7 @@ def testImageDemo(self):
         r = self.testApp.get('/ImageDemo?fmt=.png')
         self.assertEqual(r.status, '200 OK')
         self.assertEqual(r.content_type, 'image/png')
-        self.assertTrue(2000 < r.content_length < 2500)
+        self.assertTrue(2000 < r.content_length < 4500)
         self.assertTrue(r.body.startswith(b'\x89PNG\r\n\x1a\n'))
 
     def testDominateDemo(self):

webware/Tests/TestEndToEnd/TestServer.py

@@ -203,11 +203,16 @@ def testExitCode(self):
 
     def testExpectedServerOutput(self):
         expectedOutput = expectedServerOutput.strip().splitlines()
-        self.compareOutput(self.output, expectedOutput)
+        output = self.output
+        self.compareOutput(output, expectedOutput)
         startLine = f'Webware for Python {self.version} Application'
-        self.assertEqual(self.output[0], startLine)
+        if 'UserWarning' in output[0]:
+            del output[0]
+            while output[0].startswith(' '):
+                del output[0]
+        self.assertEqual(output[0], startLine)
         self.assertTrue(not any(
-            'ERROR' in line or 'WARNING' in line for line in self.output))
+            'ERROR' in line or 'WARNING' in line for line in output))
 
     def testStartPage(self):
         self.assertTrue(self.running)