renovate 42.0.0-next.2 → 42.0.1

package/dist/modules/manager/composer/schema.d.ts

@@ -12,11 +12,11 @@ export declare const ComposerRepo: z.ZodObject<{
      */
     url: z.ZodEffects<z.ZodString, string, string>;
 }, "strip", z.ZodTypeAny, {
-    type: "composer";
     url: string;
-}, {
     type: "composer";
+}, {
     url: string;
+    type: "composer";
 }>;
 export type ComposerRepo = z.infer<typeof ComposerRepo>;
 export declare const GitRepo: z.ZodObject<{
@@ -24,12 +24,12 @@ export declare const GitRepo: z.ZodObject<{
     url: z.ZodString;
     name: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    type: "git";
     url: string;
+    type: "git";
     name?: string | undefined;
 }, {
-    type: "git" | "vcs";
     url: string;
+    type: "git" | "vcs";
     name?: string | undefined;
 }>;
 export type GitRepo = z.infer<typeof GitRepo>;
@@ -38,12 +38,12 @@ export declare const PathRepo: z.ZodObject<{
     url: z.ZodString;
     name: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    type: "path";
     url: string;
+    type: "path";
     name?: string | undefined;
 }, {
-    type: "path";
     url: string;
+    type: "path";
     name?: string | undefined;
 }>;
 export type PathRepo = z.infer<typeof PathRepo>;
@@ -65,34 +65,34 @@ export declare const Repo: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
      */
     url: z.ZodEffects<z.ZodString, string, string>;
 }, "strip", z.ZodTypeAny, {
-    type: "composer";
     url: string;
-}, {
     type: "composer";
+}, {
     url: string;
+    type: "composer";
 }>, z.ZodObject<{
     type: z.ZodEffects<z.ZodEnum<["vcs", "git"]>, "git", "git" | "vcs">;
     url: z.ZodString;
     name: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    type: "git";
     url: string;
+    type: "git";
     name?: string | undefined;
 }, {
-    type: "git" | "vcs";
     url: string;
+    type: "git" | "vcs";
     name?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"path">;
     url: z.ZodString;
     name: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    type: "path";
     url: string;
+    type: "path";
     name?: string | undefined;
 }, {
-    type: "path";
     url: string;
+    type: "path";
     name?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"package">;
@@ -113,23 +113,23 @@ export declare const NamedRepo: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
      */
     url: z.ZodEffects<z.ZodString, string, string>;
 }, "strip", z.ZodTypeAny, {
-    type: "composer";
     url: string;
-}, {
     type: "composer";
+}, {
     url: string;
+    type: "composer";
 }>, z.ZodObject<{
     type: z.ZodEffects<z.ZodEnum<["vcs", "git"]>, "git", "git" | "vcs">;
     url: z.ZodString;
 } & {
     name: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    type: "git";
     url: string;
+    type: "git";
     name: string;
 }, {
-    type: "git" | "vcs";
     url: string;
+    type: "git" | "vcs";
     name: string;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"path">;
@@ -137,12 +137,12 @@ export declare const NamedRepo: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
 } & {
     name: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    type: "path";
     url: string;
+    type: "path";
     name: string;
 }, {
-    type: "path";
     url: string;
+    type: "path";
     name: string;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"package">;
@@ -161,135 +161,135 @@ declare const DisablePackagist: z.ZodObject<{
 }>;
 export type DisablePackagist = z.infer<typeof DisablePackagist>;
 export declare const ReposRecord: z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, false | {
-    type: "composer";
     url: string;
+    type: "composer";
 } | {
-    type: "git";
     url: string;
+    type: "git";
     name?: string | undefined;
 } | {
-    type: "path";
     url: string;
+    type: "path";
     name?: string | undefined;
 } | {
     type: "package";
 }>, Record<string, any>>, ({
-    type: "composer";
     url: string;
+    type: "composer";
 } | {
     type: "package";
 } | {
-    type: "git";
     url: string;
+    type: "git";
     name: string;
 } | {
-    type: "path";
     url: string;
+    type: "path";
     name: string;
 } | {
     type: "disable-packagist";
 })[], Record<string, any>>;
 export type ReposRecord = z.infer<typeof ReposRecord>;
 export declare const ReposArray: z.ZodEffects<z.ZodEffects<z.ZodArray<z.ZodAny, "many">, ({
-    type: "composer";
     url: string;
+    type: "composer";
 } | {
-    type: "git";
     url: string;
+    type: "git";
     name?: string | undefined;
 } | {
-    type: "path";
     url: string;
+    type: "path";
     name?: string | undefined;
 } | {
     type: "package";
 } | {
     type: "disable-packagist";
 })[], any[]>, ({
-    type: "composer";
     url: string;
+    type: "composer";
 } | {
     type: "package";
 } | {
-    type: "git";
     url: string;
+    type: "git";
     name: string;
 } | {
-    type: "path";
     url: string;
+    type: "path";
     name: string;
 } | {
     type: "disable-packagist";
 })[], any[]>;
 export type ReposArray = z.infer<typeof ReposArray>;
 export declare const Repos: z.ZodEffects<z.ZodCatch<z.ZodDefault<z.ZodUnion<[z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, false | {
-    type: "composer";
     url: string;
+    type: "composer";
 } | {
-    type: "git";
     url: string;
+    type: "git";
     name?: string | undefined;
 } | {
-    type: "path";
     url: string;
+    type: "path";
     name?: string | undefined;
 } | {
     type: "package";
 }>, Record<string, any>>, ({
-    type: "composer";
     url: string;
+    type: "composer";
 } | {
     type: "package";
 } | {
-    type: "git";
     url: string;
+    type: "git";
     name: string;
 } | {
-    type: "path";
     url: string;
+    type: "path";
     name: string;
 } | {
     type: "disable-packagist";
 })[], Record<string, any>>, z.ZodEffects<z.ZodEffects<z.ZodArray<z.ZodAny, "many">, ({
-    type: "composer";
     url: string;
+    type: "composer";
 } | {
-    type: "git";
     url: string;
+    type: "git";
     name?: string | undefined;
 } | {
-    type: "path";
     url: string;
+    type: "path";
     name?: string | undefined;
 } | {
     type: "package";
 } | {
     type: "disable-packagist";
 })[], any[]>, ({
-    type: "composer";
     url: string;
+    type: "composer";
 } | {
     type: "package";
 } | {
-    type: "git";
     url: string;
+    type: "git";
     name: string;
 } | {
-    type: "path";
     url: string;
+    type: "path";
     name: string;
 } | {
     type: "disable-packagist";
 })[], any[]>]>>>, {
     registryUrls: string[] | null;
     gitRepos: Record<string, {
-        type: "git";
         url: string;
+        type: "git";
         name?: string | undefined;
     }>;
     pathRepos: Record<string, {
-        type: "path";
         url: string;
+        type: "path";
         name?: string | undefined;
     }>;
 }, unknown>;
@@ -314,73 +314,73 @@ export declare const PackageFile: z.ZodEffects<z.ZodObject<{
         };
     }>>>;
     repositories: z.ZodEffects<z.ZodCatch<z.ZodDefault<z.ZodUnion<[z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, false | {
-        type: "composer";
         url: string;
+        type: "composer";
     } | {
-        type: "git";
         url: string;
+        type: "git";
         name?: string | undefined;
     } | {
-        type: "path";
         url: string;
+        type: "path";
         name?: string | undefined;
     } | {
         type: "package";
     }>, Record<string, any>>, ({
-        type: "composer";
         url: string;
+        type: "composer";
     } | {
         type: "package";
     } | {
-        type: "git";
         url: string;
+        type: "git";
         name: string;
     } | {
-        type: "path";
         url: string;
+        type: "path";
         name: string;
     } | {
         type: "disable-packagist";
     })[], Record<string, any>>, z.ZodEffects<z.ZodEffects<z.ZodArray<z.ZodAny, "many">, ({
-        type: "composer";
         url: string;
+        type: "composer";
     } | {
-        type: "git";
         url: string;
+        type: "git";
         name?: string | undefined;
     } | {
-        type: "path";
         url: string;
+        type: "path";
         name?: string | undefined;
     } | {
         type: "package";
     } | {
         type: "disable-packagist";
     })[], any[]>, ({
-        type: "composer";
         url: string;
+        type: "composer";
     } | {
         type: "package";
     } | {
-        type: "git";
         url: string;
+        type: "git";
         name: string;
     } | {
-        type: "path";
         url: string;
+        type: "path";
         name: string;
     } | {
         type: "disable-packagist";
     })[], any[]>]>>>, {
         registryUrls: string[] | null;
         gitRepos: Record<string, {
-            type: "git";
             url: string;
+            type: "git";
             name?: string | undefined;
         }>;
         pathRepos: Record<string, {
-            type: "path";
             url: string;
+            type: "path";
             name?: string | undefined;
         }>;
     }, unknown>;
@@ -395,13 +395,13 @@ export declare const PackageFile: z.ZodEffects<z.ZodObject<{
     repositories: {
         registryUrls: string[] | null;
         gitRepos: Record<string, {
-            type: "git";
             url: string;
+            type: "git";
             name?: string | undefined;
         }>;
         pathRepos: Record<string, {
-            type: "path";
             url: string;
+            type: "path";
             name?: string | undefined;
         }>;
     };
@@ -424,13 +424,13 @@ export declare const PackageFile: z.ZodEffects<z.ZodObject<{
     repositories: {
         registryUrls: string[] | null;
         gitRepos: Record<string, {
-            type: "git";
             url: string;
+            type: "git";
             name?: string | undefined;
         }>;
         pathRepos: Record<string, {
-            type: "path";
             url: string;
+            type: "path";
             name?: string | undefined;
         }>;
     };
@@ -447,21 +447,21 @@ export type PackageFile = z.infer<typeof PackageFile>;
 export declare const Lockfile: z.ZodEffects<z.ZodObject<{
     'plugin-api-version': z.ZodOptional<z.ZodString>;
     packages: z.ZodCatch<z.ZodEffects<z.ZodArray<z.ZodAny, "many">, {
-        name: string;
         version: string;
+        name: string;
     }[], any[]>>;
     'packages-dev': z.ZodCatch<z.ZodEffects<z.ZodArray<z.ZodAny, "many">, {
-        name: string;
         version: string;
+        name: string;
     }[], any[]>>;
 }, "strip", z.ZodTypeAny, {
     packages: {
-        name: string;
         version: string;
+        name: string;
     }[];
     'packages-dev': {
-        name: string;
         version: string;
+        name: string;
     }[];
     'plugin-api-version'?: string | undefined;
 }, {
@@ -471,12 +471,12 @@ export declare const Lockfile: z.ZodEffects<z.ZodObject<{
 }>, {
     pluginApiVersion: string | undefined;
     packages: {
-        name: string;
         version: string;
+        name: string;
     }[];
     packagesDev: {
-        name: string;
         version: string;
+        name: string;
     }[];
 }, {
     packages?: unknown;
@@ -501,7 +501,7 @@ export declare const ComposerExtract: z.ZodEffects<z.ZodPipeline<z.ZodEffects<z.
     content: string;
     fileName: string;
 }>, z.ZodObject<{
-    file: z.ZodPipeline<z.ZodEffects<z.ZodString, string | number | boolean | import("type-fest").JsonObject | import("type-fest").JsonValue[] | readonly import("type-fest").JsonValue[] | null, string>, z.ZodEffects<z.ZodObject<{
+    file: z.ZodPipeline<z.ZodEffects<z.ZodString, string | number | boolean | import("type-fest", { with: { "resolution-mode": "import" } }).JsonObject | import("type-fest", { with: { "resolution-mode": "import" } }).JsonValue[] | readonly import("type-fest", { with: { "resolution-mode": "import" } }).JsonValue[] | null, string>, z.ZodEffects<z.ZodObject<{
         type: z.ZodOptional<z.ZodString>;
         config: z.ZodCatch<z.ZodNullable<z.ZodObject<{
             platform: z.ZodObject<{
@@ -521,73 +521,73 @@ export declare const ComposerExtract: z.ZodEffects<z.ZodPipeline<z.ZodEffects<z.
             };
         }>>>;
         repositories: z.ZodEffects<z.ZodCatch<z.ZodDefault<z.ZodUnion<[z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, false | {
-            type: "composer";
             url: string;
+            type: "composer";
         } | {
-            type: "git";
             url: string;
+            type: "git";
             name?: string | undefined;
         } | {
-            type: "path";
             url: string;
+            type: "path";
             name?: string | undefined;
         } | {
             type: "package";
         }>, Record<string, any>>, ({
-            type: "composer";
             url: string;
+            type: "composer";
         } | {
             type: "package";
         } | {
-            type: "git";
             url: string;
+            type: "git";
             name: string;
         } | {
-            type: "path";
             url: string;
+            type: "path";
             name: string;
         } | {
             type: "disable-packagist";
         })[], Record<string, any>>, z.ZodEffects<z.ZodEffects<z.ZodArray<z.ZodAny, "many">, ({
-            type: "composer";
             url: string;
+            type: "composer";
         } | {
-            type: "git";
             url: string;
+            type: "git";
             name?: string | undefined;
         } | {
-            type: "path";
             url: string;
+            type: "path";
             name?: string | undefined;
         } | {
             type: "package";
         } | {
             type: "disable-packagist";
         })[], any[]>, ({
-            type: "composer";
             url: string;
+            type: "composer";
         } | {
             type: "package";
         } | {
-            type: "git";
             url: string;
+            type: "git";
             name: string;
         } | {
-            type: "path";
             url: string;
+            type: "path";
             name: string;
         } | {
             type: "disable-packagist";
         })[], any[]>]>>>, {
             registryUrls: string[] | null;
             gitRepos: Record<string, {
-                type: "git";
                 url: string;
+                type: "git";
                 name?: string | undefined;
             }>;
             pathRepos: Record<string, {
-                type: "path";
                 url: string;
+                type: "path";
                 name?: string | undefined;
             }>;
         }, unknown>;
@@ -602,13 +602,13 @@ export declare const ComposerExtract: z.ZodEffects<z.ZodPipeline<z.ZodEffects<z.
         repositories: {
             registryUrls: string[] | null;
             gitRepos: Record<string, {
-                type: "git";
                 url: string;
+                type: "git";
                 name?: string | undefined;
             }>;
             pathRepos: Record<string, {
-                type: "path";
                 url: string;
+                type: "path";
                 name?: string | undefined;
             }>;
         };
@@ -631,13 +631,13 @@ export declare const ComposerExtract: z.ZodEffects<z.ZodPipeline<z.ZodEffects<z.
         repositories: {
             registryUrls: string[] | null;
             gitRepos: Record<string, {
-                type: "git";
                 url: string;
+                type: "git";
                 name?: string | undefined;
             }>;
             pathRepos: Record<string, {
-                type: "path";
                 url: string;
+                type: "path";
                 name?: string | undefined;
             }>;
         };
@@ -651,24 +651,24 @@ export declare const ComposerExtract: z.ZodEffects<z.ZodPipeline<z.ZodEffects<z.
         'require-dev'?: unknown;
     }>>;
     lockfileName: z.ZodString;
-    lockfile: z.ZodPipeline<z.ZodEffects<z.ZodString, string | null, string>, z.ZodUnion<[z.ZodNull, z.ZodCatch<z.ZodNullable<z.ZodPipeline<z.ZodPipeline<z.ZodString, z.ZodEffects<z.ZodString, string | number | boolean | import("type-fest").JsonObject | import("type-fest").JsonValue[] | readonly import("type-fest").JsonValue[] | null, string>>, z.ZodEffects<z.ZodObject<{
+    lockfile: z.ZodPipeline<z.ZodEffects<z.ZodString, string | null, string>, z.ZodUnion<[z.ZodNull, z.ZodCatch<z.ZodNullable<z.ZodPipeline<z.ZodPipeline<z.ZodString, z.ZodEffects<z.ZodString, string | number | boolean | import("type-fest", { with: { "resolution-mode": "import" } }).JsonObject | import("type-fest", { with: { "resolution-mode": "import" } }).JsonValue[] | readonly import("type-fest", { with: { "resolution-mode": "import" } }).JsonValue[] | null, string>>, z.ZodEffects<z.ZodObject<{
         'plugin-api-version': z.ZodOptional<z.ZodString>;
         packages: z.ZodCatch<z.ZodEffects<z.ZodArray<z.ZodAny, "many">, {
-            name: string;
             version: string;
+            name: string;
         }[], any[]>>;
         'packages-dev': z.ZodCatch<z.ZodEffects<z.ZodArray<z.ZodAny, "many">, {
-            name: string;
             version: string;
+            name: string;
         }[], any[]>>;
     }, "strip", z.ZodTypeAny, {
         packages: {
-            name: string;
             version: string;
+            name: string;
         }[];
         'packages-dev': {
-            name: string;
             version: string;
+            name: string;
         }[];
         'plugin-api-version'?: string | undefined;
     }, {
@@ -678,12 +678,12 @@ export declare const ComposerExtract: z.ZodEffects<z.ZodPipeline<z.ZodEffects<z.
     }>, {
         pluginApiVersion: string | undefined;
         packages: {
-            name: string;
             version: string;
+            name: string;
         }[];
         packagesDev: {
-            name: string;
             version: string;
+            name: string;
         }[];
     }, {
         packages?: unknown;
@@ -701,13 +701,13 @@ export declare const ComposerExtract: z.ZodEffects<z.ZodPipeline<z.ZodEffects<z.
         repositories: {
             registryUrls: string[] | null;
             gitRepos: Record<string, {
-                type: "git";
                 url: string;
+                type: "git";
                 name?: string | undefined;
             }>;
             pathRepos: Record<string, {
-                type: "path";
                 url: string;
+                type: "path";
                 name?: string | undefined;
             }>;
         };
@@ -717,12 +717,12 @@ export declare const ComposerExtract: z.ZodEffects<z.ZodPipeline<z.ZodEffects<z.
     lockfile: {
         pluginApiVersion: string | undefined;
         packages: {
-            name: string;
             version: string;
+            name: string;
         }[];
         packagesDev: {
-            name: string;
             version: string;
+            name: string;
         }[];
     } | null;
     lockfileName: string;

package/dist/modules/manager/conan/artifacts.js

@@ -7,11 +7,21 @@ const logger_1 = require("../../../logger");
 const exec_1 = require("../../../util/exec");
 const fs_1 = require("../../../util/fs");
 const auth_1 = require("../../../util/git/auth");
-async function conanLockUpdate(conanFilePath, isLockFileMaintenance) {
+async function conanLockUpdate(conanFilePath, isLockFileMaintenance, conanConstraint, pythonConstraint) {
     const command = `conan lock create ${(0, shlex_1.quote)(conanFilePath)}` +
         (isLockFileMaintenance ? ' --lockfile=""' : '');
     const execOptions = {
         extraEnv: { ...(0, auth_1.getGitEnvironmentVariables)(['conan']) },
+        toolConstraints: [
+            {
+                toolName: 'python',
+                constraint: pythonConstraint,
+            },
+            {
+                toolName: 'conan',
+                constraint: conanConstraint,
+            },
+        ],
         docker: {},
     };
     await (0, exec_1.exec)(command, execOptions);
@@ -37,7 +47,7 @@ async function updateArtifacts(updateArtifact) {
     try {
         await (0, fs_1.writeLocalFile)(packageFileName, newPackageFileContent);
         logger_1.logger.trace(`Updating ${lockFileName}`);
-        await conanLockUpdate(packageFileName, isLockFileMaintenance);
+        await conanLockUpdate(packageFileName, isLockFileMaintenance, config.constraints?.conan, config.constraints?.python);
         const newLockFileContent = await (0, fs_1.readLocalFile)(lockFileName);
         if (!newLockFileContent) {
             logger_1.logger.debug(`New ${lockFileName} read operation failed`);