Skip to content

Commit 3033352

Browse files
authored
Merge pull request #219 from zvezdan/upgrade-pip
Upgrade pip to 9.0.3.
2 parents 5b90a30 + b9ed994 commit 3033352

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

pivy-importer/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ task importRequiredDependencies(type: JavaExec) { task ->
5252
'Flask:0.12.2',
5353
'pbr:1.8.0',
5454
'pex:1.2.13',
55-
'pip:9.0.1',
55+
'pip:9.0.3',
5656
'pytest:3.1.2',
5757
'pytest-cov:2.5.1',
5858
'pytest-xdist:1.17.1',
@@ -67,6 +67,7 @@ task importRequiredDependencies(type: JavaExec) { task ->
6767
def forceDeps = [
6868
'setuptools:33.1.1',
6969
'wheel:0.29.0',
70+
'pip:9.0.3',
7071
].join(',')
7172
args "--repo ${getIvyRepo().absolutePath} $packagesToInclude --replace $replacements --force $forceDeps".split(' ')
7273

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
@@ -66,7 +66,7 @@ class PythonExtension {
6666
'argparse' : ['group': 'pypi', 'name': 'argparse', 'version': '1.4.0'],
6767
'flake8' : ['group': 'pypi', 'name': 'flake8', 'version': '2.6.2'],
6868
'pex' : ['group': 'pypi', 'name': 'pex', 'version': '1.2.13'],
69-
'pip' : ['group': 'pypi', 'name': 'pip', 'version': '9.0.1'],
69+
'pip' : ['group': 'pypi', 'name': 'pip', 'version': '9.0.3'],
7070
'pytest' : ['group': 'pypi', 'name': 'pytest', 'version': '3.1.2'],
7171
'pytest-cov' : ['group': 'pypi', 'name': 'pytest-cov', 'version': '2.5.1'],
7272
'pytest-xdist' : ['group': 'pypi', 'name': 'pytest-xdist', 'version': '1.17.1'],

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,6 @@ class BuildWheelsTask extends DefaultTask implements SupportsWheelCache, Support
159159
def clock = taskTimer.start(shortHand)
160160
progressLogger.progress("Preparing wheel $shortHand (${ ++counter } of $numberOfInstallables)")
161161

162-
if (PythonHelpers.isPlainOrVerbose(project)) {
163-
LOGGER.lifecycle("Installing {} wheel", shortHand)
164-
}
165-
166162
if (packageExcludeFilter != null && packageExcludeFilter.isSatisfiedBy(packageInfo)) {
167163
if (PythonHelpers.isPlainOrVerbose(project)) {
168164
LOGGER.lifecycle("Skipping {} wheel - Excluded", shortHand)
@@ -198,10 +194,15 @@ class BuildWheelsTask extends DefaultTask implements SupportsWheelCache, Support
198194
include: "**/${ packageInfo.name.replace('-', '_') }-${ (packageInfo.version ?: 'unspecified').replace('-', '_') }-*.whl")
199195

200196
if (tree.files.size() >= 1) {
197+
LOGGER.lifecycle("Skipping {} wheel - Installed", shortHand)
201198
return
202199
}
203200
}
204201

202+
if (PythonHelpers.isPlainOrVerbose(project)) {
203+
LOGGER.lifecycle("Installing {} wheel", shortHand)
204+
}
205+
205206
def stream = new ByteArrayOutputStream()
206207

207208
def mergedEnv = environmentMerger.mergeEnvironments(

0 commit comments

Comments
 (0)