diff --git a/lib/manager/poetry/__snapshots__/extract.spec.ts.snap b/lib/manager/poetry/__snapshots__/extract.spec.ts.snap index 2d8dc5989a579f6e9555b69b0aee8c4cf67c79ec..3359944de8679f2e2742dd35db780df5c1898a53 100644 --- a/lib/manager/poetry/__snapshots__/extract.spec.ts.snap +++ b/lib/manager/poetry/__snapshots__/extract.spec.ts.snap @@ -18,6 +18,7 @@ Object { "managerData": Object { "nestedVersion": false, }, + "versioning": "poetry", }, Object { "currentValue": "1.1.0", @@ -27,6 +28,7 @@ Object { "managerData": Object { "nestedVersion": false, }, + "versioning": "poetry", }, Object { "currentValue": "1.0a1", @@ -86,6 +88,7 @@ Object { "managerData": Object { "nestedVersion": false, }, + "versioning": "poetry", }, Object { "currentValue": "1.0.dev456", @@ -205,6 +208,7 @@ Object { "managerData": Object { "nestedVersion": false, }, + "versioning": "poetry", }, Object { "currentValue": "1.0+abc.5", @@ -274,6 +278,7 @@ Object { "managerData": Object { "nestedVersion": false, }, + "versioning": "pep440", }, Object { "currentValue": "~=3.1.2", @@ -283,6 +288,7 @@ Object { "managerData": Object { "nestedVersion": false, }, + "versioning": "pep440", }, Object { "currentValue": "~=3.1a1", @@ -292,7 +298,7 @@ Object { "managerData": Object { "nestedVersion": false, }, - "skipReason": "unknown-version", + "versioning": "pep440", }, Object { "currentValue": "==3.1", @@ -302,6 +308,7 @@ Object { "managerData": Object { "nestedVersion": false, }, + "versioning": "pep440", }, Object { "currentValue": "==3.1.*", @@ -311,6 +318,7 @@ Object { "managerData": Object { "nestedVersion": false, }, + "versioning": "pep440", }, Object { "currentValue": "~=3.1.0, !=3.1.3", @@ -320,7 +328,7 @@ Object { "managerData": Object { "nestedVersion": false, }, - "skipReason": "unknown-version", + "versioning": "pep440", }, Object { "currentValue": "<=2.0", @@ -330,6 +338,7 @@ Object { "managerData": Object { "nestedVersion": false, }, + "versioning": "pep440", }, Object { "currentValue": "<2.0", @@ -339,6 +348,7 @@ Object { "managerData": Object { "nestedVersion": false, }, + "versioning": "pep440", }, ], "registryUrls": null, @@ -355,6 +365,7 @@ Array [ "managerData": Object { "nestedVersion": true, }, + "versioning": "poetry", }, Object { "currentValue": "^0.6.0", @@ -364,6 +375,7 @@ Array [ "managerData": Object { "nestedVersion": true, }, + "versioning": "poetry", }, Object { "currentValue": "^0.33.6", @@ -393,6 +405,7 @@ Array [ "managerData": Object { "nestedVersion": false, }, + "versioning": "poetry", }, Object { "currentValue": "^0.9.4", @@ -402,6 +415,7 @@ Array [ "managerData": Object { "nestedVersion": false, }, + "versioning": "poetry", }, Object { "currentValue": "^0.4.0", @@ -411,6 +425,7 @@ Array [ "managerData": Object { "nestedVersion": false, }, + "versioning": "poetry", }, ] `; @@ -425,6 +440,7 @@ Array [ "managerData": Object { "nestedVersion": false, }, + "versioning": "poetry", }, Object { "currentValue": "0.0.0", @@ -434,6 +450,7 @@ Array [ "managerData": Object { "nestedVersion": false, }, + "versioning": "poetry", }, Object { "currentValue": "^0.6.0", @@ -443,6 +460,7 @@ Array [ "managerData": Object { "nestedVersion": false, }, + "versioning": "poetry", }, Object { "currentValue": "^0.33.6", @@ -452,6 +470,7 @@ Array [ "managerData": Object { "nestedVersion": false, }, + "versioning": "poetry", }, Object { "currentValue": "^3.0", @@ -461,6 +480,7 @@ Array [ "managerData": Object { "nestedVersion": false, }, + "versioning": "poetry", }, Object { "currentValue": "Invalid version.", @@ -480,6 +500,7 @@ Array [ "managerData": Object { "nestedVersion": false, }, + "versioning": "poetry", }, Object { "currentValue": "^0.9.4", @@ -489,6 +510,7 @@ Array [ "managerData": Object { "nestedVersion": false, }, + "versioning": "poetry", }, Object { "currentValue": "^0.4.0", @@ -498,6 +520,7 @@ Array [ "managerData": Object { "nestedVersion": false, }, + "versioning": "poetry", }, ] `; diff --git a/lib/manager/poetry/extract.ts b/lib/manager/poetry/extract.ts index d97ddf5f754474c0981cc9d3f248dca765c6c131..1ff6ad88b440c9b8b3b075af572146d995a21206 100644 --- a/lib/manager/poetry/extract.ts +++ b/lib/manager/poetry/extract.ts @@ -2,7 +2,8 @@ import { parse } from 'toml'; import * as datasourcePypi from '../../datasource/pypi'; import { logger } from '../../logger'; import { SkipReason } from '../../types'; -import { isValid } from '../../versioning/poetry'; +import * as pep440Versioning from '../../versioning/pep440'; +import * as poetryVersioning from '../../versioning/poetry'; import { PackageDependency, PackageFile } from '../common'; import { PoetryFile, PoetrySection } from './types'; @@ -52,7 +53,11 @@ function extractFromSection( }; if (skipReason) { dep.skipReason = skipReason; - } else if (!isValid(dep.currentValue)) { + } else if (pep440Versioning.isValid(dep.currentValue)) { + dep.versioning = pep440Versioning.id; + } else if (poetryVersioning.isValid(dep.currentValue)) { + dep.versioning = poetryVersioning.id; + } else { dep.skipReason = SkipReason.UnknownVersion; } deps.push(dep); diff --git a/lib/manager/poetry/index.ts b/lib/manager/poetry/index.ts index 7a316752fbe892180dff5de46a7de9ef821c9998..d6a3549b08372fb9020544c2f99faf76701e60df 100644 --- a/lib/manager/poetry/index.ts +++ b/lib/manager/poetry/index.ts @@ -1,5 +1,4 @@ import { LANGUAGE_PYTHON } from '../../constants/languages'; -import * as poetryVersioning from '../../versioning/poetry'; export { extractPackageFile } from './extract'; export { updateArtifacts } from './artifacts'; @@ -8,6 +7,5 @@ export const language = LANGUAGE_PYTHON; export const supportsLockFileMaintenance = true; export const defaultConfig = { - versioning: poetryVersioning.id, fileMatch: ['(^|/)pyproject\\.toml$'], };