Skip to content

Commit 3737677

Browse files
committed
Upgrade flake8 to 3.7.9.
Have to use no-build-isolation option for pip on a few integration tests because flake8-3.7.x depends on entrypoints that require flit in a build_system section of the toml file. We don't need that since we already have a package with flit-built setup.py. In future release of flake8 entrypoints are replaced with importlib-metadata, so this dependency will not cause us issues any more, but the no-build-isolation setting should be fine in the tests even in that case.
1 parent 12052d2 commit 3737677

File tree

4 files changed

+25
-5
lines changed

4 files changed

+25
-5
lines changed

pivy-importer/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ task importRequiredDependencies(type: JavaExec) { task ->
5252
'sphinx_rtd_theme:0.1.0=sphinx_rtd_theme:0.1.1', // candidate for removal
5353
].join(",")
5454
def packagesToInclude = [
55-
'flake8:3.6.0',
55+
'flake8:3.7.9',
5656
'Flask:0.12.2',
5757
'pbr:5.1.1',
5858
'pex:1.5.2',

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@ class FailureReasonProviderIntegrationTest extends Specification {
3434
| plugins {
3535
| id 'com.linkedin.python-pex'
3636
| }
37+
!
38+
| python{
39+
| pipConfig = [:]
40+
| for (String command : ['install', 'wheel', 'download']) {
41+
| pipConfig.put(command, [:])
42+
| pipConfig.get(command).put('no-build-isolation', 'false')
43+
| }
44+
| }
3745
|
3846
| configurations {
3947
| testProj

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,14 @@ class ParallelWheelsIntegrationTest extends Specification {
4545
| apply plugin: com.linkedin.gradle.python.plugin.WheelFirstPlugin
4646
| version = '1.0.0'
4747
| python {
48-
| pex {
49-
| fatPex = false
50-
| }
48+
| pex {
49+
| fatPex = false
50+
| }
51+
| pipConfig = [:]
52+
| for (String command : ['install', 'wheel', 'download']) {
53+
| pipConfig.put(command, [:])
54+
| pipConfig.get(command).put('no-build-isolation', 'false')
55+
| }
5156
| }
5257
| ${ PyGradleTestBuilder.createRepoClosure() }
5358
""".stripMargin().stripIndent()
@@ -104,6 +109,13 @@ class ParallelWheelsIntegrationTest extends Specification {
104109
| apply plugin: com.linkedin.gradle.python.plugin.WheelFirstPlugin
105110
|
106111
| version = '1.0.0'
112+
| python {
113+
| pipConfig = [:]
114+
| for (String command : ['install', 'wheel', 'download']) {
115+
| pipConfig.put(command, [:])
116+
| pipConfig.get(command).put('no-build-isolation', 'false')
117+
| }
118+
| }
107119
| ${ PyGradleTestBuilder.createRepoClosure() }
108120
""".stripMargin().stripIndent()
109121

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class PythonExtension {
6565

6666
/** A way to define forced versions of libraries */
6767
public Map<String, Map<String, String>> forcedVersions = [
68-
'flake8' : ['group': 'pypi', 'name': 'flake8', 'version': '3.6.0'],
68+
'flake8' : ['group': 'pypi', 'name': 'flake8', 'version': '3.7.9'],
6969
'pex' : ['group': 'pypi', 'name': 'pex', 'version': '1.5.2'],
7070
'pip' : ['group': 'pypi', 'name': 'pip', 'version': '18.1'],
7171
'pytest' : ['group': 'pypi', 'name': 'pytest', 'version': '3.10.0'],

0 commit comments

Comments
 (0)