From deaa028149452875518f39c04ef7d1d97f1f9314 Mon Sep 17 00:00:00 2001 From: Rhys Arkins <rhys@arkins.net> Date: Thu, 20 Jun 2019 10:20:27 +0200 Subject: [PATCH] fix(pip_requirements): registryUrls on res, not per-dep --- lib/manager/pip_requirements/extract.js | 9 +-- .../__snapshots__/extract.spec.js.snap | 60 +++++++++---------- test/manager/pip_requirements/extract.spec.js | 5 +- 3 files changed, 36 insertions(+), 38 deletions(-) diff --git a/lib/manager/pip_requirements/extract.js b/lib/manager/pip_requirements/extract.js index 107c283493..caae795cd9 100644 --- a/lib/manager/pip_requirements/extract.js +++ b/lib/manager/pip_requirements/extract.js @@ -56,14 +56,15 @@ function extractPackageFile(content) { ) { dep.fromVersion = currentValue.replace(/^==/, ''); } - if (registryUrls) { - dep.registryUrls = registryUrls; - } return dep; }) .filter(Boolean); if (!deps.length) { return null; } - return { deps }; + const res = { deps }; + if (registryUrls) { + res.registryUrls = registryUrls; + } + return res; } diff --git a/test/manager/pip_requirements/__snapshots__/extract.spec.js.snap b/test/manager/pip_requirements/__snapshots__/extract.spec.js.snap index 52c89fceaf..5b093bc9da 100644 --- a/test/manager/pip_requirements/__snapshots__/extract.spec.js.snap +++ b/test/manager/pip_requirements/__snapshots__/extract.spec.js.snap @@ -1,38 +1,34 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`lib/manager/pip_requirements/extract extractPackageFile() extracts dependencies 1`] = ` -Array [ - Object { - "currentValue": "==0.3.1", - "datasource": "pypi", - "depName": "some-package", - "fromVersion": "0.3.1", - "lineNumber": 2, - "registryUrls": Array [ - "http://example.com/private-pypi/", - ], - }, - Object { - "currentValue": "==1.0.0", - "datasource": "pypi", - "depName": "some-other-package", - "fromVersion": "1.0.0", - "lineNumber": 3, - "registryUrls": Array [ - "http://example.com/private-pypi/", - ], - }, - Object { - "currentValue": "==1.9", - "datasource": "pypi", - "depName": "not_semver", - "fromVersion": "1.9", - "lineNumber": 4, - "registryUrls": Array [ - "http://example.com/private-pypi/", - ], - }, -] +Object { + "deps": Array [ + Object { + "currentValue": "==0.3.1", + "datasource": "pypi", + "depName": "some-package", + "fromVersion": "0.3.1", + "lineNumber": 2, + }, + Object { + "currentValue": "==1.0.0", + "datasource": "pypi", + "depName": "some-other-package", + "fromVersion": "1.0.0", + "lineNumber": 3, + }, + Object { + "currentValue": "==1.9", + "datasource": "pypi", + "depName": "not_semver", + "fromVersion": "1.9", + "lineNumber": 4, + }, + ], + "registryUrls": Array [ + "http://example.com/private-pypi/", + ], +} `; exports[`lib/manager/pip_requirements/extract extractPackageFile() extracts multiple dependencies 1`] = ` diff --git a/test/manager/pip_requirements/extract.spec.js b/test/manager/pip_requirements/extract.spec.js index 749ac0ae2c..60c7adc012 100644 --- a/test/manager/pip_requirements/extract.spec.js +++ b/test/manager/pip_requirements/extract.spec.js @@ -31,9 +31,10 @@ describe('lib/manager/pip_requirements/extract', () => { expect(extractPackageFile('nothing here', config)).toBeNull(); }); it('extracts dependencies', () => { - const res = extractPackageFile(requirements1, config).deps; + const res = extractPackageFile(requirements1, config); expect(res).toMatchSnapshot(); - expect(res).toHaveLength(3); + expect(res.registryUrls).toEqual(['http://example.com/private-pypi/']); + expect(res.deps).toHaveLength(3); }); it('extracts multiple dependencies', () => { const res = extractPackageFile(requirements2, config).deps; -- GitLab