diff --git a/dist/ruff-action/index.js b/dist/ruff-action/index.js index 4478d96..4f2d68c 100644 --- a/dist/ruff-action/index.js +++ b/dist/ruff-action/index.js @@ -30554,7 +30554,7 @@ async function determineVersion() { return await (0, download_version_1.resolveVersion)(inputs_1.version, inputs_1.githubToken); } if (inputs_1.versionFile !== "") { - const versionFromPyproject = (0, pyproject_1.getRuffVersionFromPyproject)(inputs_1.versionFile); + const versionFromPyproject = (0, pyproject_1.getRuffVersionFromRequirementsFile)(inputs_1.versionFile); if (versionFromPyproject === undefined) { core.warning(`Could not parse version from ${inputs_1.versionFile}. Using latest version.`); } @@ -30565,7 +30565,7 @@ async function determineVersion() { core.info(`Could not find ${pyProjectPath}. Using latest version.`); return await (0, download_version_1.resolveVersion)("latest", inputs_1.githubToken); } - const versionFromPyproject = (0, pyproject_1.getRuffVersionFromPyproject)(pyProjectPath); + const versionFromPyproject = (0, pyproject_1.getRuffVersionFromRequirementsFile)(pyProjectPath); if (versionFromPyproject === undefined) { core.warning(`Could not parse version from ${pyProjectPath}. Using latest version.`); } @@ -30731,11 +30731,11 @@ var __importStar = (this && this.__importStar) || (function () { }; })(); Object.defineProperty(exports, "__esModule", ({ value: true })); -exports.getRuffVersionFromPyproject = getRuffVersionFromPyproject; +exports.getRuffVersionFromRequirementsFile = getRuffVersionFromRequirementsFile; const fs = __importStar(__nccwpck_require__(3024)); const core = __importStar(__nccwpck_require__(7484)); const toml = __importStar(__nccwpck_require__(7106)); -function parseRequirements(allDependencies) { +function getRuffVersionFromAllDependencies(allDependencies) { const ruffVersionDefinition = allDependencies.find((dep) => dep.startsWith("ruff")); if (ruffVersionDefinition) { const ruffVersion = ruffVersionDefinition @@ -30756,16 +30756,16 @@ function parsePyproject(pyprojectContent) { const devDependencies = Object.values(pyproject?.["dependency-groups"] || {}) .flat() .filter((item) => typeof item === "string"); - return parseRequirements(dependencies.concat(optionalDependencies, devDependencies)); + return getRuffVersionFromAllDependencies(dependencies.concat(optionalDependencies, devDependencies)); } -function getRuffVersionFromPyproject(filePath) { +function getRuffVersionFromRequirementsFile(filePath) { if (!fs.existsSync(filePath)) { core.warning(`Could not find file: ${filePath}`); return undefined; } const pyprojectContent = fs.readFileSync(filePath, "utf-8"); if (filePath.endsWith(".txt")) { - return parseRequirements(pyprojectContent.split("\n")); + return getRuffVersionFromAllDependencies(pyprojectContent.split("\n")); } try { return parsePyproject(pyprojectContent); diff --git a/src/ruff-action.ts b/src/ruff-action.ts index 7308c3a..15b2226 100644 --- a/src/ruff-action.ts +++ b/src/ruff-action.ts @@ -21,7 +21,7 @@ import { version, versionFile as versionFileInput, } from "./utils/inputs"; -import { getRuffVersionFromPyproject } from "./utils/pyproject"; +import { getRuffVersionFromRequirementsFile } from "./utils/pyproject"; import * as fs from "node:fs"; async function run(): Promise { @@ -93,7 +93,8 @@ async function determineVersion(): Promise { return await resolveVersion(version, githubToken); } if (versionFileInput !== "") { - const versionFromPyproject = getRuffVersionFromPyproject(versionFileInput); + const versionFromPyproject = + getRuffVersionFromRequirementsFile(versionFileInput); if (versionFromPyproject === undefined) { core.warning( `Could not parse version from ${versionFileInput}. Using latest version.`, @@ -106,7 +107,8 @@ async function determineVersion(): Promise { core.info(`Could not find ${pyProjectPath}. Using latest version.`); return await resolveVersion("latest", githubToken); } - const versionFromPyproject = getRuffVersionFromPyproject(pyProjectPath); + const versionFromPyproject = + getRuffVersionFromRequirementsFile(pyProjectPath); if (versionFromPyproject === undefined) { core.warning( `Could not parse version from ${pyProjectPath}. Using latest version.`, diff --git a/src/utils/pyproject.ts b/src/utils/pyproject.ts index 055ffc9..fc98a82 100644 --- a/src/utils/pyproject.ts +++ b/src/utils/pyproject.ts @@ -2,7 +2,9 @@ import * as fs from "node:fs"; import * as core from "@actions/core"; import * as toml from "smol-toml"; -function parseRequirements(allDependencies: string[]): string | undefined { +function getRuffVersionFromAllDependencies( + allDependencies: string[], +): string | undefined { const ruffVersionDefinition = allDependencies.find((dep: string) => dep.startsWith("ruff"), ); @@ -38,12 +40,12 @@ function parsePyproject(pyprojectContent: string): string | undefined { ) .flat() .filter((item: string | object) => typeof item === "string"); - return parseRequirements( + return getRuffVersionFromAllDependencies( dependencies.concat(optionalDependencies, devDependencies), ); } -export function getRuffVersionFromPyproject( +export function getRuffVersionFromRequirementsFile( filePath: string, ): string | undefined { if (!fs.existsSync(filePath)) { @@ -52,7 +54,7 @@ export function getRuffVersionFromPyproject( } const pyprojectContent = fs.readFileSync(filePath, "utf-8"); if (filePath.endsWith(".txt")) { - return parseRequirements(pyprojectContent.split("\n")); + return getRuffVersionFromAllDependencies(pyprojectContent.split("\n")); } try { return parsePyproject(pyprojectContent);