Merge branch 'main' into solvingj/add_url_config

Author: Zoran Simic

src/portable_python/cpython.py

@@ -8,8 +8,8 @@
 from runez.pyenv import Version
 
 from portable_python import LOG, patch_file, patch_folder, PPG, PythonBuilder
-from portable_python.external.tkinter import TkInter
 from portable_python.external.xcpython import Bdb, Bzip2, Gdbm, LibFFI, Openssl, Readline, Sqlite, Uuid, Xz, Zlib
+from portable_python.external.xtkinter import TkInter
 from portable_python.inspector import LibAutoCorrect, PythonInspector
 
 # https://github.com/docker-library/python/issues/160
@@ -232,7 +232,7 @@ def _finalize(self):
 
                 self.run_python(cmd)
 
-            self.run_python("-mpip", "install", *runez.flattened(additional))
+            self.run_python("-mpip", "install", "--no-cache-dir", "--upgrade", *runez.flattened(additional))
 
         runez.abort_if(not runez.DRYRUN and not self.bin_python, f"Can't find bin/python in {self.bin_folder}")
         PPG.config.ensure_main_file_symlinks(self)

src/portable_python/external/tkinter.py src/portable_python/external/xtkinter.pysrc/portable_python/external/tkinter.py renamed to src/portable_python/external/xtkinter.py

@@ -11,7 +11,7 @@ def test_config(cli):
 
     cli.run("-ntmacos-arm64", "-c", cli.tests_path("sample-config1.yml"), "build", "3.9.7", "-mnone")
     assert cli.succeeded
-    assert " -mpip install my-additional-package" in cli.logged
+    assert " -mpip install --no-cache-dir --upgrade my-additional-package" in cli.logged
     assert "env MACOSX_DEPLOYMENT_TARGET=12" in cli.logged  # Comes from more specific macos-arm64.yml
     assert " -> dist/cpython-3.9.7-macos-arm64.tar.xz" in cli.logged  # Comes from macos.yml (not defined in macos-arm64.yml)
     cli.match("Would run: build/cpython-.../bin/python -mpip install -U wheel")