update pypiserver and test to deal with pkg_resources deprecation

pjjw · pjjw · commit 8718454bab4e · 2026-04-15T16:20:01.000-04:00
diff --git a/examples/wheel/requirements_server.in b/examples/wheel/requirements_server.in
@@ -1,2 +1,2 @@
 # This is for running publishing tests
-pypiserver
+pypiserver>=2.2.0
diff --git a/examples/wheel/requirements_server.txt b/examples/wheel/requirements_server.txt
@@ -4,9 +4,17 @@
 #
 #    bazel run //examples/wheel:requirements_server.update
 #
-pypiserver==2.0.1 \
-    --hash=sha256:1dd98fb99d2da4199fb44c7284e57d69a9f7fda2c6c8dc01975c151c592677bf \
-    --hash=sha256:7b58fbd54468235f79e4de07c4f7a9ff829e7ac6869bef47ec11e0710138e162
+importlib-resources==7.1.0 \
+    --hash=sha256:0722d4c6212489c530f2a145a34c0a7a3b4721bc96a15fada5930e2a0b760708 \
+    --hash=sha256:1bd7b48b4088eddb2cd16382150bb515af0bd2c70128194392725f82ad2c96a1
+    # via pypiserver
+packaging==26.1 \
+    --hash=sha256:5d9c0669c6285e491e0ced2eee587eaf67b670d94a19e94e3984a481aba6802f \
+    --hash=sha256:f042152b681c4bfac5cae2742a55e103d27ab2ec0f3d88037136b6bfe7c9c5de
+    # via pypiserver
+pypiserver==2.4.1 \
+    --hash=sha256:156540f87ecfd6db06ae2c16e25ae5afe4fda6f510bd1c34e46fbb0c491bcd9e \
+    --hash=sha256:45f116d0bff6aafcaed002cfad48a6832e62a82393e3a9b447d5c41a0e310fff
     # via -r examples/wheel/requirements_server.in
 
 # The following packages are considered to be unsafe in a requirements file:
diff --git a/examples/wheel/test_publish.py b/examples/wheel/test_publish.py
@@ -6,6 +6,7 @@
 import unittest
 from contextlib import closing
 from pathlib import Path
+from urllib.error import URLError
 from urllib.request import urlopen
 
 
@@ -50,17 +51,16 @@ def setUp(self):
             ],
         )
 
-        line = "Hit Ctrl-C to quit"
         interval = 0.1
         wait_seconds = 40
         for _ in range(int(wait_seconds / interval)):  # 40 second timeout
-            current_logs = self.log_file.read_text()
-            if line in current_logs:
-                print(current_logs.strip())
-                print("...")
-                break
-
-            time.sleep(0.1)
+            try:
+                with urlopen(self.url, timeout=1) as response:
+                    if response.status == 200:
+                        break
+            except (URLError, OSError):
+                pass
+            time.sleep(interval)
         else:
             raise RuntimeError(
                 f"Could not get the server running fast enough, waited for {wait_seconds}s"
@@ -98,13 +98,15 @@ def test_upload_and_query_simple_api(self):
             got_content = response.read().decode("utf-8")
             want_content = """
 <!DOCTYPE html>
-<html>
+<html lang="en">
     <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>Links for example-minimal-library</title>
     </head>
     <body>
         <h1>Links for example-minimal-library</h1>
-             <a href="/packages/example_minimal_library-0.0.1-py3-none-any.whl#sha256=ef5afd9f6c3ff569ef7e5b2799d3a2ec9675d029414f341e0abd7254d6b9a25d">example_minimal_library-0.0.1-py3-none-any.whl</a><br>
+            <a href="/packages/example_minimal_library-0.0.1-py3-none-any.whl#sha256=ef5afd9f6c3ff569ef7e5b2799d3a2ec9675d029414f341e0abd7254d6b9a25d">example_minimal_library-0.0.1-py3-none-any.whl</a><br>
     </body>
 </html>"""
             self.assertEqual(

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# This is for running publishing tests`
`2`		`-pypiserver`
	`2`	`+pypiserver>=2.2.0`