From 84f6b36babc7cecac53cced9c81ebbc60e241527 Mon Sep 17 00:00:00 2001 From: secustor Date: Wed, 17 May 2023 22:23:02 +0200 Subject: [PATCH] fixup linters and tests --- lib/modules/manager/pep621/artifacts.spec.ts | 22 ++++++++++++++--- .../manager/pep621/processors/pdm.spec.ts | 24 ++++++++++++++----- lib/modules/manager/pep621/processors/pdm.ts | 5 ++-- 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/lib/modules/manager/pep621/artifacts.spec.ts b/lib/modules/manager/pep621/artifacts.spec.ts index c7da48b5f929b3..f104c7e51f4327 100644 --- a/lib/modules/manager/pep621/artifacts.spec.ts +++ b/lib/modules/manager/pep621/artifacts.spec.ts @@ -22,7 +22,11 @@ const adminConfig: RepoGlobalConfig = { describe('modules/manager/pep621/artifacts', () => { describe('updateArtifacts()', () => { it('return null if all processors returns are empty', async () => { - const updatedDeps = [{ depName: 'dep1' }]; + const updatedDeps = [ + { + packageName: 'dep1', + }, + ]; const result = await updateArtifacts({ packageFileName: 'pyproject.toml', newPackageFileContent: '', @@ -43,7 +47,7 @@ describe('modules/manager/pep621/artifacts', () => { releases: [{ version: 'v2.6.1' }, { version: 'v2.5.0' }], }); - const updatedDeps = [{ depName: 'dep1' }]; + const updatedDeps = [{ packageName: 'dep1' }]; const result = await updateArtifacts({ packageFileName: 'pyproject.toml', newPackageFileContent: '', @@ -73,7 +77,19 @@ describe('modules/manager/pep621/artifacts', () => { }, }, { - cmd: 'docker run --rm --name=renovate_sidecar --label=renovate_child -v "/tmp/github/some/repo":"/tmp/github/some/repo" -v "/tmp/cache":"/tmp/cache" -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" containerbase/sidecar bash -l -c "install-tool pdm v2.5.0 && pdm update dep1"', + cmd: + 'docker run --rm --name=renovate_sidecar --label=renovate_child ' + + '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + + '-v "/tmp/cache":"/tmp/cache" ' + + '-e BUILDPACK_CACHE_DIR ' + + '-e CONTAINERBASE_CACHE_DIR ' + + '-w "/tmp/github/some/repo" ' + + 'containerbase/sidecar ' + + 'bash -l -c "' + + 'install-tool pdm v2.5.0 ' + + '&& ' + + 'pdm update dep1' + + '"', options: { cwd: '/tmp/github/some/repo', encoding: 'utf-8', diff --git a/lib/modules/manager/pep621/processors/pdm.spec.ts b/lib/modules/manager/pep621/processors/pdm.spec.ts index e6ed01a19a86fa..d455b0b722b576 100644 --- a/lib/modules/manager/pep621/processors/pdm.spec.ts +++ b/lib/modules/manager/pep621/processors/pdm.spec.ts @@ -25,7 +25,7 @@ describe('modules/manager/pep621/processors/pdm', () => { describe('updateArtifacts()', () => { it('return null if there is no lock file', async () => { fs.getSiblingFileName.mockReturnValueOnce('pdm.lock'); - const updatedDeps = [{ depName: 'dep1' }]; + const updatedDeps = [{ packageName: 'dep1' }]; const result = await processor.updateArtifacts({ packageFileName: 'pyproject.toml', newPackageFileContent: '', @@ -46,7 +46,7 @@ describe('modules/manager/pep621/processors/pdm', () => { releases: [{ version: 'v2.6.1' }, { version: 'v2.5.0' }], }); - const updatedDeps = [{ depName: 'dep1' }]; + const updatedDeps = [{ packageName: 'dep1' }]; const result = await processor.updateArtifacts({ packageFileName: 'pyproject.toml', newPackageFileContent: '', @@ -62,7 +62,19 @@ describe('modules/manager/pep621/processors/pdm', () => { cmd: 'docker ps --filter name=renovate_sidecar -aq', }, { - cmd: 'docker run --rm --name=renovate_sidecar --label=renovate_child -v "/tmp/github/some/repo":"/tmp/github/some/repo" -v "/tmp/cache":"/tmp/cache" -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" containerbase/sidecar bash -l -c "install-tool pdm v2.5.0 && pdm update dep1"', + cmd: + 'docker run --rm --name=renovate_sidecar --label=renovate_child ' + + '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + + '-v "/tmp/cache":"/tmp/cache" ' + + '-e BUILDPACK_CACHE_DIR ' + + '-e CONTAINERBASE_CACHE_DIR ' + + '-w "/tmp/github/some/repo" ' + + 'containerbase/sidecar ' + + 'bash -l -c "' + + 'install-tool pdm v2.5.0 ' + + '&& ' + + 'pdm update dep1' + + '"', }, ]); }); @@ -75,7 +87,7 @@ describe('modules/manager/pep621/processors/pdm', () => { throw new Error('test error'); }); - const updatedDeps = [{ depName: 'dep1' }]; + const updatedDeps = [{ packageName: 'dep1' }]; const result = await processor.updateArtifacts({ packageFileName: 'pyproject.toml', newPackageFileContent: '', @@ -99,7 +111,7 @@ describe('modules/manager/pep621/processors/pdm', () => { releases: [{ version: 'v2.6.1' }, { version: 'v2.5.0' }], }); - const updatedDeps = [{ depName: 'dep1' }, { depName: 'dep2' }]; + const updatedDeps = [{ packageName: 'dep1' }, { packageName: 'dep2' }]; const result = await processor.updateArtifacts({ packageFileName: 'pyproject.toml', newPackageFileContent: '', @@ -152,7 +164,7 @@ describe('modules/manager/pep621/processors/pdm', () => { ]); expect(execSnapshots).toMatchObject([ { - cmd: 'pdm update ', + cmd: 'pdm update', }, ]); }); diff --git a/lib/modules/manager/pep621/processors/pdm.ts b/lib/modules/manager/pep621/processors/pdm.ts index e2cffb82fec73e..cf717b6dbfcfd0 100644 --- a/lib/modules/manager/pep621/processors/pdm.ts +++ b/lib/modules/manager/pep621/processors/pdm.ts @@ -79,9 +79,8 @@ export class PdmProcessor implements PyProjectProcessor { // else only update specific packages let packageList = ''; if (!isLockFileMaintenance) { - packageList = ' ' + updatedDeps - .map((value) => value.packageName) - .join(' '); + packageList = ' '; + packageList += updatedDeps.map((value) => value.packageName).join(' '); } const cmd = `pdm update${packageList}`; await exec(cmd, execOptions);