[GR-60568] Rename graalpy_virtualenv

PullRequest: graalpython/3654

Author: msimacek

CHANGELOG.md

@@ -26,6 +26,8 @@ language runtime. The main focus is on user-observable behavior of the engine.
   * Deprecated the org.graalvm.python.embedding.util API package and added new equivalents to org.graalvm.python.embedding
   * Maven and Gradle plugins do not embed Python home into the generated virtual filesystem. Instead, the handling of language home for any Truffle language, including GraalPy, for the GraalVM Native Image build can be controlled by new Native Image options +H:IncludeLanguageResources and +H:CopyLanguageResources. By default, the whole Python home is embedded into the native executable. In the case of JVM deployment, the language home is embedded in the GraalPy artifacts at Mavencentral.
   * Removed deprecated methods in VirtualFileSystem
+* No longer ship `graalpy_virtualenv` virtualenv plugin within the standard library. Instead, inject the dependency on it into virtualenv, so that it gets installed only when necessary and can be uninstalled.
+* Rename `graalpy_virtualenv` to `graalpy_virtualenv_seeder`.
 
 ## Version 24.1.0
 * GraalPy is now considered stable for pure Python workloads. While many workloads involving native extension modules work, we continue to consider them experimental. You can use the command-line option `--python.WarnExperimentalFeatures` to enable warnings for such modules at runtime. In Java embeddings the warnings are enabled by default and you can suppress them by setting the context option 'python.WarnExperimentalFeatures' to 'false'.

graalpy_virtualenv/graalpy_virtualenv/__init__.py renamed to graalpy_virtualenv_seeder/graalpy_virtualenv_seeder/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0

graalpy_virtualenv/graalpy_virtualenv/graalpy.py renamed to graalpy_virtualenv_seeder/graalpy_virtualenv_seeder/graalpy.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0

graalpy_virtualenv/pyproject.toml renamed to graalpy_virtualenv_seeder/pyproject.toml

@@ -42,7 +42,7 @@ requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [project]
-name = "graalpy-virtualenv"
+name = "graalpy-virtualenv-seeder"
 version = "0.0.1"
 license = "UPL-1.0"
 authors = [
@@ -58,11 +58,11 @@ dependencies = [
 ]
 
 [project.entry-points."virtualenv.create"]
-graalpy-posix = "graalpy_virtualenv.graalpy:GraalPyPosix"
-graalpy-win = "graalpy_virtualenv.graalpy:GraalPyWindows"
+graalpy-posix = "graalpy_virtualenv_seeder.graalpy:GraalPyPosix"
+graalpy-win = "graalpy_virtualenv_seeder.graalpy:GraalPyWindows"
 
 [project.entry-points."virtualenv.seed"]
-graalpy = "graalpy_virtualenv.graalpy:GraalPySeeder"
+graalpy = "graalpy_virtualenv_seeder.graalpy:GraalPySeeder"
 
 [project.urls]
 Homepage = "https://graalvm.org/python"

graalpython/lib-graalpython/patches/pip-23.2.1.patch

@@ -126,7 +126,7 @@ index a8cd133..20dd1e6 100644
          # We de-duplicate installation paths, since there can be overlap (e.g.
          # file in .data maps to same location as file in wheel root).
 diff --git a/pip/_internal/resolution/resolvelib/candidates.py b/pip/_internal/resolution/resolvelib/candidates.py
-index de04e1d..d5bd355 100644
+index de04e1d..888ba75 100644
 --- a/pip/_internal/resolution/resolvelib/candidates.py
 +++ b/pip/_internal/resolution/resolvelib/candidates.py
 @@ -20,6 +20,7 @@ from pip._internal.req.constructors import (
@@ -142,13 +142,13 @@ index de04e1d..d5bd355 100644
              yield self._factory.make_requirement_from_spec(str(r), self._ireq)
          yield self._factory.make_requires_python_requirement(self.dist.requires_python)
 +        if self.name == 'virtualenv' and not graalpy.DISABLE_PATCHING:
-+            yield self._factory.make_requirement_from_spec('graalpy-virtualenv', self._ireq)
++            yield self._factory.make_requirement_from_spec('graalpy-virtualenv-seeder', self._ireq)
 
      def get_install_requirement(self) -> Optional[InstallRequirement]:
          return self._ireq
 diff --git a/pip/_internal/utils/graalpy.py b/pip/_internal/utils/graalpy.py
 new file mode 100644
-index 0000000..53dbe96
+index 0000000..a976ab5
 --- /dev/null
 +++ b/pip/_internal/utils/graalpy.py
 @@ -0,0 +1,334 @@
@@ -462,8 +462,8 @@ index 0000000..53dbe96
 +        # We need to force the filename to match the usual convention, otherwise we won't find a patch
 +        link = AddedSourceLink(url, f'{name}-{version}.{suffix}')
 +        candidates.append(InstallationCandidate(name=name, version=version, link=link))
-+    if name == 'graalpy-virtualenv':
-+        link = Link(path_to_url(os.path.join(sys.base_prefix, 'graalpy_virtualenv')))
++    if name == 'graalpy-virtualenv-seeder':
++        link = Link(path_to_url(os.path.join(sys.base_prefix, 'graalpy_virtualenv_seeder')))
 +        candidates.append(InstallationCandidate(name=name, version='0.0.1', link=link))
 +    return candidates
 +

graalpython/lib-python/3/ensurepip/_bundled/pip-23.2.1-py3-none-any.whl

@@ -1598,7 +1598,7 @@ def tox_example(args=None):
         "toml==0.10.2",
         "tox==3.24.5",
         "virtualenv==20.13.4",
-        os.path.join(os.path.dirname(graalpy), "..", "graalpy_virtualenv"),
+        os.path.join(os.path.dirname(graalpy), "..", "graalpy_virtualenv_seeder"),
     ]
 
     def get_new_vm(project_name, svm=False, install_libs=None, reuse_existing=False):
@@ -2176,7 +2176,7 @@ def _python_checkpatchfiles():
     support_distributions=[
         'graalpython:GRAALPYTHON_GRAALVM_SUPPORT',
         'graalpython:GRAALPYTHON_GRAALVM_DOCS',
-        'graalpython:GRAALPY_VIRTUALENV',
+        'graalpython:GRAALPY_VIRTUALENV_SEEDER',
     ],
     library_configs=[
         mx_sdk.LanguageLibraryConfig(

mx.graalpython/mx_graalpython.py

@@ -255,9 +255,9 @@
             "source": [],
         },
 
-        "graalpy-virtualenv": {
+        "graalpy-virtualenv-seeder": {
             "type": "python",
-            "path": "graalpy_virtualenv",
+            "path": "graalpy_virtualenv_seeder",
             "source": [],
         }
     },
@@ -1482,12 +1482,12 @@
             "maven": False,
         },
 
-        "GRAALPY_VIRTUALENV": {
+        "GRAALPY_VIRTUALENV_SEEDER": {
             "native": True, # so it produces a tar, not a jar file
             "platformDependent": False,
-            "description": "graalpy-virtualenv plugin sources usable to be installed into other interpreters",
+            "description": "graalpy-virtualenv-seeder plugin sources usable to be installed into other interpreters",
             "layout": {
-                "graalpy_virtualenv": "file:graalpy_virtualenv",
+                "graalpy_virtualenv_seeder": "file:graalpy_virtualenv_seeder",
             },
             "maven": False,
         },