Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(poetry): normalize package name #19807

Merged
merged 12 commits into from
Jan 14, 2023
Merged

fix(poetry): normalize package name #19807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
22f6b42
fix(poetry): normalize package name
dave-powell-kensho Jan 11, 2023
6f6a34b
lowercase depName in normalization
dave-powell-kensho Jan 12, 2023
68c8742
set packageName to normalized name instead of depName
dave-powell-kensho Jan 12, 2023
a78e876
Merge branch 'main' into poetry-pep503-normalize
dave-powell-kensho Jan 12, 2023
71892ab
only set packageName if different from depName
dave-powell-kensho Jan 13, 2023
f90fa7f
Merge branch 'main' into poetry-pep503-normalize
rarkins Jan 13, 2023
da69e8f
fix expected test output
dave-powell-kensho Jan 13, 2023
d450027
Merge branch 'main' into poetry-pep503-normalize
rarkins Jan 13, 2023
e2ad1cf
fix order of expected test output
dave-powell-kensho Jan 13, 2023
90252a3
fix eslint errors
dave-powell-kensho Jan 13, 2023
934e488
lint-fix
rarkins Jan 14, 2023
58b86fb
Merge branch 'main' into poetry-pep503-normalize
rarkins Jan 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions lib/modules/manager/poetry/__snapshots__/extract.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,7 @@ exports[`modules/manager/poetry/extract extractPackageFile() extracts multiple d
"managerData": {
"nestedVersion": false,
},
"packageName": "extra-dep1",
"versioning": "poetry",
},
{
Expand All @@ -410,6 +411,7 @@ exports[`modules/manager/poetry/extract extractPackageFile() extracts multiple d
"managerData": {
"nestedVersion": false,
},
"packageName": "extra-dep2",
"versioning": "poetry",
},
{
Expand All @@ -420,6 +422,7 @@ exports[`modules/manager/poetry/extract extractPackageFile() extracts multiple d
"managerData": {
"nestedVersion": false,
},
"packageName": "extra-dep3",
"versioning": "poetry",
},
],
Expand All @@ -438,6 +441,7 @@ exports[`modules/manager/poetry/extract extractPackageFile() extracts multiple d
"managerData": {
"nestedVersion": false,
},
"packageName": "dep1-",
"versioning": "pep440",
},
{
Expand Down Expand Up @@ -478,6 +482,7 @@ exports[`modules/manager/poetry/extract extractPackageFile() extracts multiple d
"managerData": {
"nestedVersion": false,
},
"packageName": "dev-dep1",
"versioning": "poetry",
},
{
Expand All @@ -488,6 +493,7 @@ exports[`modules/manager/poetry/extract extractPackageFile() extracts multiple d
"managerData": {
"nestedVersion": false,
},
"packageName": "dev-dep2",
"skipReason": "unknown-version",
},
{
Expand All @@ -498,6 +504,7 @@ exports[`modules/manager/poetry/extract extractPackageFile() extracts multiple d
"managerData": {
"nestedVersion": false,
},
"packageName": "extra-dep1",
"versioning": "poetry",
},
{
Expand All @@ -508,6 +515,7 @@ exports[`modules/manager/poetry/extract extractPackageFile() extracts multiple d
"managerData": {
"nestedVersion": false,
},
"packageName": "extra-dep2",
"versioning": "poetry",
},
{
Expand All @@ -518,6 +526,7 @@ exports[`modules/manager/poetry/extract extractPackageFile() extracts multiple d
"managerData": {
"nestedVersion": false,
},
"packageName": "extra-dep3",
"versioning": "poetry",
},
]
Expand Down
2 changes: 2 additions & 0 deletions lib/modules/manager/poetry/extract.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,14 @@ describe('modules/manager/poetry/extract', () => {
datasource: 'pypi',
depName: 'dev_dep',
depType: 'dev',
packageName: 'dev-dep',
},
{
currentValue: '^4.0',
datasource: 'pypi',
depName: 'typing_dep',
depType: 'typing',
packageName: 'typing-dep',
},
]);
});
Expand Down
12 changes: 10 additions & 2 deletions lib/modules/manager/poetry/extract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
localPathExists,
readLocalFile,
} from '../../../util/fs';
import { regEx } from '../../../util/regex';
import { PypiDatasource } from '../../datasource/pypi';
import * as pep440Versioning from '../../versioning/pep440';
import * as poetryVersioning from '../../versioning/poetry';
Expand Down Expand Up @@ -54,6 +55,10 @@ function extractFromSection(
continue;
}

const pep503NormalizeRegex = regEx(/[-_.]+/g);
const packageName = depName
.toLowerCase()
.replace(pep503NormalizeRegex, '-');
let skipReason: SkipReason | null = null;
let currentValue = sectionContent[depName];
let nestedVersion = false;
Expand Down Expand Up @@ -85,8 +90,11 @@ function extractFromSection(
managerData: { nestedVersion },
datasource: PypiDatasource.id,
};
if (depName in poetryLockfile) {
dep.lockedVersion = poetryLockfile[depName];
if (packageName in poetryLockfile) {
dep.lockedVersion = poetryLockfile[packageName];
}
if (depName !== packageName) {
dep.packageName = packageName;
}
if (skipReason) {
dep.skipReason = skipReason;
Expand Down