Skip to content

Commit

Permalink
fix: Revert "refactor(pip_requirements): extractAllPackageFiles (#10414
Browse files Browse the repository at this point in the history
…)"

This reverts commit 015391c.

Closes #10485
  • Loading branch information
rarkins committed Jun 18, 2021
1 parent 969ea18 commit c7c8ba9
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 71 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
some-package==0.3.1
some-other-package==1.0.0
not_semver==1.9
unconstrained

31 changes: 0 additions & 31 deletions lib/manager/pip_requirements/__snapshots__/extract.spec.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -63,37 +63,6 @@ Array [
]
`;

exports[`manager/pip_requirements/extract extractPackageFile() extracts using extractAllPackageFiles 1`] = `
Array [
Object {
"deps": Array [
Object {
"currentValue": "==0.3.1",
"currentVersion": "0.3.1",
"datasource": "pypi",
"depName": "some-package",
},
Object {
"currentValue": "==1.0.0",
"currentVersion": "1.0.0",
"datasource": "pypi",
"depName": "some-other-package",
},
Object {
"currentValue": "==1.9",
"currentVersion": "1.9",
"datasource": "pypi",
"depName": "not_semver",
},
],
"packageFile": "unused_file_name",
"registryUrls": Array [
"http://example.com/private-pypi/",
],
},
]
`;

exports[`manager/pip_requirements/extract extractPackageFile() handles comments and commands 1`] = `
Array [
Object {
Expand Down
16 changes: 2 additions & 14 deletions lib/manager/pip_requirements/extract.spec.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { fs, getName, loadFixture } from '../../../test/util';
import { getName, loadFixture } from '../../../test/util';
import { setAdminConfig } from '../../config/admin';
import { extractAllPackageFiles, extractPackageFile } from './extract';

jest.mock('../../util/fs');
import { extractPackageFile } from './extract';

const requirements1 = loadFixture('requirements1.txt');
const requirements2 = loadFixture('requirements2.txt');
Expand Down Expand Up @@ -43,16 +41,6 @@ describe(getName(), () => {
expect(res.registryUrls).toEqual(['http://example.com/private-pypi/']);
expect(res.deps).toHaveLength(3);
});
it('extracts using extractAllPackageFiles', async () => {
fs.readLocalFile.mockResolvedValueOnce(requirements1);
const outerRes = await extractAllPackageFiles(config, [
'unused_file_name',
]);
expect(outerRes).toMatchSnapshot();
const [res] = outerRes;
expect(res.registryUrls).toEqual(['http://example.com/private-pypi/']);
expect(res.deps).toHaveLength(3);
});
it('extracts multiple dependencies', () => {
const res = extractPackageFile(
requirements2,
Expand Down
24 changes: 0 additions & 24 deletions lib/manager/pip_requirements/extract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { getAdminConfig } from '../../config/admin';
import * as datasourcePypi from '../../datasource/pypi';
import { logger } from '../../logger';
import { SkipReason } from '../../types';
import { readLocalFile } from '../../util/fs';
import { isSkipComment } from '../../util/ignore';
import type { ExtractConfig, PackageDependency, PackageFile } from '../types';

Expand Down Expand Up @@ -102,26 +101,3 @@ export function extractPackageFile(
}
return res;
}

export async function extractAllPackageFiles(
config: ExtractConfig,
packageFiles: string[]
): Promise<PackageFile[]> {
const requirementsFiles: PackageFile[] = [];
for (const packageFile of packageFiles) {
const content = await readLocalFile(packageFile, 'utf8');
// istanbul ignore else
if (content) {
const deps = extractPackageFile(content, packageFile, config);
if (deps) {
requirementsFiles.push({
packageFile,
...deps,
});
}
} else {
logger.debug({ packageFile }, 'requirements file has no content');
}
}
return requirementsFiles;
}
2 changes: 1 addition & 1 deletion lib/manager/pip_requirements/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { LANGUAGE_PYTHON } from '../../constants/languages';

export { updateArtifacts } from './artifacts';
export { extractAllPackageFiles } from './extract';
export { extractPackageFile } from './extract';
export { getRangeStrategy } from './range';

export const language = LANGUAGE_PYTHON;
Expand Down

0 comments on commit c7c8ba9

Please sign in to comment.