Merge pull request #320 from zvezdan/venv-update

Upgrade to virtualenv-16.1.0.

Author: zvezdan

pivy-importer/build.gradle

@@ -65,7 +65,7 @@ task importRequiredDependencies(type: JavaExec) { task ->
         'setuptools-git:1.2',
         'six:1.11.0',
         'Sphinx:1.8.1',
-        'virtualenv:16.0.0',
+        'virtualenv:16.1.0',
         'wheel:0.31.1',
     ].join(" ")
     def forceDeps = [

pygradle-plugin/src/main/groovy/com/linkedin/gradle/python/PythonExtension.groovy

@@ -75,7 +75,7 @@ class PythonExtension {
         'setuptools-git': ['group': 'pypi', 'name': 'setuptools-git', 'version': '1.2'],
         'six'           : ['group': 'pypi', 'name': 'six', 'version': '1.11.0'],
         'Sphinx'        : ['group': 'pypi', 'name': 'Sphinx', 'version': '1.8.1'],
-        'virtualenv'    : ['group': 'pypi', 'name': 'virtualenv', 'version': '16.0.0'],
+        'virtualenv'    : ['group': 'pypi', 'name': 'virtualenv', 'version': '16.1.0'],
         'wheel'         : ['group': 'pypi', 'name': 'wheel', 'version': '0.31.1'],
     ]
 

pygradle-plugin/src/main/groovy/com/linkedin/gradle/python/tasks/action/CreateVirtualEnvAction.java

@@ -73,14 +73,19 @@ public void buildVenv(@Nullable Consumer<File> customize) {
             customize.accept(packageDir);
         }
 
+        // In virtualenv-16.1.0 the install script was relocated and will be in 17+.
+        Path installScriptPath = Paths.get(packageDir.toString(), "virtualenv.py");
+        if (!Files.exists(installScriptPath)) {
+            installScriptPath = Paths.get(packageDir.toString(), "src", "virtualenv.py");
+        }
+
+        final File installScript = installScriptPath.toFile();
         OutputStream outputStream = new ByteArrayOutputStream();
         ExecResult execResult = project.exec(execSpec -> {
             container.setOutputs(execSpec);
-            // For virtualenv >= 16.1, use and invoke via `-m virtualenv` below.
-            // execSpec.environment("PYTHONPATH", new File(packageDir, "src"));
             execSpec.commandLine(
                 pythonDetails.getSystemPythonInterpreter(),
-                new File(packageDir, "virtualenv.py"),
+                installScript,
                 "--never-download",
                 "--python", pythonDetails.getSystemPythonInterpreter(),
                 "--prompt", pythonDetails.getVirtualEnvPrompt(),

pygradle-plugin/src/main/groovy/com/linkedin/gradle/python/tasks/action/VirtualEnvCustomizer.java

@@ -19,6 +19,7 @@
 import com.linkedin.gradle.python.tasks.exec.ExternalExec;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
+import org.gradle.process.ExecResult;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -31,7 +32,8 @@
 import java.util.function.Consumer;
 
 public class VirtualEnvCustomizer implements Consumer<File> {
-
+    private static final int NO_CHANGE = 0;
+    private static final int CHANGED = 1;
     private static final Logger log = Logging.getLogger(VirtualEnvCustomizer.class);
 
     private final String distutilsCfg;
@@ -57,12 +59,30 @@ public void accept(File file) {
                 throw new UncheckedIOException(e);
             }
 
+            // Since virtualenv-16.2.0 the rebuild script was renamed and relocated.
+            Path rebuildScriptPath = path.resolve(Paths.get("bin", "rebuild-script.py"));
+            if (!Files.exists(rebuildScriptPath)) {
+                rebuildScriptPath = path.resolve(Paths.get("tasks", "update_embedded.py"));
+            }
+
             final ByteArrayOutputStream stream = new ByteArrayOutputStream();
-            exec.exec(execSpec -> {
-                execSpec.commandLine(pythonDetails.getSystemPythonInterpreter(), path.resolve(Paths.get("bin", "rebuild-script.py")).toFile());
+            final File rebuildScript = rebuildScriptPath.toFile();
+            ExecResult execResult = exec.exec(execSpec -> {
+                execSpec.commandLine(pythonDetails.getSystemPythonInterpreter(), rebuildScript);
                 execSpec.setStandardOutput(stream);
                 execSpec.setErrorOutput(stream);
+                execSpec.setIgnoreExitValue(true);
             });
+
+            /*
+             * Starting with virtualenv-16.1.0 the rebuild script returns 1 when there's a change.
+             * Since the change is exactly what we want, we cannot allow the failure for exit code 1.
+             */
+            if (execResult.getExitValue() != NO_CHANGE && execResult.getExitValue() != CHANGED) {
+                log.lifecycle(stream.toString());
+                execResult.assertNormalExitValue();
+            }
+
             log.info("Customized distutils.cfg");
         }
     }