mirror of
https://github.com/actions/setup-python.git
synced 2026-07-18 06:19:58 +08:00
Resloves merge conflicts
This commit is contained in:
parent
0b994fe7b8
commit
158c1e69bb
2 changed files with 0 additions and 26 deletions
12
dist/setup/index.js
vendored
12
dist/setup/index.js
vendored
|
|
@ -102864,24 +102864,12 @@ function getCacheDistributor(packageManager, pythonVersion, cacheDependencyPath)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function isPyPyVersion(versionSpec) {
|
function isPyPyVersion(versionSpec) {
|
||||||
return versionSpec.startsWith('pypy');
|
return versionSpec.startsWith('pypy');
|
||||||
}
|
}
|
||||||
function isGraalPyVersion(versionSpec) {
|
function isGraalPyVersion(versionSpec) {
|
||||||
return versionSpec.startsWith('graalpy');
|
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) {
|
async function cacheDependencies(cache, pythonVersion) {
|
||||||
const cacheDependencyPath = getInput('cache-dependency-path') || undefined;
|
const cacheDependencyPath = getInput('cache-dependency-path') || undefined;
|
||||||
const cacheDistributor = getCacheDistributor(cache, pythonVersion, cacheDependencyPath);
|
const cacheDistributor = getCacheDistributor(cache, pythonVersion, cacheDependencyPath);
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@ import {
|
||||||
getVersionInputFromFile,
|
getVersionInputFromFile,
|
||||||
getVersionsInputFromPlainFile
|
getVersionsInputFromPlainFile
|
||||||
} from './utils.js';
|
} from './utils.js';
|
||||||
import {exec} from '@actions/exec';
|
|
||||||
|
|
||||||
function isPyPyVersion(versionSpec: string) {
|
function isPyPyVersion(versionSpec: string) {
|
||||||
return versionSpec.startsWith('pypy');
|
return versionSpec.startsWith('pypy');
|
||||||
|
|
@ -24,19 +23,6 @@ function isGraalPyVersion(versionSpec: string) {
|
||||||
return versionSpec.startsWith('graalpy');
|
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) {
|
async function cacheDependencies(cache: string, pythonVersion: string) {
|
||||||
const cacheDependencyPath =
|
const cacheDependencyPath =
|
||||||
core.getInput('cache-dependency-path') || undefined;
|
core.getInput('cache-dependency-path') || undefined;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue