fix(manager/pdm): install python first (#22441)

renovatebot · May 26, 2023 · 2f23c14 · 2f23c14
1 parent 470d3b5
commit 2f23c14
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/lib/modules/manager/pep621/artifacts.spec.ts b/lib/modules/manager/pep621/artifacts.spec.ts
@@ -42,6 +42,10 @@ describe('modules/manager/pep621/artifacts', () => {
       fs.getSiblingFileName.mockReturnValueOnce('pdm.lock');
       fs.readLocalFile.mockResolvedValueOnce('old test content');
       fs.readLocalFile.mockResolvedValueOnce('new test content');
+      // python
+      getPkgReleases.mockResolvedValueOnce({
+        releases: [{ version: '3.11.1' }, { version: '3.11.2' }],
+      });
       // pdm
       getPkgReleases.mockResolvedValueOnce({
         releases: [{ version: 'v2.6.1' }, { version: 'v2.5.0' }],
@@ -86,6 +90,8 @@ describe('modules/manager/pep621/artifacts', () => {
             '-w "/tmp/github/some/repo" ' +
             'containerbase/sidecar ' +
             'bash -l -c "' +
+            'install-tool python 3.11.2 ' +
+            '&& ' +
             'install-tool pdm v2.5.0 ' +
             '&& ' +
             'pdm update dep1' +

diff --git a/lib/modules/manager/pep621/processors/pdm.spec.ts b/lib/modules/manager/pep621/processors/pdm.spec.ts
@@ -41,6 +41,10 @@ describe('modules/manager/pep621/processors/pdm', () => {
       fs.getSiblingFileName.mockReturnValueOnce('pdm.lock');
       fs.readLocalFile.mockResolvedValueOnce('test content');
       fs.readLocalFile.mockResolvedValueOnce('test content');
+      // python
+      getPkgReleases.mockResolvedValueOnce({
+        releases: [{ version: '3.11.1' }, { version: '3.11.2' }],
+      });
       // pdm
       getPkgReleases.mockResolvedValueOnce({
         releases: [{ version: 'v2.6.1' }, { version: 'v2.5.0' }],
@@ -71,6 +75,8 @@ describe('modules/manager/pep621/processors/pdm', () => {
             '-w "/tmp/github/some/repo" ' +
             'containerbase/sidecar ' +
             'bash -l -c "' +
+            'install-tool python 3.11.2 ' +
+            '&& ' +
             'install-tool pdm v2.5.0 ' +
             '&& ' +
             'pdm update dep1' +
@@ -106,6 +112,10 @@ describe('modules/manager/pep621/processors/pdm', () => {
       fs.getSiblingFileName.mockReturnValueOnce('pdm.lock');
       fs.readLocalFile.mockResolvedValueOnce('test content');
       fs.readLocalFile.mockResolvedValueOnce('changed test content');
+      // python
+      getPkgReleases.mockResolvedValueOnce({
+        releases: [{ version: '3.11.1' }, { version: '3.11.2' }],
+      });
       // pdm
       getPkgReleases.mockResolvedValueOnce({
         releases: [{ version: 'v2.6.1' }, { version: 'v2.5.0' }],
@@ -140,6 +150,10 @@ describe('modules/manager/pep621/processors/pdm', () => {
       fs.getSiblingFileName.mockReturnValueOnce('pdm.lock');
       fs.readLocalFile.mockResolvedValueOnce('test content');
       fs.readLocalFile.mockResolvedValueOnce('changed test content');
+      // python
+      getPkgReleases.mockResolvedValueOnce({
+        releases: [{ version: '3.11.1' }, { version: '3.11.2' }],
+      });
       // pdm
       getPkgReleases.mockResolvedValueOnce({
         releases: [{ version: 'v2.6.1' }, { version: 'v2.5.0' }],

diff --git a/lib/modules/manager/pep621/processors/pdm.ts b/lib/modules/manager/pep621/processors/pdm.ts
@@ -64,15 +64,18 @@ export class PdmProcessor implements PyProjectProcessor {
         logger.debug('No pdm.lock found');
         return null;
       }
-
-      const toolConstraint: ToolConstraint = {
+      const pythonConstraint: ToolConstraint = {
+        toolName: 'python',
+        constraint: config.constraints?.python,
+      };
+      const pdmConstraint: ToolConstraint = {
         toolName: 'pdm',
         constraint: config.constraints?.pdm,
       };
 
       const execOptions: ExecOptions = {
         docker: {},
-        toolConstraints: [toolConstraint],
+        toolConstraints: [pythonConstraint, pdmConstraint],
       };
 
       // on lockFileMaintenance do not specify any packages and update the complete lock file