Skip to content

Commit

Permalink
fix(pip_requirements): set lockedVersion for == deps
Browse files Browse the repository at this point in the history
  • Loading branch information
rarkins committed May 14, 2019
1 parent b2b6d1e commit 11853a5
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 0 deletions.
12 changes: 12 additions & 0 deletions lib/manager/pip_requirements/extract.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ const { isSkipComment } = require('../../util/ignore');
const specifierPartPattern = `\\s*${rangePattern.replace(/\?<\w+>/g, '?:')}`;
const specifierPattern = `${specifierPartPattern}(?:\\s*,${specifierPartPattern})*`;
const dependencyPattern = `(${packagePattern})(${extrasPattern})(${specifierPattern})`;
const {
isValid,
isVersion,
isSingleVersion,
} = require('../../versioning/pep440');

module.exports = {
dependencyPattern,
Expand Down Expand Up @@ -48,6 +53,13 @@ function extractPackageFile(content) {
lineNumber,
datasource: 'pypi',
};
if (
isValid(currentValue) &&
isSingleVersion(currentValue) &&
currentValue.startsWith('==')
) {
dep.fromVersion = currentValue.replace(/^==/, '');
}
if (registryUrls) {
dep.registryUrls = registryUrls;
}
Expand Down
15 changes: 15 additions & 0 deletions test/manager/pip_requirements/__snapshots__/extract.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Array [
"currentValue": "==0.3.1",
"datasource": "pypi",
"depName": "some-package",
"fromVersion": "0.3.1",
"lineNumber": 2,
"registryUrls": Array [
"http://example.com/private-pypi/",
Expand All @@ -15,6 +16,7 @@ Array [
"currentValue": "==1.0.0",
"datasource": "pypi",
"depName": "some-other-package",
"fromVersion": "1.0.0",
"lineNumber": 3,
"registryUrls": Array [
"http://example.com/private-pypi/",
Expand All @@ -24,6 +26,7 @@ Array [
"currentValue": "==1.9",
"datasource": "pypi",
"depName": "not_semver",
"fromVersion": "1.9",
"lineNumber": 4,
"registryUrls": Array [
"http://example.com/private-pypi/",
Expand All @@ -38,30 +41,35 @@ Array [
"currentValue": "==1",
"datasource": "pypi",
"depName": "Django",
"fromVersion": "1",
"lineNumber": 0,
},
Object {
"currentValue": "==0.6.27",
"datasource": "pypi",
"depName": "distribute",
"fromVersion": "0.6.27",
"lineNumber": 1,
},
Object {
"currentValue": "==0.2",
"datasource": "pypi",
"depName": "dj-database-url",
"fromVersion": "0.2",
"lineNumber": 2,
},
Object {
"currentValue": "==2.4.5",
"datasource": "pypi",
"depName": "psycopg2",
"fromVersion": "2.4.5",
"lineNumber": 3,
},
Object {
"currentValue": "==0.1.2",
"datasource": "pypi",
"depName": "wsgiref",
"fromVersion": "0.1.2",
"lineNumber": 4,
},
]
Expand All @@ -73,31 +81,36 @@ Array [
"currentValue": "==1.11.19",
"datasource": "pypi",
"depName": "Django",
"fromVersion": "1.11.19",
"lineNumber": 0,
},
Object {
"currentValue": "==0.6.27",
"datasource": "pypi",
"depName": "distribute",
"fromVersion": "0.6.27",
"lineNumber": 1,
"skipReason": "ignored",
},
Object {
"currentValue": "==0.2",
"datasource": "pypi",
"depName": "dj-database-url",
"fromVersion": "0.2",
"lineNumber": 2,
},
Object {
"currentValue": "==2.4.5",
"datasource": "pypi",
"depName": "psycopg2",
"fromVersion": "2.4.5",
"lineNumber": 3,
},
Object {
"currentValue": "==0.1.2",
"datasource": "pypi",
"depName": "wsgiref",
"fromVersion": "0.1.2",
"lineNumber": 4,
},
]
Expand All @@ -109,12 +122,14 @@ Array [
"currentValue": "==2.0.12",
"datasource": "pypi",
"depName": "Django",
"fromVersion": "2.0.12",
"lineNumber": 0,
},
Object {
"currentValue": "==4.1.1",
"datasource": "pypi",
"depName": "celery",
"fromVersion": "4.1.1",
"lineNumber": 1,
},
Object {
Expand Down

0 comments on commit 11853a5

Please sign in to comment.