From 59b1b747d72cab71fc789e88b95b6d4b00c7ddf8 Mon Sep 17 00:00:00 2001
From: Ben <34147102+belgiancoder@users.noreply.github.com>
Date: Wed, 30 Jan 2019 21:32:38 +0100
Subject: [PATCH] fix(tests): sort setup.py dependencies by lineNumber (#3141)
Closes #3131, Closes #3136
---
lib/manager/pip_setup/extract.js | 7 +-
.../__snapshots__/extract.spec.js.snap | 96 +++++++++----------
2 files changed, 54 insertions(+), 49 deletions(-)
diff --git a/lib/manager/pip_setup/extract.js b/lib/manager/pip_setup/extract.js
index 6409db8b80..89574935d5 100644
--- a/lib/manager/pip_setup/extract.js
+++ b/lib/manager/pip_setup/extract.js
@@ -103,7 +103,12 @@ async function extractPackageFile(content, packageFile, config) {
};
return dep;
})
- .filter(Boolean);
+ .filter(Boolean)
+ .sort((a, b) =>
+ a.lineNumber === b.lineNumber
+ ? (a.depName > b.depName) - (a.depName < b.depName)
+ : a.lineNumber - b.lineNumber
+ );
if (!deps.length) {
return null;
}
diff --git a/test/manager/pip_setup/__snapshots__/extract.spec.js.snap b/test/manager/pip_setup/__snapshots__/extract.spec.js.snap
index 3f17840711..021bd92abd 100644
--- a/test/manager/pip_setup/__snapshots__/extract.spec.js.snap
+++ b/test/manager/pip_setup/__snapshots__/extract.spec.js.snap
@@ -3,6 +3,54 @@
exports[`lib/manager/pip_setup/extract extractPackageFile() returns found deps 1`] = `
Object {
"deps": Array [
+ Object {
+ "currentValue": ">=3.1.13.0,<5.0",
+ "depName": "celery",
+ "lineNumber": 36,
+ "purl": "pkg:pypi/celery",
+ },
+ Object {
+ "currentValue": ">=1.7",
+ "depName": "logging_tree",
+ "lineNumber": 39,
+ "purl": "pkg:pypi/logging_tree",
+ },
+ Object {
+ "currentValue": ">=2.2",
+ "depName": "pygments",
+ "lineNumber": 40,
+ "purl": "pkg:pypi/pygments",
+ },
+ Object {
+ "currentValue": ">=5.0",
+ "depName": "psutil",
+ "lineNumber": 41,
+ "purl": "pkg:pypi/psutil",
+ },
+ Object {
+ "currentValue": ">=3.0",
+ "depName": "objgraph",
+ "lineNumber": 42,
+ "purl": "pkg:pypi/objgraph",
+ },
+ Object {
+ "currentValue": ">=1.10,<2.0",
+ "depName": "django",
+ "lineNumber": 45,
+ "purl": "pkg:pypi/django",
+ },
+ Object {
+ "currentValue": ">=0.11,<2.0",
+ "depName": "flask",
+ "lineNumber": 48,
+ "purl": "pkg:pypi/flask",
+ },
+ Object {
+ "currentValue": ">=1.4,<2.0",
+ "depName": "blinker",
+ "lineNumber": 49,
+ "purl": "pkg:pypi/blinker",
+ },
Object {
"currentValue": ">=19.7.0,<20.0",
"depName": "gunicorn",
@@ -46,54 +94,6 @@ Object {
"lineNumber": 67,
"purl": "pkg:pypi/ipaddress",
},
- Object {
- "currentValue": ">=3.1.13.0,<5.0",
- "depName": "celery",
- "lineNumber": 36,
- "purl": "pkg:pypi/celery",
- },
- Object {
- "currentValue": ">=0.11,<2.0",
- "depName": "flask",
- "lineNumber": 48,
- "purl": "pkg:pypi/flask",
- },
- Object {
- "currentValue": ">=1.4,<2.0",
- "depName": "blinker",
- "lineNumber": 49,
- "purl": "pkg:pypi/blinker",
- },
- Object {
- "currentValue": ">=1.7",
- "depName": "logging_tree",
- "lineNumber": 39,
- "purl": "pkg:pypi/logging_tree",
- },
- Object {
- "currentValue": ">=2.2",
- "depName": "pygments",
- "lineNumber": 40,
- "purl": "pkg:pypi/pygments",
- },
- Object {
- "currentValue": ">=5.0",
- "depName": "psutil",
- "lineNumber": 41,
- "purl": "pkg:pypi/psutil",
- },
- Object {
- "currentValue": ">=3.0",
- "depName": "objgraph",
- "lineNumber": 42,
- "purl": "pkg:pypi/objgraph",
- },
- Object {
- "currentValue": ">=1.10,<2.0",
- "depName": "django",
- "lineNumber": 45,
- "purl": "pkg:pypi/django",
- },
],
}
`;
--
GitLab