From 158c1e69bb100a43eff2e739c7da26768922f4c0 Mon Sep 17 00:00:00 2001 From: gowridurgad Date: Thu, 16 Jul 2026 08:21:45 +0530 Subject: [PATCH] Resloves merge conflicts --- dist/setup/index.js | 12 ------------ src/setup-python.ts | 14 -------------- 2 files changed, 26 deletions(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index 240c666c..e41c97df 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -102864,24 +102864,12 @@ function getCacheDistributor(packageManager, pythonVersion, cacheDependencyPath) - function isPyPyVersion(versionSpec) { return versionSpec.startsWith('pypy'); } function isGraalPyVersion(versionSpec) { return versionSpec.startsWith('graalpy'); } -async function installPipPackages(pipInstall) { - core.info(`Installing pip packages: ${pipInstall}`); - try { - const installArgs = pipInstall.trim().split(/\s+/); - await exec('python', ['-m', 'pip', 'install', ...installArgs]); - core.info('Successfully installed pip packages'); - } - catch { - core.setFailed(`Failed to install pip packages from "${pipInstall}". Please verify that the package names, versions, or requirements files provided are correct and installable, that the specified packages and versions can be resolved from PyPI or the configured package index, and that your network connection is stable and allows access to the package index.`); - } -} async function cacheDependencies(cache, pythonVersion) { const cacheDependencyPath = getInput('cache-dependency-path') || undefined; const cacheDistributor = getCacheDistributor(cache, pythonVersion, cacheDependencyPath); diff --git a/src/setup-python.ts b/src/setup-python.ts index 1f0bb2a9..2b062caa 100644 --- a/src/setup-python.ts +++ b/src/setup-python.ts @@ -14,7 +14,6 @@ import { getVersionInputFromFile, getVersionsInputFromPlainFile } from './utils.js'; -import {exec} from '@actions/exec'; function isPyPyVersion(versionSpec: string) { return versionSpec.startsWith('pypy'); @@ -24,19 +23,6 @@ function isGraalPyVersion(versionSpec: string) { return versionSpec.startsWith('graalpy'); } -async function installPipPackages(pipInstall: string) { - core.info(`Installing pip packages: ${pipInstall}`); - try { - const installArgs = pipInstall.trim().split(/\s+/); - await exec('python', ['-m', 'pip', 'install', ...installArgs]); - core.info('Successfully installed pip packages'); - } catch { - core.setFailed( - `Failed to install pip packages from "${pipInstall}". Please verify that the package names, versions, or requirements files provided are correct and installable, that the specified packages and versions can be resolved from PyPI or the configured package index, and that your network connection is stable and allows access to the package index.` - ); - } -} - async function cacheDependencies(cache: string, pythonVersion: string) { const cacheDependencyPath = core.getInput('cache-dependency-path') || undefined;