Fix conda test in CI

chaquo · Jul 20, 2023 · d315f47 · d315f47
1 parent 95bd633
commit d315f47
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.github/actions/create-local-properties/action.yml b/.github/actions/create-local-properties/action.yml
@@ -10,3 +10,8 @@ runs:
             java_home_var=JAVA_HOME_${version}_X64
             echo chaquopy.java.home.$version=${!java_home_var} | sed 's|\\|\\\\|g'
         done > product/local.properties
+
+    - if: runner.os == 'Windows'
+      shell: bash
+      run: |
+        echo chaquopy.conda.env=$CONDA | sed 's|\\|\\\\|g' >> product/local.properties
diff --git a/product/gradle-plugin/src/test/integration/data/PythonReqs/conda/app/build.gradle b/product/gradle-plugin/src/test/integration/data/PythonReqs/conda/app/build.gradle
@@ -15,6 +15,7 @@ android {
             pip {
                 install "six"
             }
+            pyc { pip false }  // We don't know what version buildPython will be.
         }
         ndk {
             abiFilters "x86"

diff --git a/product/gradle-plugin/src/test/integration/test_gradle_plugin.py b/product/gradle-plugin/src/test/integration/test_gradle_plugin.py
@@ -824,7 +824,8 @@ def test_download_sdist(self):
         self.assertNotInLong(FILENAME, run.stdout, re=True)
         self.assertNotInLong(BUILD, run.stdout)
 
-    # Test the OpenSSL PATH workaround for conda on Windows.
+    # Test the OpenSSL PATH workaround for conda on Windows. This is not necessary on
+    # Linux because conda uses RPATH on that platform, and I think it's similar on Mac.
     @skipUnless(os.name == "nt", "Windows only")
     def test_conda(self):
         # Remove PATH entries which contain any copy of libssl. If it's installed in
@@ -837,7 +838,7 @@ def test_conda(self):
         self.RunGradle("base", "PythonReqs/conda",
                        env={"chaquopy_conda_env": product_props["chaquopy.conda.env"],
                             "PATH": path},
-                       requirements=["six.py"])
+                       requirements=["six.py"], pyc=["stdlib"])
 
     ISOLATED_KWARGS = dict(
         dist_versions=[("six", "1.14.0"), ("build_requires_six", "1.14.0")],