[GR-13591] Test pip install in venv and pip list in gate

PullRequest: graalpython/430

Author: timfel

graalpython/com.oracle.graal.python.test/src/tests/test_venv.py

@@ -37,22 +37,31 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-import tempfile
-import sys
-import shutil
 import os
+import re
+import shutil
 import subprocess
+import sys
+import tempfile
 
 
 class VenvTest():
     def setUp(self):
         self.env_dir = os.path.realpath(tempfile.mkdtemp())
+        self.env_dir2 = os.path.realpath(tempfile.mkdtemp())
 
     def tearDown(self):
         shutil.rmtree(self.env_dir)
+        shutil.rmtree(self.env_dir2)
 
     def test_create_and_use_basic_venv(self):
         subprocess.check_output([sys.executable, "-m", "venv", self.env_dir, "--without-pip"])
         run = subprocess.getoutput(". %s/bin/activate; python -m site" % self.env_dir)
         assert "ENABLE_USER_SITE: False" in run, run
         assert self.env_dir in run, run
+
+    def test_create_and_use_venv_with_pip(self):
+        subprocess.check_output([sys.executable, "-m", "venv", self.env_dir2])
+        run = subprocess.getoutput("%s/bin/python -m pip list" % self.env_dir2)
+        assert "pip" in run, run
+        assert "setuptools" in run, run

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/WeakRefModuleBuiltins.java

@@ -137,18 +137,23 @@ public PReferenceType refType(LazyPythonClass cls, Object object, @SuppressWarni
 
         @Specialization(guards = "!isNativeObject(object)")
         public PReferenceType refType(LazyPythonClass cls, Object object, Object callback) {
-            return factory().createReferenceType(cls, object, callback, getWeakReferenceQueue());
+            if (callback instanceof PNone) {
+                return factory().createReferenceType(cls, object, null, getWeakReferenceQueue());
+            } else {
+                return factory().createReferenceType(cls, object, callback, getWeakReferenceQueue());
+            }
         }
 
         @Specialization
         public PReferenceType refType(LazyPythonClass cls, PythonAbstractNativeObject pythonObject, Object callback,
                         @Cached("create()") GetLazyClassNode getClassNode,
                         @Cached("create()") IsBuiltinClassProfile profile) {
+            Object actualCallback = callback instanceof PNone ? null : callback;
             LazyPythonClass clazz = getClassNode.execute(pythonObject);
 
             // if the object is a type, a weak ref is allowed
             if (profile.profileClass(clazz, PythonBuiltinClassType.PythonClass)) {
-                return factory().createReferenceType(cls, pythonObject, callback, getWeakReferenceQueue());
+                return factory().createReferenceType(cls, pythonObject, actualCallback, getWeakReferenceQueue());
             }
 
             // if the object's type is a native type, we need to consider 'tp_weaklistoffset'
@@ -159,10 +164,10 @@ public PReferenceType refType(LazyPythonClass cls, PythonAbstractNativeObject py
                 }
                 Object tpWeaklistoffset = getTpWeaklistoffsetNode.execute(clazz);
                 if (tpWeaklistoffset != PNone.NO_VALUE) {
-                    return factory().createReferenceType(cls, pythonObject, callback, getWeakReferenceQueue());
+                    return factory().createReferenceType(cls, pythonObject, actualCallback, getWeakReferenceQueue());
                 }
             }
-            return refType(cls, pythonObject, callback);
+            return refType(cls, pythonObject, actualCallback);
         }
 
         @Fallback

mx.graalpython/suite.py

@@ -9,7 +9,7 @@
     "name": "graalpython",
     "versionConflictResolution": "latest",
 
-    "version": "1.0.0-rc14",
+    "version": "1.0.0-rc15",
     "release": False,
     "groupId": "org.graalvm.graalpython",
     "url": "http://www.graalvm.org/",