Change pure-Python package detection from Root-Is-Purelib to wheel tag (closes #1374)

Author: mhsmith

product/gradle-plugin/src/main/python/chaquopy/pip_install.py

@@ -149,8 +149,15 @@ def pip_install(self, abi, reqs):
         # do it manually.
         for dist_info in Path(abi_dir).glob("*.dist-info"):
             try:
+                # pip now installs all packages via wheels, even if they're installed
+                # from source code, so the WHEEL file is guaranteed to exist.
                 wheel_info = email.parser.Parser().parse((dist_info / "WHEEL").open())
-                is_pure = wheel_info.get("Root-Is-Purelib", "false") == "true"
+
+                # If there are multiple tags, we can't know which one matched, so err on
+                # the side of caution. If this causes us to install the same package
+                # twice, that will be dealt with in merge_common.
+                tags = wheel_info.get_all("Tag", [])
+                is_pure = tags and all(tag.endswith("-any") for tag in tags)
 
                 req_tree = {}
                 for row in csv.reader((dist_info / "RECORD").open()):

product/gradle-plugin/src/test/integration/data/PythonReqs/py3_none/app/build.gradle

@@ -0,0 +1,23 @@
+apply plugin: 'com.android.application'
+apply plugin: 'com.chaquo.python'
+
+android {
+    namespace "com.chaquo.python.test"
+    compileSdk 31
+    defaultConfig {
+        applicationId "com.chaquo.python.test"
+        minSdk 24
+        targetSdk 31
+        versionCode 1
+        versionName "0.0.1"
+        python {
+            pip {
+                install "py3_none"
+                options "--find-links", "py3_none/dist"
+            }
+        }
+        ndk {
+            abiFilters "arm64-v8a", "x86_64"
+        }
+    }
+}

product/gradle-plugin/src/test/integration/data/PythonReqs/py3_none/app/py3_none/arm64_v8a.py

@@ -0,0 +1,15 @@
+#!/usr/bin/env python3
+
+import sys
+from setuptools import setup
+
+
+assert len(sys.argv) == 2
+abi = sys.argv[1]
+sys.argv[1:] = ["bdist_wheel", "--plat-name", f"android_24_{abi}"]
+
+setup(
+    name="py3_none",
+    version="0.0.1",
+    py_modules=[abi],
+)

product/gradle-plugin/src/test/integration/data/PythonReqs/py3_none/app/py3_none/dist/py3_none-0.0.1-py3-none-android_24_arm64_v8a.whl

@@ -1228,6 +1228,20 @@ def test_wheel_data(self):
         self.RunGradle("base", "PythonReqs/wheel_data",
                        requirements=["purelib.txt", "platlib.txt"])
 
+    # This package has wheels with `Root-Is-Purelib: true`, but platform tags of the
+    # form `py3-none-android_...`. pip_install.py should treat this as a non-pure
+    # package, and install both ABIs.
+    def test_py3_none(self):
+        self.RunGradle(
+            "base", "PythonReqs/py3_none",
+            abis=["arm64-v8a", "x86_64"],
+            requirements={
+                "common": [],
+                "arm64-v8a": ["arm64_v8a.py"],
+                "x86_64": ["x86_64.py"],
+            },
+        )
+
     # Even with --only-binary, it should still be possible to install a local path to a
     # pure-Python sdist. It's also possible to install a local path to a source
     # directory, which is covered by test_directory.

product/gradle-plugin/src/test/integration/data/PythonReqs/py3_none/app/py3_none/dist/py3_none-0.0.1-py3-none-android_24_x86_64.whl

@@ -0,0 +1 @@
+Improved compatibility with various ways of tagging a wheel as Android-specific.