diff --git a/lib/modules/manager/pep621/processors/uv.spec.ts b/lib/modules/manager/pep621/processors/uv.spec.ts index 633f5f43897..9a5b2b1ff33 100644 --- a/lib/modules/manager/pep621/processors/uv.spec.ts +++ b/lib/modules/manager/pep621/processors/uv.spec.ts @@ -472,8 +472,8 @@ describe('modules/manager/pep621/processors/uv', () => { const updatedDeps = [ { packageName: 'dep1', depType: depTypes.dependencies }, { packageName: 'dep2', depType: depTypes.dependencies }, - { depName: 'group1/dep3', depType: depTypes.optionalDependencies }, - { depName: 'group1/dep4', depType: depTypes.optionalDependencies }, + { depName: 'dep3', depType: depTypes.optionalDependencies }, + { depName: 'dep4', depType: depTypes.optionalDependencies }, { depName: 'dep5', depType: depTypes.uvDevDependencies }, { depName: 'dep6', depType: depTypes.uvDevDependencies }, { depName: 'dep7', depType: depTypes.buildSystemRequires }, diff --git a/lib/modules/manager/pep621/processors/uv.ts b/lib/modules/manager/pep621/processors/uv.ts index 5f0b160d1fd..b6533177116 100644 --- a/lib/modules/manager/pep621/processors/uv.ts +++ b/lib/modules/manager/pep621/processors/uv.ts @@ -231,7 +231,7 @@ function generateCMD(updatedDeps: Upgrade[]): string { for (const dep of updatedDeps) { switch (dep.depType) { case depTypes.optionalDependencies: { - deps.push(dep.depName!.split('/')[1]); + deps.push(dep.depName!); break; } case depTypes.uvDevDependencies: diff --git a/lib/modules/versioning/npm/index.spec.ts b/lib/modules/versioning/npm/index.spec.ts index 175f3b165d5..dbbb3da0913 100644 --- a/lib/modules/versioning/npm/index.spec.ts +++ b/lib/modules/versioning/npm/index.spec.ts @@ -135,6 +135,7 @@ describe('modules/versioning/npm/index', () => { ${'1.*'} | ${'replace'} | ${'1.0.0'} | ${'2.1.0'} | ${'2.*'} ${'~0.6.1'} | ${'replace'} | ${'0.6.8'} | ${'0.7.0-rc.2'} | ${'~0.7.0-rc'} ${'>= 0.1.21 < 0.2.0'} | ${'bump'} | ${'0.1.21'} | ${'0.1.24'} | ${'>= 0.1.24 < 0.2.0'} + ${'>= 0.1.21 < 0.2.0'} | ${'widen'} | ${'0.1.21'} | ${'0.2.0'} | ${'>= 0.1.21 < 0.3.0'} ${'>= 0.1.21 <= 0.2.0'} | ${'bump'} | ${'0.1.21'} | ${'0.1.24'} | ${'>= 0.1.24 <= 0.2.0'} ${'>= 0.0.1 <= 0.1'} | ${'bump'} | ${'0.0.1'} | ${'0.0.2'} | ${'>= 0.0.2 <= 0.1'} ${'>= 0.0.1 < 0.1'} | ${'bump'} | ${'0.1.0'} | ${'0.2.1'} | ${'>= 0.2.1 < 0.3'} diff --git a/lib/modules/versioning/npm/range.ts b/lib/modules/versioning/npm/range.ts index 24b1dec31b6..0d9a2d13a54 100644 --- a/lib/modules/versioning/npm/range.ts +++ b/lib/modules/versioning/npm/range.ts @@ -219,6 +219,9 @@ export function getNewValue({ if (currentValue.endsWith('.0.0')) { const newMajor = toVersionMajor + 1; res = `<${newMajor}.0.0`; + } else if (currentValue.endsWith('.0')) { + const newMinor = toVersionMinor + 1; + res = `<${toVersionMajor}.${newMinor}${element.patch ? '.0' : ''}`; } else if (element.patch) { // TODO: types (#22198) res = `<${increment(newVersion, 'patch')!}`; diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index f46213a7d6a..a4697f3ff3a 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -5,19 +5,19 @@ ARG BASE_IMAGE_TYPE=slim # -------------------------------------- # slim image # -------------------------------------- -FROM ghcr.io/renovatebot/base-image:9.64.7@sha256:5d1b35473fef5649df954aea48613fe172b4280297f21bd9c46f708e77267636 AS slim-base +FROM ghcr.io/renovatebot/base-image:9.64.8@sha256:a7b9857e80a9369e7f403583d917b5275adecd99820278f918557c83cadb5d77 AS slim-base # -------------------------------------- # full image # -------------------------------------- -FROM ghcr.io/renovatebot/base-image:9.64.7-full@sha256:5aaf3a5b15b7c9416101af14b790e6d35d15676cf8918874eed3c846843bc5aa AS full-base +FROM ghcr.io/renovatebot/base-image:9.64.8-full@sha256:5ca2a57aeb592727150a7eb959fa18b091e2fd039bf73fbdbf569b303b69a6c7 AS full-base ENV RENOVATE_BINARY_SOURCE=global # -------------------------------------- # build image # -------------------------------------- -FROM --platform=$BUILDPLATFORM ghcr.io/renovatebot/base-image:9.64.7@sha256:5d1b35473fef5649df954aea48613fe172b4280297f21bd9c46f708e77267636 AS build +FROM --platform=$BUILDPLATFORM ghcr.io/renovatebot/base-image:9.64.8@sha256:a7b9857e80a9369e7f403583d917b5275adecd99820278f918557c83cadb5d77 AS build # We want a specific node version here # renovate: datasource=github-releases packageName=containerbase/node-prebuild versioning=node