diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 012a2b62d6..3fb2008caf 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -295,6 +295,11 @@ jobs: run: | mkdir site-packages target/release/rustpython --install-pip ensurepip --user + - if: runner.os != 'Windows' + name: Check that ensurepip succeeds. + run: | + target/release/rustpython -m ensurepip + target/release/rustpython -c "import pip" - name: Check whats_left is not broken run: python -I whats_left.py diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py index a8ce7472bc..f14b138bbe 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -851,6 +851,10 @@ def _main(): print() _print_dict('Variables', get_config_vars()) +# XXX RUSTPYTHON: replace python with rustpython in all these paths +for group in _INSTALL_SCHEMES.values(): + for key in group.keys(): + group[key] = group[key].replace("Python", "RustPython").replace("python", "rustpython") if __name__ == '__main__': _main() diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py index b072c0dedf..a1238bf206 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -141,6 +141,8 @@ def test_get_preferred_schemes(self): self.assertIsInstance(schemes, dict) self.assertEqual(set(schemes), expected_schemes) + # NOTE: RUSTPYTHON this is hardcoded to 'python', we're set up for failure. + @unittest.expectedFailure def test_posix_venv_scheme(self): # The following directories were hardcoded in the venv module # before bpo-45413, here we assert the posix_venv scheme does not regress