renovate 40.0.0-next.9 → 40.0.1

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

@@ -0,0 +1,405 @@
+import { z } from 'zod';
+import type { PackageDependency } from '../types';
+export type Channels = z.infer<typeof Channel>[];
+declare const Channel: z.ZodUnion<[z.ZodString, z.ZodObject<{
+    channel: z.ZodString;
+    priority: z.ZodNumber;
+}, "strip", z.ZodTypeAny, {
+    priority: number;
+    channel: string;
+}, {
+    priority: number;
+    channel: string;
+}>]>;
+export interface PixiPackageDependency extends PackageDependency {
+    channel?: string;
+    channels?: Channels;
+}
+/**
+ * `$` of `pixi.toml` or `$.tool.pixi` of `pyproject.toml`
+ */
+export declare const PixiConfigSchema: z.ZodIntersection<z.ZodIntersection<z.ZodUnion<[z.ZodEffects<z.ZodObject<{
+    workspace: z.ZodObject<{
+        channels: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodObject<{
+            channel: z.ZodString;
+            priority: z.ZodNumber;
+        }, "strip", z.ZodTypeAny, {
+            priority: number;
+            channel: string;
+        }, {
+            priority: number;
+            channel: string;
+        }>]>, "many">>;
+        'requires-pixi': z.ZodOptional<z.ZodString>;
+        'channel-priority': z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"strict">, z.ZodLiteral<"disabled">]>>;
+    }, "strip", z.ZodTypeAny, {
+        channels: (string | {
+            priority: number;
+            channel: string;
+        })[];
+        'channel-priority': "disabled" | "strict";
+        'requires-pixi'?: string | undefined;
+    }, {
+        channels?: (string | {
+            priority: number;
+            channel: string;
+        })[] | undefined;
+        'requires-pixi'?: string | undefined;
+        'channel-priority'?: "disabled" | "strict" | undefined;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    workspace: {
+        channels: (string | {
+            priority: number;
+            channel: string;
+        })[];
+        'channel-priority': "disabled" | "strict";
+        'requires-pixi'?: string | undefined;
+    };
+}, {
+    workspace: {
+        channels?: (string | {
+            priority: number;
+            channel: string;
+        })[] | undefined;
+        'requires-pixi'?: string | undefined;
+        'channel-priority'?: "disabled" | "strict" | undefined;
+    };
+}>, {
+    project: {
+        channels: (string | {
+            priority: number;
+            channel: string;
+        })[];
+        'channel-priority': "disabled" | "strict";
+        'requires-pixi'?: string | undefined;
+    };
+}, {
+    workspace: {
+        channels?: (string | {
+            priority: number;
+            channel: string;
+        })[] | undefined;
+        'requires-pixi'?: string | undefined;
+        'channel-priority'?: "disabled" | "strict" | undefined;
+    };
+}>, z.ZodObject<{
+    project: z.ZodObject<{
+        channels: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodObject<{
+            channel: z.ZodString;
+            priority: z.ZodNumber;
+        }, "strip", z.ZodTypeAny, {
+            priority: number;
+            channel: string;
+        }, {
+            priority: number;
+            channel: string;
+        }>]>, "many">>;
+        'requires-pixi': z.ZodOptional<z.ZodString>;
+        'channel-priority': z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"strict">, z.ZodLiteral<"disabled">]>>;
+    }, "strip", z.ZodTypeAny, {
+        channels: (string | {
+            priority: number;
+            channel: string;
+        })[];
+        'channel-priority': "disabled" | "strict";
+        'requires-pixi'?: string | undefined;
+    }, {
+        channels?: (string | {
+            priority: number;
+            channel: string;
+        })[] | undefined;
+        'requires-pixi'?: string | undefined;
+        'channel-priority'?: "disabled" | "strict" | undefined;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    project: {
+        channels: (string | {
+            priority: number;
+            channel: string;
+        })[];
+        'channel-priority': "disabled" | "strict";
+        'requires-pixi'?: string | undefined;
+    };
+}, {
+    project: {
+        channels?: (string | {
+            priority: number;
+            channel: string;
+        })[] | undefined;
+        'requires-pixi'?: string | undefined;
+        'channel-priority'?: "disabled" | "strict" | undefined;
+    };
+}>]>, z.ZodObject<{
+    feature: z.ZodDefault<z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, {
+        channels?: (string | {
+            priority: number;
+            channel: string;
+        })[] | undefined;
+    } & {
+        pypi: PixiPackageDependency[];
+        conda: PixiPackageDependency[];
+    }>, Record<string, any>>, {
+        conda: PixiPackageDependency[];
+        pypi: PixiPackageDependency[];
+    }, Record<string, any>>>;
+}, "strip", z.ZodTypeAny, {
+    feature: {
+        conda: PixiPackageDependency[];
+        pypi: PixiPackageDependency[];
+    };
+}, {
+    feature?: Record<string, any> | undefined;
+}>>, z.ZodEffects<z.ZodObject<{
+    dependencies: z.ZodDefault<z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, {
+        currentValue: string;
+        versioning: string;
+        datasource: string;
+        depType: string;
+        channel: string | undefined;
+    }>, Record<string, any>>, PackageDependency<Record<string, any>>[], Record<string, any>>>>;
+    'pypi-dependencies': z.ZodDefault<z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, {
+        currentValue: string;
+        versioning: string;
+        datasource: string;
+        depType: string;
+    } | {
+        currentValue: string | undefined;
+        packageName: string;
+        datasource: string;
+        depType: string;
+        versioning: string;
+        skipStage: "extract";
+        skipReason: "unspecified-version";
+    } | {
+        currentValue: string;
+        packageName: string;
+        datasource: string;
+        depType: string;
+        versioning: string;
+        skipStage?: undefined;
+        skipReason?: undefined;
+    }>, Record<string, any>>, PackageDependency<Record<string, any>>[], Record<string, any>>>>;
+    target: z.ZodDefault<z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, {
+        dependencies: PackageDependency<Record<string, any>>[];
+        'pypi-dependencies': PackageDependency<Record<string, any>>[];
+    }>, Record<string, any>>, {
+        pypi: PixiPackageDependency[];
+        conda: PixiPackageDependency[];
+    }, Record<string, any>>>>;
+}, "strip", z.ZodTypeAny, {
+    target: {
+        pypi: PixiPackageDependency[];
+        conda: PixiPackageDependency[];
+    };
+    dependencies: PackageDependency<Record<string, any>>[];
+    'pypi-dependencies': PackageDependency<Record<string, any>>[];
+}, {
+    target?: Record<string, any> | undefined;
+    dependencies?: Record<string, any> | undefined;
+    'pypi-dependencies'?: Record<string, any> | undefined;
+}>, {
+    pypi: PixiPackageDependency[];
+    conda: PixiPackageDependency[];
+}, {
+    target?: Record<string, any> | undefined;
+    dependencies?: Record<string, any> | undefined;
+    'pypi-dependencies'?: Record<string, any> | undefined;
+}>>;
+export type PixiConfig = z.infer<typeof PixiConfigSchema>;
+export declare const PixiToml: z.ZodPipeline<z.ZodEffects<z.ZodString, unknown, string>, z.ZodIntersection<z.ZodIntersection<z.ZodUnion<[z.ZodEffects<z.ZodObject<{
+    workspace: z.ZodObject<{
+        channels: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodObject<{
+            channel: z.ZodString;
+            priority: z.ZodNumber;
+        }, "strip", z.ZodTypeAny, {
+            priority: number;
+            channel: string;
+        }, {
+            priority: number;
+            channel: string;
+        }>]>, "many">>;
+        'requires-pixi': z.ZodOptional<z.ZodString>;
+        'channel-priority': z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"strict">, z.ZodLiteral<"disabled">]>>;
+    }, "strip", z.ZodTypeAny, {
+        channels: (string | {
+            priority: number;
+            channel: string;
+        })[];
+        'channel-priority': "disabled" | "strict";
+        'requires-pixi'?: string | undefined;
+    }, {
+        channels?: (string | {
+            priority: number;
+            channel: string;
+        })[] | undefined;
+        'requires-pixi'?: string | undefined;
+        'channel-priority'?: "disabled" | "strict" | undefined;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    workspace: {
+        channels: (string | {
+            priority: number;
+            channel: string;
+        })[];
+        'channel-priority': "disabled" | "strict";
+        'requires-pixi'?: string | undefined;
+    };
+}, {
+    workspace: {
+        channels?: (string | {
+            priority: number;
+            channel: string;
+        })[] | undefined;
+        'requires-pixi'?: string | undefined;
+        'channel-priority'?: "disabled" | "strict" | undefined;
+    };
+}>, {
+    project: {
+        channels: (string | {
+            priority: number;
+            channel: string;
+        })[];
+        'channel-priority': "disabled" | "strict";
+        'requires-pixi'?: string | undefined;
+    };
+}, {
+    workspace: {
+        channels?: (string | {
+            priority: number;
+            channel: string;
+        })[] | undefined;
+        'requires-pixi'?: string | undefined;
+        'channel-priority'?: "disabled" | "strict" | undefined;
+    };
+}>, z.ZodObject<{
+    project: z.ZodObject<{
+        channels: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodObject<{
+            channel: z.ZodString;
+            priority: z.ZodNumber;
+        }, "strip", z.ZodTypeAny, {
+            priority: number;
+            channel: string;
+        }, {
+            priority: number;
+            channel: string;
+        }>]>, "many">>;
+        'requires-pixi': z.ZodOptional<z.ZodString>;
+        'channel-priority': z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"strict">, z.ZodLiteral<"disabled">]>>;
+    }, "strip", z.ZodTypeAny, {
+        channels: (string | {
+            priority: number;
+            channel: string;
+        })[];
+        'channel-priority': "disabled" | "strict";
+        'requires-pixi'?: string | undefined;
+    }, {
+        channels?: (string | {
+            priority: number;
+            channel: string;
+        })[] | undefined;
+        'requires-pixi'?: string | undefined;
+        'channel-priority'?: "disabled" | "strict" | undefined;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    project: {
+        channels: (string | {
+            priority: number;
+            channel: string;
+        })[];
+        'channel-priority': "disabled" | "strict";
+        'requires-pixi'?: string | undefined;
+    };
+}, {
+    project: {
+        channels?: (string | {
+            priority: number;
+            channel: string;
+        })[] | undefined;
+        'requires-pixi'?: string | undefined;
+        'channel-priority'?: "disabled" | "strict" | undefined;
+    };
+}>]>, z.ZodObject<{
+    feature: z.ZodDefault<z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, {
+        channels?: (string | {
+            priority: number;
+            channel: string;
+        })[] | undefined;
+    } & {
+        pypi: PixiPackageDependency[];
+        conda: PixiPackageDependency[];
+    }>, Record<string, any>>, {
+        conda: PixiPackageDependency[];
+        pypi: PixiPackageDependency[];
+    }, Record<string, any>>>;
+}, "strip", z.ZodTypeAny, {
+    feature: {
+        conda: PixiPackageDependency[];
+        pypi: PixiPackageDependency[];
+    };
+}, {
+    feature?: Record<string, any> | undefined;
+}>>, z.ZodEffects<z.ZodObject<{
+    dependencies: z.ZodDefault<z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, {
+        currentValue: string;
+        versioning: string;
+        datasource: string;
+        depType: string;
+        channel: string | undefined;
+    }>, Record<string, any>>, PackageDependency<Record<string, any>>[], Record<string, any>>>>;
+    'pypi-dependencies': z.ZodDefault<z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, {
+        currentValue: string;
+        versioning: string;
+        datasource: string;
+        depType: string;
+    } | {
+        currentValue: string | undefined;
+        packageName: string;
+        datasource: string;
+        depType: string;
+        versioning: string;
+        skipStage: "extract";
+        skipReason: "unspecified-version";
+    } | {
+        currentValue: string;
+        packageName: string;
+        datasource: string;
+        depType: string;
+        versioning: string;
+        skipStage?: undefined;
+        skipReason?: undefined;
+    }>, Record<string, any>>, PackageDependency<Record<string, any>>[], Record<string, any>>>>;
+    target: z.ZodDefault<z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, {
+        dependencies: PackageDependency<Record<string, any>>[];
+        'pypi-dependencies': PackageDependency<Record<string, any>>[];
+    }>, Record<string, any>>, {
+        pypi: PixiPackageDependency[];
+        conda: PixiPackageDependency[];
+    }, Record<string, any>>>>;
+}, "strip", z.ZodTypeAny, {
+    target: {
+        pypi: PixiPackageDependency[];
+        conda: PixiPackageDependency[];
+    };
+    dependencies: PackageDependency<Record<string, any>>[];
+    'pypi-dependencies': PackageDependency<Record<string, any>>[];
+}, {
+    target?: Record<string, any> | undefined;
+    dependencies?: Record<string, any> | undefined;
+    'pypi-dependencies'?: Record<string, any> | undefined;
+}>, {
+    pypi: PixiPackageDependency[];
+    conda: PixiPackageDependency[];
+}, {
+    target?: Record<string, any> | undefined;
+    dependencies?: Record<string, any> | undefined;
+    'pypi-dependencies'?: Record<string, any> | undefined;
+}>>>;
+export declare const LockfileYaml: 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.ZodObject<{
+    version: z.ZodNumber;
+}, "strip", z.ZodTypeAny, {
+    version: number;
+}, {
+    version: number;
+}>>;
+export {};

package/dist/modules/manager/pixi/schema.js

@@ -0,0 +1,147 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LockfileYaml = exports.PixiToml = exports.PixiConfigSchema = void 0;
+const tslib_1 = require("tslib");
+const zod_1 = require("zod");
+const schema_utils_1 = require("../../../util/schema-utils");
+const conda_1 = require("../../datasource/conda/");
+const git_refs_1 = require("../../datasource/git-refs");
+const pypi_1 = require("../../datasource/pypi");
+const condaVersion = tslib_1.__importStar(require("../../versioning/conda/"));
+const git_1 = require("../../versioning/git");
+const pep440_1 = require("../../versioning/pep440/");
+const Channel = zod_1.z.union([
+    zod_1.z.string(),
+    zod_1.z.object({ channel: zod_1.z.string(), priority: zod_1.z.number() }),
+]);
+function collectNamedPackages(packages) {
+    return Object.entries(packages).map(([depName, config]) => {
+        return {
+            ...config,
+            depName,
+        };
+    });
+}
+const PypiDependency = zod_1.z
+    .union([
+    zod_1.z.string().transform((version) => ({ version })),
+    zod_1.z.object({ version: zod_1.z.string() }),
+])
+    .transform(({ version }) => {
+    return {
+        currentValue: version,
+        versioning: pep440_1.id,
+        datasource: pypi_1.PypiDatasource.id,
+        depType: 'pypi-dependencies',
+    };
+});
+const PypiGitDependency = zod_1.z
+    .object({ git: zod_1.z.string(), rev: zod_1.z.optional(zod_1.z.string()) })
+    .transform(({ git, rev }) => {
+    // empty ref default to HEAD, so do we not need to do anything
+    if (!rev) {
+        return {
+            currentValue: rev,
+            packageName: git,
+            datasource: git_refs_1.GitRefsDatasource.id,
+            depType: 'pypi-dependencies',
+            versioning: git_1.id,
+            skipStage: 'extract',
+            skipReason: 'unspecified-version',
+        };
+    }
+    return {
+        currentValue: rev,
+        packageName: git,
+        datasource: git_refs_1.GitRefsDatasource.id,
+        depType: 'pypi-dependencies',
+        versioning: git_1.id,
+    };
+});
+const PypiDependencies = (0, schema_utils_1.LooseRecord)(zod_1.z.string(), zod_1.z.union([PypiDependency, PypiGitDependency])).transform(collectNamedPackages);
+const CondaDependency = zod_1.z
+    .union([
+    zod_1.z.string().transform((version) => ({ version, channel: undefined })),
+    zod_1.z.object({ version: zod_1.z.string(), channel: zod_1.z.optional(zod_1.z.string()) }),
+])
+    .transform(({ version, channel }) => {
+    return {
+        currentValue: version,
+        versioning: condaVersion.id,
+        datasource: conda_1.CondaDatasource.id,
+        depType: 'dependencies',
+        channel,
+    };
+});
+const CondaDependencies = (0, schema_utils_1.LooseRecord)(zod_1.z.string(), CondaDependency).transform(collectNamedPackages);
+const Targets = (0, schema_utils_1.LooseRecord)(zod_1.z.string(), zod_1.z.object({
+    dependencies: zod_1.z.optional(CondaDependencies).default({}),
+    'pypi-dependencies': zod_1.z.optional(PypiDependencies).default({}),
+})).transform((val) => {
+    const conda = [];
+    const pypi = [];
+    for (const value of Object.values(val)) {
+        pypi.push(...value['pypi-dependencies']);
+        conda.push(...value.dependencies);
+    }
+    return { pypi, conda };
+});
+const Project = zod_1.z.object({
+    channels: zod_1.z.array(Channel).default([]),
+    'requires-pixi': zod_1.z.string().optional(),
+    'channel-priority': zod_1.z
+        .union([zod_1.z.literal('strict'), zod_1.z.literal('disabled')])
+        .default('strict'),
+});
+const DependenciesMixin = zod_1.z
+    .object({
+    dependencies: zod_1.z.optional(CondaDependencies).default({}),
+    'pypi-dependencies': zod_1.z.optional(PypiDependencies).default({}),
+    target: zod_1.z.optional(Targets).default({}),
+})
+    .transform((val) => {
+    return {
+        conda: [...val.dependencies, ...val.target.conda],
+        pypi: [...val['pypi-dependencies'], ...val.target.pypi],
+    };
+});
+const Features = (0, schema_utils_1.LooseRecord)(zod_1.z.string(), zod_1.z
+    .object({
+    channels: zod_1.z.array(Channel).optional(),
+})
+    .and(DependenciesMixin)).transform((features) => {
+    const pypi = [];
+    const conda = [];
+    for (const feature of Object.values(features)) {
+        conda.push(...feature.conda.map((item) => {
+            return {
+                ...item,
+                channels: feature.channels,
+            };
+        }));
+        pypi.push(...feature.pypi);
+    }
+    return { pypi, conda };
+});
+const PixiWorkspace = zod_1.z
+    .object({
+    workspace: Project,
+})
+    .transform((val) => {
+    return { project: val.workspace };
+});
+const PixiProject = zod_1.z.object({
+    project: Project,
+});
+/**
+ * `$` of `pixi.toml` or `$.tool.pixi` of `pyproject.toml`
+ */
+exports.PixiConfigSchema = zod_1.z
+    .union([PixiWorkspace, PixiProject])
+    .and(zod_1.z.object({ feature: Features.default({}) }))
+    .and(DependenciesMixin);
+exports.PixiToml = schema_utils_1.Toml.pipe(exports.PixiConfigSchema);
+exports.LockfileYaml = schema_utils_1.Yaml.pipe(zod_1.z.object({
+    version: zod_1.z.number(),
+}));
+//# sourceMappingURL=schema.js.map

package/dist/modules/manager/pixi/schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/pixi/schema.ts"],"names":[],"mappings":"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","sourcesContent":["import { z } from 'zod';\nimport { LooseRecord, Toml, Yaml } from '../../../util/schema-utils';\nimport { CondaDatasource } from '../../datasource/conda/';\nimport { GitRefsDatasource } from '../../datasource/git-refs';\nimport { PypiDatasource } from '../../datasource/pypi';\nimport * as condaVersion from '../../versioning/conda/';\nimport { id as gitRefVersionID } from '../../versioning/git';\nimport { id as pep440VersionID } from '../../versioning/pep440/';\nimport type { PackageDependency } from '../types';\n\nexport type Channels = z.infer<typeof Channel>[];\n\nconst Channel = z.union([\n  z.string(),\n  z.object({ channel: z.string(), priority: z.number() }),\n]);\n\nexport interface PixiPackageDependency extends PackageDependency {\n  channel?: string;\n  channels?: Channels;\n}\n\nfunction collectNamedPackages(\n  packages: Record<string, PackageDependency>,\n): PackageDependency[] {\n  return Object.entries(packages).map(([depName, config]) => {\n    return {\n      ...config,\n      depName,\n    };\n  });\n}\n\nconst PypiDependency = z\n  .union([\n    z.string().transform((version) => ({ version })),\n    z.object({ version: z.string() }),\n  ])\n  .transform(({ version }) => {\n    return {\n      currentValue: version,\n      versioning: pep440VersionID,\n      datasource: PypiDatasource.id,\n      depType: 'pypi-dependencies',\n    } satisfies PixiPackageDependency;\n  });\n\nconst PypiGitDependency = z\n  .object({ git: z.string(), rev: z.optional(z.string()) })\n  .transform(({ git, rev }) => {\n    // empty ref default to HEAD, so do we not need to do anything\n    if (!rev) {\n      return {\n        currentValue: rev,\n        packageName: git,\n        datasource: GitRefsDatasource.id,\n        depType: 'pypi-dependencies',\n        versioning: gitRefVersionID,\n        skipStage: 'extract',\n        skipReason: 'unspecified-version',\n      } satisfies PixiPackageDependency;\n    }\n\n    return {\n      currentValue: rev,\n      packageName: git,\n      datasource: GitRefsDatasource.id,\n      depType: 'pypi-dependencies',\n      versioning: gitRefVersionID,\n    } satisfies PixiPackageDependency;\n  });\n\nconst PypiDependencies = LooseRecord(\n  z.string(),\n  z.union([PypiDependency, PypiGitDependency]),\n).transform(collectNamedPackages);\n\nconst CondaDependency = z\n  .union([\n    z.string().transform((version) => ({ version, channel: undefined })),\n    z.object({ version: z.string(), channel: z.optional(z.string()) }),\n  ])\n  .transform(({ version, channel }) => {\n    return {\n      currentValue: version,\n      versioning: condaVersion.id,\n      datasource: CondaDatasource.id,\n      depType: 'dependencies',\n      channel,\n    } satisfies PixiPackageDependency;\n  });\n\nconst CondaDependencies = LooseRecord(z.string(), CondaDependency).transform(\n  collectNamedPackages,\n);\n\nconst Targets = LooseRecord(\n  z.string(),\n  z.object({\n    dependencies: z.optional(CondaDependencies).default({}),\n    'pypi-dependencies': z.optional(PypiDependencies).default({}),\n  }),\n).transform((val) => {\n  const conda: PixiPackageDependency[] = [];\n  const pypi: PixiPackageDependency[] = [];\n  for (const value of Object.values(val)) {\n    pypi.push(...value['pypi-dependencies']);\n\n    conda.push(...value.dependencies);\n  }\n\n  return { pypi, conda };\n});\n\nconst Project = z.object({\n  channels: z.array(Channel).default([]),\n  'requires-pixi': z.string().optional(),\n  'channel-priority': z\n    .union([z.literal('strict'), z.literal('disabled')])\n    .default('strict'),\n});\n\nconst DependenciesMixin = z\n  .object({\n    dependencies: z.optional(CondaDependencies).default({}),\n    'pypi-dependencies': z.optional(PypiDependencies).default({}),\n    target: z.optional(Targets).default({}),\n  })\n  .transform(\n    (\n      val,\n    ): { pypi: PixiPackageDependency[]; conda: PixiPackageDependency[] } => {\n      return {\n        conda: [...val.dependencies, ...val.target.conda],\n        pypi: [...val['pypi-dependencies'], ...val.target.pypi],\n      };\n    },\n  );\n\nconst Features = LooseRecord(\n  z.string(),\n  z\n    .object({\n      channels: z.array(Channel).optional(),\n    })\n    .and(DependenciesMixin),\n).transform(\n  (\n    features,\n  ): {\n    conda: PixiPackageDependency[];\n    pypi: PixiPackageDependency[];\n  } => {\n    const pypi: PixiPackageDependency[] = [];\n    const conda: PixiPackageDependency[] = [];\n\n    for (const feature of Object.values(features)) {\n      conda.push(\n        ...feature.conda.map((item) => {\n          return {\n            ...item,\n            channels: feature.channels,\n          };\n        }),\n      );\n\n      pypi.push(...feature.pypi);\n    }\n\n    return { pypi, conda };\n  },\n);\n\nconst PixiWorkspace = z\n  .object({\n    workspace: Project,\n  })\n  .transform((val) => {\n    return { project: val.workspace };\n  });\n\nconst PixiProject = z.object({\n  project: Project,\n});\n\n/**\n * `$` of `pixi.toml` or `$.tool.pixi` of `pyproject.toml`\n */\nexport const PixiConfigSchema = z\n  .union([PixiWorkspace, PixiProject])\n  .and(z.object({ feature: Features.default({}) }))\n  .and(DependenciesMixin);\n\nexport type PixiConfig = z.infer<typeof PixiConfigSchema>;\n\nexport const PixiToml = Toml.pipe(PixiConfigSchema);\n\nexport const LockfileYaml = Yaml.pipe(\n  z.object({\n    version: z.number(),\n  }),\n);\n"]}

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

@@ -21,7 +21,7 @@ const util_1 = require("../../datasource/util");
 const schema_1 = require("./schema");
 function getPythonConstraint(pyProjectContent, existingLockFileContent) {
     // Read Python version from `pyproject.toml` first as it could have been updated
-    const pyprojectPythonConstraint = result_1.Result.parse(pyProjectContent, schema_1.PoetrySchemaToml.transform(({ packageFileContent }) => packageFileContent.deps.find((dep) => dep.depName === 'python')
+    const pyprojectPythonConstraint = result_1.Result.parse((0, toml_1.massage)(pyProjectContent), schema_1.PoetrySchemaToml.transform(({ packageFileContent }) => packageFileContent.deps.find((dep) => dep.depName === 'python')
         ?.currentValue)).unwrapOrNull();
     if (pyprojectPythonConstraint) {
         logger_1.logger.debug('Using python version from pyproject.toml');
@@ -48,7 +48,7 @@ function getPoetryRequirement(pyProjectContent, existingLockFileContent) {
         logger_1.logger.debug(`Using poetry version ${lockfilePoetryConstraint} from poetry.lock metadata`);
         return lockfilePoetryConstraint;
     }
-    const { val: pyprojectPoetryConstraint } = result_1.Result.parse(pyProjectContent, schema_1.PoetrySchemaToml.transform(({ poetryRequirement }) => poetryRequirement)).unwrap();
+    const { val: pyprojectPoetryConstraint } = result_1.Result.parse((0, toml_1.massage)(pyProjectContent), schema_1.PoetrySchemaToml.transform(({ poetryRequirement }) => poetryRequirement)).unwrap();
     if (pyprojectPoetryConstraint) {
         logger_1.logger.debug(`Using poetry version ${pyprojectPoetryConstraint} from pyproject.toml`);
         return pyprojectPoetryConstraint;
@@ -58,7 +58,7 @@ function getPoetryRequirement(pyProjectContent, existingLockFileContent) {
 function getPoetrySources(content, fileName) {
     let pyprojectFile;
     try {
-        pyprojectFile = (0, toml_1.parse)(content);
+        pyprojectFile = (0, toml_1.parse)((0, toml_1.massage)(content));
     }
     catch (err) {
         logger_1.logger.debug({ err }, 'Error parsing pyproject.toml file');
@@ -163,7 +163,6 @@ async function updateArtifacts({ packageFileName, updatedDeps, newPackageFileCon
             cwdFile: packageFileName,
             extraEnv,
             docker: {},
-            userConfiguredEnv: config.env,
             toolConstraints: [
                 { toolName: 'python', constraint: pythonConstraint },
                 { toolName: 'poetry', constraint: poetryConstraint },