diff --git a/lib/manager/_helpers/node/package.js b/lib/manager/_helpers/node/package.js index 559326900a696f85719d1c9fe0687af6c165db87..dd342fa45e8158ae5902711796ac0c45b8de2757 100644 --- a/lib/manager/_helpers/node/package.js +++ b/lib/manager/_helpers/node/package.js @@ -48,8 +48,8 @@ async function getPackageUpdates(config) { newVersion, newVersionMajor: getMajor(newVersion), newVersionMinor: getMinor(newVersion), - changeLogFromVersion: currentVersion, - changeLogToVersion: newVersion, + fromVersion: currentVersion, + toVersion: newVersion, repositoryUrl: 'https://github.com/nodejs/node', }, ]; diff --git a/lib/manager/buildkite/package.js b/lib/manager/buildkite/package.js index e92318c7da971074b2d2b40212e700591b330fe4..7d6f0c928cfa3db91a6332e243cdc65ed4b34ec8 100644 --- a/lib/manager/buildkite/package.js +++ b/lib/manager/buildkite/package.js @@ -48,8 +48,8 @@ async function getPackageUpdates(config) { newVersion, newVersionMajor: getMajor(newVersion), newVersionMinor: getMinor(newVersion), - changeLogFromVersion: currentVersion, - changeLogToVersion: newVersion, + fromVersion: currentVersion, + toVersion: newVersion, repositoryUrl: `https://github.com/${sourceRepo}`, }, ]; diff --git a/lib/manager/circleci/extract.js b/lib/manager/circleci/extract.js index a49f6e780e6b1eef8b9126c0d4ab1383055adaac..780a79ebbb514290df659f4e004395091aa4b989 100644 --- a/lib/manager/circleci/extract.js +++ b/lib/manager/circleci/extract.js @@ -27,7 +27,7 @@ function extractDependencies(content) { deps.push({ lineNumber, currentFrom, - changeLogFromVersion: currentFrom, + fromVersion: currentFrom, currentDepTagDigest, dockerRegistry, currentDepTag, diff --git a/lib/manager/npm/versions.js b/lib/manager/npm/versions.js index 62d92b1e135c08972fddb0ed4d6afc852d3c09c1..4df3b6731f474a01ccf9f114730a16c234e24c2b 100644 --- a/lib/manager/npm/versions.js +++ b/lib/manager/npm/versions.js @@ -75,7 +75,7 @@ function determineUpgrades(npmDep, config) { logger.debug({ currentVersion }, 'Skipping complex range'); } } - let changeLogFromVersion = currentVersion; + let fromVersion = currentVersion; // Check for a current range and pin it if (isRange(currentVersion)) { let newVersion; @@ -107,7 +107,7 @@ function determineUpgrades(npmDep, config) { newVersion, newVersionMajor: getMajor(newVersion), }; - changeLogFromVersion = newVersion; + fromVersion = newVersion; } else if (versionList.indexOf(currentVersion) === -1 && !rangeOperator) { logger.debug({ dependency }, 'Cannot find currentVersion'); try { @@ -134,7 +134,7 @@ function determineUpgrades(npmDep, config) { } _(versionList) // Filter out older versions as we can't upgrade to those - .filter(version => isGreaterThan(version, changeLogFromVersion)) + .filter(version => isGreaterThan(version, fromVersion)) // fillter out non-allowed versions if preference is set .reject( version => allowedVersions && !matchesSemver(version, allowedVersions) @@ -142,16 +142,14 @@ function determineUpgrades(npmDep, config) { // Ignore unstable versions, unless the current version is unstable .reject( version => - config.ignoreUnstable && - isStable(changeLogFromVersion) && - isUnstable(version) + config.ignoreUnstable && isStable(fromVersion) && isUnstable(version) ) // Do not jump to a new major unstable just because the current is unstable .reject( version => config.ignoreUnstable && isUnstable(version) && - getMajor(version) > getMajor(changeLogFromVersion) + getMajor(version) > getMajor(fromVersion) ) // Loop through all possible versions .forEach(newVersion => { @@ -163,10 +161,10 @@ function determineUpgrades(npmDep, config) { config.patch.automerge === true && (config.minor && config.minor.automerge !== true); let type; - if (newVersionMajor > getMajor(changeLogFromVersion)) { + if (newVersionMajor > getMajor(fromVersion)) { type = 'major'; } else if ( - newVersionMinor === getMinor(changeLogFromVersion) && + newVersionMinor === getMinor(fromVersion) && (config.separateMinorPatch || hasPatchOnlyAutomerge) ) { // Only use patch if configured to @@ -195,14 +193,14 @@ function determineUpgrades(npmDep, config) { !allUpgrades[upgradeKey] || isGreaterThan(newVersion, allUpgrades[upgradeKey].newVersion) ) { - const changeLogToVersion = newVersion; + const toVersion = newVersion; allUpgrades[upgradeKey] = { type, newVersion, newVersionMajor, newVersionMinor, - changeLogFromVersion, - changeLogToVersion, + fromVersion, + toVersion, }; if (type === 'major') { allUpgrades[upgradeKey].isMajor = true; @@ -324,7 +322,7 @@ function determineUpgrades(npmDep, config) { // Add in the caret newVersion = `^${minSatisfying}`; } - } else if (major === `${getMajor(changeLogFromVersion)}`) { + } else if (major === `${getMajor(fromVersion)}`) { newVersion = `^${upgrade.newVersion}`; } else { const newRange = `${major}`; diff --git a/lib/manager/pip_requirements/package.js b/lib/manager/pip_requirements/package.js index ebe96142303655eb7d837fed500021baf9534833..4d92d90bfd7227e85d0b154164628f1b3e64a16e 100644 --- a/lib/manager/pip_requirements/package.js +++ b/lib/manager/pip_requirements/package.js @@ -40,8 +40,8 @@ async function getPackageUpdates(config) { depName, newVersion, newVersionMajor: getMajor(newVersion), - changeLogFromVersion: currentVersion, - changeLogToVersion: newVersion, + fromVersion: currentVersion, + toVersion: newVersion, }, ]; } catch (err) { diff --git a/lib/workers/pr/index.js b/lib/workers/pr/index.js index 2a01ad300755e60c8c7414072e225ec368d44ab6..d8c72c5585ad8616ea037043f164f01d30e0efe2 100644 --- a/lib/workers/pr/index.js +++ b/lib/workers/pr/index.js @@ -116,8 +116,8 @@ async function ensurePr(prConfig) { // Get changelog and then generate template strings for (const upgrade of upgrades) { const upgradeKey = `${upgrade.depName}-${upgrade.manager}-${ - upgrade.changeLogFromVersion - }-${upgrade.changeLogToVersion}`; + upgrade.fromVersion + }-${upgrade.toVersion}`; if (processedUpgrades.indexOf(upgradeKey) !== -1) { continue; // eslint-disable-line no-continue } @@ -127,8 +127,8 @@ async function ensurePr(prConfig) { manager: upgrade.manager, depType: upgrade.depType, depName: upgrade.depName, - fromVersion: upgrade.changeLogFromVersion, - newVersion: upgrade.changeLogToVersion, + fromVersion: upgrade.fromVersion, + newVersion: upgrade.toVersion, }); if (logJSON) { diff --git a/test/manager/buildkite/__snapshots__/package.spec.js.snap b/test/manager/buildkite/__snapshots__/package.spec.js.snap index 41de9ae4af1c3da4a10d73143b6a30f57a755f13..117ea339eb62157d22ccf9cf2665cc827988bfdc 100644 --- a/test/manager/buildkite/__snapshots__/package.spec.js.snap +++ b/test/manager/buildkite/__snapshots__/package.spec.js.snap @@ -3,12 +3,12 @@ exports[`lib/manager/buildkite/package getPackageUpdates() returns one upgrade 1`] = ` Array [ Object { - "changeLogFromVersion": "v1.0.0", - "changeLogToVersion": "v1.2.0", + "fromVersion": "v1.0.0", "newVersion": "v1.2.0", "newVersionMajor": 1, "newVersionMinor": 2, "repositoryUrl": "https://github.com/some/plugin-buildkite-plugin", + "toVersion": "v1.2.0", "type": "minor", }, ] diff --git a/test/manager/circleci/__snapshots__/extract.spec.js.snap b/test/manager/circleci/__snapshots__/extract.spec.js.snap index e5591adca821d225adfbee9e0bd9d8db396cfcce..219e93a8c15d18a20961973bcec6fb700e6b6036 100644 --- a/test/manager/circleci/__snapshots__/extract.spec.js.snap +++ b/test/manager/circleci/__snapshots__/extract.spec.js.snap @@ -3,7 +3,6 @@ exports[`lib/manager/circleci/extract extractDependencies() extracts multiple image lines 1`] = ` Array [ Object { - "changeLogFromVersion": "node", "currentDepTag": "node", "currentDepTagDigest": "node", "currentDigest": undefined, @@ -11,10 +10,10 @@ Array [ "currentTag": undefined, "depName": "node", "dockerRegistry": undefined, + "fromVersion": "node", "lineNumber": 12, }, Object { - "changeLogFromVersion": "node:4", "currentDepTag": "node:4", "currentDepTagDigest": "node:4", "currentDigest": undefined, @@ -22,10 +21,10 @@ Array [ "currentTag": "4", "depName": "node", "dockerRegistry": undefined, + "fromVersion": "node:4", "lineNumber": 57, }, Object { - "changeLogFromVersion": "node:6", "currentDepTag": "node:6", "currentDepTagDigest": "node:6", "currentDigest": undefined, @@ -33,10 +32,10 @@ Array [ "currentTag": "6", "depName": "node", "dockerRegistry": undefined, + "fromVersion": "node:6", "lineNumber": 61, }, Object { - "changeLogFromVersion": "node:8.9.0", "currentDepTag": "node:8.9.0", "currentDepTagDigest": "node:8.9.0", "currentDigest": undefined, @@ -44,6 +43,7 @@ Array [ "currentTag": "8.9.0", "depName": "node", "dockerRegistry": undefined, + "fromVersion": "node:8.9.0", "lineNumber": 65, }, ] diff --git a/test/manager/npm/__snapshots__/versions.spec.js.snap b/test/manager/npm/__snapshots__/versions.spec.js.snap index 25a626af5c873650b3da157fefa7331b51e1b20f..46328ef37118a01c3aaf6c101338da122734df82 100644 --- a/test/manager/npm/__snapshots__/versions.spec.js.snap +++ b/test/manager/npm/__snapshots__/versions.spec.js.snap @@ -10,12 +10,12 @@ Array [ "unpublishable": false, }, Object { - "changeLogFromVersion": "0.4.4", - "changeLogToVersion": "1.4.1", + "fromVersion": "0.4.4", "isMajor": true, "newVersion": "1.4.1", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "major", "unpublishable": false, }, @@ -25,12 +25,12 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) disables major release separation (minor) 1`] = ` Array [ Object { - "changeLogFromVersion": "1.0.0", - "changeLogToVersion": "1.4.1", + "fromVersion": "1.0.0", "isMinor": true, "newVersion": "1.4.1", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "minor", "unpublishable": false, }, @@ -40,13 +40,13 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) handles prerelease jumps 1`] = ` Array [ Object { - "changeLogFromVersion": "2.9.0-rc", - "changeLogToVersion": "2.9.1-insiders.20180516", + "fromVersion": "2.9.0-rc", "isMinor": true, "isRange": true, "newVersion": "^2.9.1-insiders.20180516", "newVersionMajor": 2, "newVersionMinor": 9, + "toVersion": "2.9.1-insiders.20180516", "type": "minor", "unpublishable": false, }, @@ -63,12 +63,12 @@ Array [ "unpublishable": false, }, Object { - "changeLogFromVersion": "0.9.7", - "changeLogToVersion": "1.4.1", + "fromVersion": "0.9.7", "isMajor": true, "newVersion": "1.4.1", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "major", "unpublishable": false, }, @@ -96,12 +96,12 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) rejects non-ful exports[`manager/npm/versions .determineUpgrades(npmDep, config) rejects non-range in-range updates 1`] = ` Array [ Object { - "changeLogFromVersion": "1.0.0", - "changeLogToVersion": "1.4.1", + "fromVersion": "1.0.0", "isMinor": true, "newVersion": "1.4.1", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "minor", "unpublishable": false, }, @@ -120,13 +120,13 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) replaces major complex ranged versions if configured 1`] = ` Array [ Object { - "changeLogFromVersion": "2.7.0", - "changeLogToVersion": "3.8.1", + "fromVersion": "2.7.0", "isMajor": true, "isRange": true, "newVersion": "^3.0.0", "newVersionMajor": 3, "newVersionMinor": 8, + "toVersion": "3.8.1", "type": "major", "unpublishable": false, }, @@ -136,13 +136,13 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) replaces minor complex ranged versions if configured 1`] = ` Array [ Object { - "changeLogFromVersion": "1.3.0", - "changeLogToVersion": "1.4.1", + "fromVersion": "1.3.0", "isMinor": true, "isRange": true, "newVersion": "~1.4.0", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "minor", "unpublishable": false, }, @@ -166,12 +166,12 @@ Object { exports[`manager/npm/versions .determineUpgrades(npmDep, config) returns both updates if automerging minor 1`] = ` Array [ Object { - "changeLogFromVersion": "0.4.4", - "changeLogToVersion": "0.9.7", + "fromVersion": "0.4.4", "isMinor": true, "newVersion": "0.9.7", "newVersionMajor": 0, "newVersionMinor": 9, + "toVersion": "0.9.7", "type": "minor", "unpublishable": false, }, @@ -183,12 +183,12 @@ Array [ "unpublishable": false, }, Object { - "changeLogFromVersion": "0.4.4", - "changeLogToVersion": "1.4.1", + "fromVersion": "0.4.4", "isMajor": true, "newVersion": "1.4.1", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "major", "unpublishable": false, }, @@ -198,22 +198,22 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) returns minor update if automerging both patch and minor 1`] = ` Array [ Object { - "changeLogFromVersion": "0.9.0", - "changeLogToVersion": "0.9.7", + "fromVersion": "0.9.0", "isMinor": true, "newVersion": "0.9.7", "newVersionMajor": 0, "newVersionMinor": 9, + "toVersion": "0.9.7", "type": "minor", "unpublishable": false, }, Object { - "changeLogFromVersion": "0.9.0", - "changeLogToVersion": "1.4.1", + "fromVersion": "0.9.0", "isMajor": true, "newVersion": "1.4.1", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "major", "unpublishable": false, }, @@ -223,22 +223,22 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) returns minor update if separate patches not configured 1`] = ` Array [ Object { - "changeLogFromVersion": "0.9.0", - "changeLogToVersion": "0.9.7", + "fromVersion": "0.9.0", "isMinor": true, "newVersion": "0.9.7", "newVersionMajor": 0, "newVersionMinor": 9, + "toVersion": "0.9.7", "type": "minor", "unpublishable": false, }, Object { - "changeLogFromVersion": "0.9.0", - "changeLogToVersion": "1.4.1", + "fromVersion": "0.9.0", "isMajor": true, "newVersion": "1.4.1", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "major", "unpublishable": false, }, @@ -255,12 +255,12 @@ Array [ "unpublishable": false, }, Object { - "changeLogFromVersion": "0.4.4", - "changeLogToVersion": "1.4.1", + "fromVersion": "0.4.4", "isMajor": true, "newVersion": "1.4.1", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "major", "unpublishable": false, }, @@ -277,12 +277,12 @@ Array [ "unpublishable": false, }, Object { - "changeLogFromVersion": "0.4.4", - "changeLogToVersion": "1.4.1", + "fromVersion": "0.4.4", "isMajor": true, "newVersion": "1.4.1", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "major", "unpublishable": false, }, @@ -292,32 +292,32 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) returns patch minor and major 1`] = ` Array [ Object { - "changeLogFromVersion": "0.8.0", - "changeLogToVersion": "0.9.7", + "fromVersion": "0.8.0", "isMinor": true, "newVersion": "0.9.7", "newVersionMajor": 0, "newVersionMinor": 9, + "toVersion": "0.9.7", "type": "minor", "unpublishable": false, }, Object { - "changeLogFromVersion": "0.8.0", - "changeLogToVersion": "0.8.12", + "fromVersion": "0.8.0", "isPatch": true, "newVersion": "0.8.12", "newVersionMajor": 0, "newVersionMinor": 8, + "toVersion": "0.8.12", "type": "patch", "unpublishable": false, }, Object { - "changeLogFromVersion": "0.8.0", - "changeLogToVersion": "1.4.1", + "fromVersion": "0.8.0", "isMajor": true, "newVersion": "1.4.1", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "major", "unpublishable": false, }, @@ -327,22 +327,22 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) returns patch update if automerging patch 1`] = ` Array [ Object { - "changeLogFromVersion": "0.9.0", - "changeLogToVersion": "0.9.7", + "fromVersion": "0.9.0", "isPatch": true, "newVersion": "0.9.7", "newVersionMajor": 0, "newVersionMinor": 9, + "toVersion": "0.9.7", "type": "patch", "unpublishable": false, }, Object { - "changeLogFromVersion": "0.9.0", - "changeLogToVersion": "1.4.1", + "fromVersion": "0.9.0", "isMajor": true, "newVersion": "1.4.1", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "major", "unpublishable": false, }, @@ -352,22 +352,22 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) returns patch update if separateMinorPatch 1`] = ` Array [ Object { - "changeLogFromVersion": "0.9.0", - "changeLogToVersion": "0.9.7", + "fromVersion": "0.9.0", "isPatch": true, "newVersion": "0.9.7", "newVersionMajor": 0, "newVersionMinor": 9, + "toVersion": "0.9.7", "type": "patch", "unpublishable": false, }, Object { - "changeLogFromVersion": "0.9.0", - "changeLogToVersion": "1.4.1", + "fromVersion": "0.9.0", "isMajor": true, "newVersion": "1.4.1", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "major", "unpublishable": false, }, @@ -386,12 +386,12 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) should allow unstable versions if the current version is unstable 1`] = ` Array [ Object { - "changeLogFromVersion": "1.0.0-beta", - "changeLogToVersion": "1.1.0-beta", + "fromVersion": "1.0.0-beta", "isMinor": true, "newVersion": "1.1.0-beta", "newVersionMajor": 1, "newVersionMinor": 1, + "toVersion": "1.1.0-beta", "type": "minor", "unpublishable": false, }, @@ -414,13 +414,13 @@ Object { exports[`manager/npm/versions .determineUpgrades(npmDep, config) should treat zero zero caret ranges as pinned 1`] = ` Array [ Object { - "changeLogFromVersion": "0.0.34", - "changeLogToVersion": "0.0.35", + "fromVersion": "0.0.34", "isMinor": true, "isRange": true, "newVersion": "^0.0.35", "newVersionMajor": 0, "newVersionMinor": 0, + "toVersion": "0.0.35", "type": "minor", "unpublishable": false, }, @@ -430,12 +430,12 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) supports > latest versions if configured 1`] = ` Array [ Object { - "changeLogFromVersion": "1.4.1", - "changeLogToVersion": "2.0.3", + "fromVersion": "1.4.1", "isMajor": true, "newVersion": "2.0.3", "newVersionMajor": 2, "newVersionMinor": 0, + "toVersion": "2.0.3", "type": "major", "unpublishable": false, }, @@ -445,13 +445,13 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) supports complex major hyphen ranges 1`] = ` Array [ Object { - "changeLogFromVersion": "2.7.0", - "changeLogToVersion": "3.8.1", + "fromVersion": "2.7.0", "isMajor": true, "isRange": true, "newVersion": "1.x - 3.x", "newVersionMajor": 3, "newVersionMinor": 8, + "toVersion": "3.8.1", "type": "major", "unpublishable": false, }, @@ -461,13 +461,13 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) supports complex major ranges 1`] = ` Array [ Object { - "changeLogFromVersion": "2.7.0", - "changeLogToVersion": "3.8.1", + "fromVersion": "2.7.0", "isMajor": true, "isRange": true, "newVersion": "^1.0.0 || ^2.0.0 || ^3.0.0", "newVersionMajor": 3, "newVersionMinor": 8, + "toVersion": "3.8.1", "type": "major", "unpublishable": false, }, @@ -476,13 +476,13 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) supports complex ranges 1`] = ` Object { - "changeLogFromVersion": "0.8.12", - "changeLogToVersion": "0.9.7", + "fromVersion": "0.8.12", "isMinor": true, "isRange": true, "newVersion": "^0.7.0 || ^0.8.0 || ^0.9.0", "newVersionMajor": 0, "newVersionMinor": 9, + "toVersion": "0.9.7", "type": "minor", "unpublishable": false, } @@ -491,13 +491,13 @@ Object { exports[`manager/npm/versions .determineUpgrades(npmDep, config) supports complex tilde ranges 1`] = ` Array [ Object { - "changeLogFromVersion": "1.3.0", - "changeLogToVersion": "1.4.1", + "fromVersion": "1.3.0", "isMinor": true, "isRange": true, "newVersion": "~1.2.0 || ~1.3.0 || ~1.4.0", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "minor", "unpublishable": false, }, @@ -519,13 +519,13 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) supports in-range updates 1`] = ` Array [ Object { - "changeLogFromVersion": "1.0.0", - "changeLogToVersion": "1.4.1", + "fromVersion": "1.0.0", "isMinor": true, "isRange": true, "newVersion": "~1.4.1", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "minor", "unpublishable": false, }, @@ -535,12 +535,12 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) supports minor and major upgrades for ranged versions 1`] = ` Array [ Object { - "changeLogFromVersion": "0.4.4", - "changeLogToVersion": "0.9.7", + "fromVersion": "0.4.4", "isMinor": true, "newVersion": "0.9.7", "newVersionMajor": 0, "newVersionMinor": 9, + "toVersion": "0.9.7", "type": "minor", "unpublishable": false, }, @@ -552,12 +552,12 @@ Array [ "unpublishable": false, }, Object { - "changeLogFromVersion": "0.4.4", - "changeLogToVersion": "1.4.1", + "fromVersion": "0.4.4", "isMajor": true, "newVersion": "1.4.1", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "major", "unpublishable": false, }, @@ -567,12 +567,12 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) supports minor and major upgrades for tilde ranges 1`] = ` Array [ Object { - "changeLogFromVersion": "0.4.4", - "changeLogToVersion": "0.9.7", + "fromVersion": "0.4.4", "isMinor": true, "newVersion": "0.9.7", "newVersionMajor": 0, "newVersionMinor": 9, + "toVersion": "0.9.7", "type": "minor", "unpublishable": false, }, @@ -584,12 +584,12 @@ Array [ "unpublishable": false, }, Object { - "changeLogFromVersion": "0.4.4", - "changeLogToVersion": "1.4.1", + "fromVersion": "0.4.4", "isMajor": true, "newVersion": "1.4.1", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "major", "unpublishable": false, }, @@ -599,13 +599,13 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades .x major ranges without pinning 1`] = ` Array [ Object { - "changeLogFromVersion": "0.9.7", - "changeLogToVersion": "1.4.1", + "fromVersion": "0.9.7", "isMajor": true, "isRange": true, "newVersion": "1.x", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "major", "unpublishable": false, }, @@ -615,12 +615,12 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades .x minor ranges 1`] = ` Array [ Object { - "changeLogFromVersion": "1.3.0", - "changeLogToVersion": "1.4.1", + "fromVersion": "1.3.0", "isMinor": true, "newVersion": "1.4.1", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "minor", "unpublishable": false, }, @@ -637,13 +637,13 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades .x minor ranges without pinning 1`] = ` Array [ Object { - "changeLogFromVersion": "1.3.0", - "changeLogToVersion": "1.4.1", + "fromVersion": "1.3.0", "isMinor": true, "isRange": true, "newVersion": "1.4.x", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "minor", "unpublishable": false, }, @@ -653,24 +653,24 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades less than equal ranges without pinning 1`] = ` Array [ Object { - "changeLogFromVersion": "0.7.2", - "changeLogToVersion": "0.9.7", + "fromVersion": "0.7.2", "isMinor": true, "isRange": true, "newVersion": "<= 0.9.7", "newVersionMajor": 0, "newVersionMinor": 9, + "toVersion": "0.9.7", "type": "minor", "unpublishable": false, }, Object { - "changeLogFromVersion": "0.7.2", - "changeLogToVersion": "1.4.1", + "fromVersion": "0.7.2", "isMajor": true, "isRange": true, "newVersion": "<= 1.4.1", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "major", "unpublishable": false, }, @@ -680,24 +680,24 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades less than ranges without pinning 1`] = ` Array [ Object { - "changeLogFromVersion": "0.7.1", - "changeLogToVersion": "0.9.7", + "fromVersion": "0.7.1", "isMinor": true, "isRange": true, "newVersion": "< 0.9.8", "newVersionMajor": 0, "newVersionMinor": 9, + "toVersion": "0.9.7", "type": "minor", "unpublishable": false, }, Object { - "changeLogFromVersion": "0.7.1", - "changeLogToVersion": "1.4.1", + "fromVersion": "0.7.1", "isMajor": true, "isRange": true, "newVersion": "< 1.4.2", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "major", "unpublishable": false, }, @@ -707,13 +707,13 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades major greater than less than ranges without pinning 1`] = ` Array [ Object { - "changeLogFromVersion": "0.9.7", - "changeLogToVersion": "1.4.1", + "fromVersion": "0.9.7", "isMajor": true, "isRange": true, "newVersion": ">= 0.5.0 < 2.0.0", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "major", "unpublishable": false, }, @@ -723,13 +723,13 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades major less than equal ranges 1`] = ` Array [ Object { - "changeLogFromVersion": "1.0.0", - "changeLogToVersion": "1.4.1", + "fromVersion": "1.0.0", "isMinor": true, "isRange": true, "newVersion": "<= 2.0.0", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "minor", "unpublishable": false, }, @@ -739,13 +739,13 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades major less than ranges without pinning 1`] = ` Array [ Object { - "changeLogFromVersion": "0.9.7", - "changeLogToVersion": "1.4.1", + "fromVersion": "0.9.7", "isMajor": true, "isRange": true, "newVersion": "< 2.0.0", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "major", "unpublishable": false, }, @@ -755,24 +755,24 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades minor greater than less than equals ranges without pinning 1`] = ` Array [ Object { - "changeLogFromVersion": "0.8.0", - "changeLogToVersion": "0.9.7", + "fromVersion": "0.8.0", "isMinor": true, "isRange": true, "newVersion": ">= 0.5.0 <= 0.10.0", "newVersionMajor": 0, "newVersionMinor": 9, + "toVersion": "0.9.7", "type": "minor", "unpublishable": false, }, Object { - "changeLogFromVersion": "0.8.0", - "changeLogToVersion": "1.4.1", + "fromVersion": "0.8.0", "isMajor": true, "isRange": true, "newVersion": ">= 0.5.0 <= 1.5.0", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "major", "unpublishable": false, }, @@ -782,24 +782,24 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades minor greater than less than ranges without pinning 1`] = ` Array [ Object { - "changeLogFromVersion": "0.7.2", - "changeLogToVersion": "0.9.7", + "fromVersion": "0.7.2", "isMinor": true, "isRange": true, "newVersion": ">= 0.5.0 <0.10", "newVersionMajor": 0, "newVersionMinor": 9, + "toVersion": "0.9.7", "type": "minor", "unpublishable": false, }, Object { - "changeLogFromVersion": "0.7.2", - "changeLogToVersion": "1.4.1", + "fromVersion": "0.7.2", "isMajor": true, "isRange": true, "newVersion": ">= 0.5.0 <1.5", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "major", "unpublishable": false, }, @@ -809,12 +809,12 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades minor ranged versions 1`] = ` Array [ Object { - "changeLogFromVersion": "1.0.1", - "changeLogToVersion": "1.4.1", + "fromVersion": "1.0.1", "isMinor": true, "newVersion": "1.4.1", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "minor", "unpublishable": false, }, @@ -831,24 +831,24 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades multiple caret ranges without pinning 1`] = ` Array [ Object { - "changeLogFromVersion": "0.7.2", - "changeLogToVersion": "0.9.7", + "fromVersion": "0.7.2", "isMinor": true, "isRange": true, "newVersion": "^0.9.0", "newVersionMajor": 0, "newVersionMinor": 9, + "toVersion": "0.9.7", "type": "minor", "unpublishable": false, }, Object { - "changeLogFromVersion": "0.7.2", - "changeLogToVersion": "1.4.1", + "fromVersion": "0.7.2", "isMajor": true, "isRange": true, "newVersion": "^1.0.0", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "major", "unpublishable": false, }, @@ -858,24 +858,24 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades multiple tilde ranges without pinning 1`] = ` Array [ Object { - "changeLogFromVersion": "0.7.2", - "changeLogToVersion": "0.9.7", + "fromVersion": "0.7.2", "isMinor": true, "isRange": true, "newVersion": "~0.9.0", "newVersionMajor": 0, "newVersionMinor": 9, + "toVersion": "0.9.7", "type": "minor", "unpublishable": false, }, Object { - "changeLogFromVersion": "0.7.2", - "changeLogToVersion": "1.4.1", + "fromVersion": "0.7.2", "isMajor": true, "isRange": true, "newVersion": "~1.4.0", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "major", "unpublishable": false, }, @@ -885,13 +885,13 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades shorthand major ranges without pinning 1`] = ` Array [ Object { - "changeLogFromVersion": "0.9.7", - "changeLogToVersion": "1.4.1", + "fromVersion": "0.9.7", "isMajor": true, "isRange": true, "newVersion": "1", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "major", "unpublishable": false, }, @@ -901,13 +901,13 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades shorthand minor ranges without pinning 1`] = ` Array [ Object { - "changeLogFromVersion": "1.3.0", - "changeLogToVersion": "1.4.1", + "fromVersion": "1.3.0", "isMinor": true, "isRange": true, "newVersion": "1.4", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "minor", "unpublishable": false, }, @@ -917,12 +917,12 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades tilde ranges 1`] = ` Array [ Object { - "changeLogFromVersion": "1.3.0", - "changeLogToVersion": "1.4.1", + "fromVersion": "1.3.0", "isMinor": true, "newVersion": "1.4.1", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "minor", "unpublishable": false, }, @@ -939,13 +939,13 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades tilde ranges without pinning 1`] = ` Array [ Object { - "changeLogFromVersion": "1.3.0", - "changeLogToVersion": "1.4.1", + "fromVersion": "1.3.0", "isMinor": true, "isRange": true, "newVersion": "~1.4.0", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "minor", "unpublishable": false, }, @@ -955,12 +955,12 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) uses the locked version for pinning 1`] = ` Array [ Object { - "changeLogFromVersion": "1.0.0", - "changeLogToVersion": "1.4.1", + "fromVersion": "1.0.0", "isMinor": true, "newVersion": "1.4.1", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "minor", "unpublishable": false, }, @@ -977,13 +977,13 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) widens .x OR ranges 1`] = ` Array [ Object { - "changeLogFromVersion": "2.7.0", - "changeLogToVersion": "3.8.1", + "fromVersion": "2.7.0", "isMajor": true, "isRange": true, "newVersion": "1.x || 2.x || 3.x", "newVersionMajor": 3, "newVersionMinor": 8, + "toVersion": "3.8.1", "type": "major", "unpublishable": false, }, @@ -993,13 +993,13 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) widens major ranged versions if configured 1`] = ` Array [ Object { - "changeLogFromVersion": "2.7.0", - "changeLogToVersion": "3.8.1", + "fromVersion": "2.7.0", "isMajor": true, "isRange": true, "newVersion": "^2.0.0 || ^3.0.0", "newVersionMajor": 3, "newVersionMinor": 8, + "toVersion": "3.8.1", "type": "major", "unpublishable": false, }, @@ -1009,13 +1009,13 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) widens minor ranged versions if configured 1`] = ` Array [ Object { - "changeLogFromVersion": "1.3.0", - "changeLogToVersion": "1.4.1", + "fromVersion": "1.3.0", "isMinor": true, "isRange": true, "newVersion": "~1.3.0 || ~1.4.0", "newVersionMajor": 1, "newVersionMinor": 4, + "toVersion": "1.4.1", "type": "minor", "unpublishable": false, }, @@ -1025,13 +1025,13 @@ Array [ exports[`manager/npm/versions .determineUpgrades(npmDep, config) widens stanndalone major OR ranges 1`] = ` Array [ Object { - "changeLogFromVersion": "2.7.0", - "changeLogToVersion": "3.8.1", + "fromVersion": "2.7.0", "isMajor": true, "isRange": true, "newVersion": "1 || 2 || 3", "newVersionMajor": 3, "newVersionMinor": 8, + "toVersion": "3.8.1", "type": "major", "unpublishable": false, }, diff --git a/test/manager/pip_requirements/__snapshots__/package.spec.js.snap b/test/manager/pip_requirements/__snapshots__/package.spec.js.snap index ebc86ee1ba093066eb03d5248354cd4dc9be4ad5..9e5c6685429709e8cf8b57cdf6216c9a779d0825 100644 --- a/test/manager/pip_requirements/__snapshots__/package.spec.js.snap +++ b/test/manager/pip_requirements/__snapshots__/package.spec.js.snap @@ -3,11 +3,11 @@ exports[`lib/manager/pip_requirements/package getPackageUpdates() returns one upgrade 1`] = ` Array [ Object { - "changeLogFromVersion": "0.3.2", - "changeLogToVersion": "1.0.2", "depName": "some-package", + "fromVersion": "0.3.2", "newVersion": "1.0.2", "newVersionMajor": 1, + "toVersion": "1.0.2", }, ] `;