Skip to content

Commit 7c79116

Browse files
committed
Reverted logic that has flake8 run in different venv
Modified the Flake8Task to once again inherit from AbstractPythonMainSourceDefaultTask and use the original virtual environment instead of having a dedicated venv just for it's run. Deleted the AbstractPythonInfrastructureDefaultTask as Flake8Task was the only class using it. Modified PythonPlugin to have flake8 be added as a build configuration instead of it's own configuration. Deleted unit and integration tests ensuring that flake8 was run in its own environment.
1 parent d95a800 commit 7c79116

File tree

7 files changed

+6
-374
lines changed

7 files changed

+6
-374
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
docker:
55
- image: openjdk:8-jdk
66
environment:
7-
_JAVA_OPTIONS: "-Xmx1024m -Xms256m"
7+
_JAVA_OPTIONS: "-Xmx768m -Xms256m"
88
GRADLE_OPTS: -Dorg.gradle.jvmargs=-Xmx1024m -Dorg.gradle.daemon=false
99
steps:
1010
- run:

pygradle-plugin/src/integTest/groovy/com/linkedin/gradle/python/plugin/ParallelWheelsIntegrationTest.groovy

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -92,20 +92,6 @@ class ParallelWheelsIntegrationTest extends Specification {
9292

9393
then:
9494
out.toString() == "Hello World${ System.getProperty("line.separator") }".toString()
95-
96-
when:
97-
println "======================="
98-
result = GradleRunner.create()
99-
.withProjectDir(testProjectDir.root)
100-
101-
.withArguments('flake8', '--stacktrace', '--info')
102-
.withPluginClasspath()
103-
.withDebug(true)
104-
.build()
105-
println result.output
106-
107-
then:
108-
result.task(':foo:parallelWheels') == null //the task isn't part of the graph
10995
}
11096

11197
@IgnoreIf({ OperatingSystem.current() == OperatingSystem.WINDOWS })

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242

4343
import static com.linkedin.gradle.python.util.StandardTextValues.CONFIGURATION_BOOTSTRAP_REQS;
4444
import static com.linkedin.gradle.python.util.StandardTextValues.CONFIGURATION_BUILD_REQS;
45-
import static com.linkedin.gradle.python.util.StandardTextValues.CONFIGURATION_FLAKE8;
4645
import static com.linkedin.gradle.python.util.StandardTextValues.CONFIGURATION_PYDOCS;
4746
import static com.linkedin.gradle.python.util.StandardTextValues.CONFIGURATION_PYTHON;
4847
import static com.linkedin.gradle.python.util.StandardTextValues.CONFIGURATION_SETUP_REQS;
@@ -156,15 +155,11 @@ private static void createConfigurations(Project project) {
156155

157156
project.getConfigurations().create(CONFIGURATION_BOOTSTRAP_REQS.getValue());
158157
project.getConfigurations().create(CONFIGURATION_SETUP_REQS.getValue());
159-
Configuration buildReq = project.getConfigurations().create(CONFIGURATION_BUILD_REQS.getValue());
158+
project.getConfigurations().create(CONFIGURATION_BUILD_REQS.getValue());
160159
project.getConfigurations().create(CONFIGURATION_PYDOCS.getValue());
161160
project.getConfigurations().create(CONFIGURATION_TEST.getValue());
162161
project.getConfigurations().create(CONFIGURATION_VENV.getValue());
163-
Configuration flake8 = project.getConfigurations().create(CONFIGURATION_FLAKE8.getValue());
164162
project.getConfigurations().create(CONFIGURATION_WHEEL.getValue());
165-
166-
//So flake8 will be installed into the activate-able venv
167-
buildReq.extendsFrom(flake8);
168163
}
169164

170165
/*
@@ -183,7 +178,7 @@ private static void configureVendedDependencies(Project project, PythonExtension
183178
project.getDependencies().add(CONFIGURATION_SETUP_REQS.getValue(), settings.forcedVersions.get("pip"));
184179
project.getDependencies().add(CONFIGURATION_SETUP_REQS.getValue(), settings.forcedVersions.get("setuptools-git"));
185180

186-
project.getDependencies().add(CONFIGURATION_FLAKE8.getValue(), settings.forcedVersions.get("flake8"));
181+
project.getDependencies().add(CONFIGURATION_BUILD_REQS.getValue(), settings.forcedVersions.get("flake8"));
187182

188183
project.getDependencies().add(CONFIGURATION_BUILD_REQS.getValue(), settings.forcedVersions.get("Sphinx"));
189184

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

Lines changed: 0 additions & 270 deletions
This file was deleted.

0 commit comments

Comments
 (0)