Merge branch 'main' into dev-under-wasi

Author: brettcannon

Lib/test/test_urllib2.py

@@ -1453,8 +1453,15 @@ def test_redirect_fragment(self):
         fp = o.open('http://www.example.com')
         self.assertEqual(fp.geturl(), redirected_url.strip())
 
+    def unset_proxy_env(self):
+        # Keep the test independent from proxy-related environment settings.
+        env = self.enterContext(os_helper.EnvironmentVarGuard())
+        env.unset("http_proxy", "https_proxy", "all_proxy", "no_proxy",
+                  "HTTP_PROXY", "HTTPS_PROXY", "ALL_PROXY", "NO_PROXY")
+
     def test_redirect_no_path(self):
         # Issue 14132: Relative redirect strips original path
+        self.unset_proxy_env()
 
         # clear _opener global variable
         self.addCleanup(urllib.request.urlcleanup)
@@ -1488,6 +1495,7 @@ def http_open(self, req):
                     b'123'
                 )
                 return result
+        self.unset_proxy_env()
         handler = Handler()
         opener = urllib.request.build_opener(handler)
         tests = (

Platforms/WASI/README.md

@@ -132,7 +132,7 @@ python3 Platforms/WASI build --quiet --logdir cross-build/logs
 ```
 
 
-### Packaging
+### Releasing
 
 The `package` command is used to gather all the files necessary to make a
 release and place them in an archive:
@@ -158,6 +158,16 @@ existing `dist/` directory before gathering files.
 
 There is no command just to archive the gathered files.
 
+To do a release build from `build` to `package`, you can use the `release`
+command:
+
+```shell
+python3 Platforms/WASI release
+```
+
+Any release-specific build flags will be set via `release`. It will also run
+`clean`.
+
 
 ### Paths
 

Platforms/WASI/__main__.py

@@ -73,6 +73,9 @@ def main():
     gather = subcommands.add_parser(
         "gather", help="Gather all the files for distribution"
     )
+    release = subcommands.add_parser(
+        "release", help="Build and package for a release"
+    )
     path = subcommands.add_parser(
         "path", help="Print the path to a build or distribution directory"
     )
@@ -96,6 +99,7 @@ def main():
         make_host,
         pythoninfo_host,
         build_host,
+        release,
     ):
         subcommand.add_argument(
             "--quiet",
@@ -135,7 +139,7 @@ def main():
         subcommand.add_argument(
             "args", nargs="*", help="Extra arguments to pass to `configure`"
         )
-    for subcommand in build, configure_host, build_host:
+    for subcommand in build, configure_host, build_host, release:
         subcommand.add_argument(
             "--wasi-sdk",
             type=pathlib.Path,
@@ -162,6 +166,7 @@ def main():
         gather,
         package,
         path,
+        release,
     ):
         subcommand.add_argument(
             "--host-triple",
@@ -213,6 +218,15 @@ def main():
         case "package":
             _package.gather(context)
             _package.archive(context)
+        case "release":
+            context.args = ["--without-static-libpython"]
+            _build.clean_contents(context)
+            _build.configure_build_python(context)
+            _build.make_build_python(context)
+            _build.configure_wasi_python(context)
+            _build.make_wasi_python(context)
+            _package.gather(context)
+            _package.archive(context)
         case "path":
             paths = {
                 "build-python": "build_python_path",