[beam] branch master updated: Revert "Fix up-to-date checking mechanism on Tox Task."

[ib...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ibzib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 36f9c12  Revert "Fix up-to-date checking mechanism on Tox Task."
     new 4161140  Merge pull request #12977 from ibzib/BEAM-10985
36f9c12 is described below

commit 36f9c1243e96f9d7f114275be427901dc7a7903b
Author: Kyle Weaver <kc...@google.com>
AuthorDate: Wed Sep 30 11:01:08 2020 -0700

    Revert "Fix up-to-date checking mechanism on Tox Task."
    
    This reverts commit 093bea6407f8879d5c9bd8e55b4c833718e956c9.
---
 .../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy   | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index 04e44fe..b6a0740 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -34,7 +34,6 @@ import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.tasks.Copy
 import org.gradle.api.tasks.Exec
 import org.gradle.api.tasks.JavaExec
-import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.bundling.Jar
 import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.api.tasks.javadoc.Javadoc
@@ -1988,7 +1987,6 @@ class BeamModulePlugin implements Plugin<Project> {
             '**/*.pyc',
             'sdks/python/*.egg*/**',
             'sdks/python/test-suites/**',
-            '**/reports/test/index.html',
           ])
           )
       def copiedSrcRoot = "${project.buildDir}/srcs"
@@ -2047,7 +2045,7 @@ class BeamModulePlugin implements Plugin<Project> {
       }
 
       project.ext.toxTask = { name, tox_env ->
-        project.tasks.register(name) {
+        project.tasks.create(name) {
           dependsOn 'setupVirtualenv'
           dependsOn ':sdks:python:sdist'
 
@@ -2064,13 +2062,8 @@ class BeamModulePlugin implements Plugin<Project> {
               args '-c', ". ${project.ext.envdir}/bin/activate && cd ${copiedPyRoot} && scripts/run_tox.sh $tox_env $distTarBall"
             }
           }
-          outputs.cacheIf { true }
-          inputs.files(project.pythonSdkDeps)
-              .withPropertyName('pythonSdkDeps')
-              .withPathSensitivity(PathSensitivity.RELATIVE)
-
-          outputs.dir("${pythonRootDir}/target/.tox/${tox_env}/log/")
-              .withPropertyName('outputLog')
+          inputs.files project.pythonSdkDeps
+          outputs.files project.fileTree(dir: "${pythonRootDir}/target/.tox/${tox_env}/log/")
         }
       }