mirror of https://github.com/coddrago/Heroku
fix: work with pip in venv
commit
0be13dc5ba
|
@ -15,9 +15,9 @@
|
||||||
import ast
|
import ast
|
||||||
import asyncio
|
import asyncio
|
||||||
import contextlib
|
import contextlib
|
||||||
|
import difflib
|
||||||
import functools
|
import functools
|
||||||
import importlib
|
import importlib
|
||||||
import difflib
|
|
||||||
import inspect
|
import inspect
|
||||||
import io
|
import io
|
||||||
import logging
|
import logging
|
||||||
|
@ -33,10 +33,10 @@ from importlib.machinery import ModuleSpec
|
||||||
from urllib.parse import urlparse
|
from urllib.parse import urlparse
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
|
from herokutl.errors.common import ScamDetectionError
|
||||||
from herokutl.errors.rpcerrorlist import MediaCaptionTooLongError
|
from herokutl.errors.rpcerrorlist import MediaCaptionTooLongError
|
||||||
from herokutl.tl.functions.channels import JoinChannelRequest
|
from herokutl.tl.functions.channels import JoinChannelRequest
|
||||||
from herokutl.tl.types import Channel, Message, PeerUser
|
from herokutl.tl.types import Channel, Message, PeerUser
|
||||||
from herokutl.errors.common import ScamDetectionError
|
|
||||||
|
|
||||||
from .. import loader, main, utils
|
from .. import loader, main, utils
|
||||||
from .._local_storage import RemoteStorage
|
from .._local_storage import RemoteStorage
|
||||||
|
@ -662,6 +662,9 @@ class LoaderMod(loader.Module):
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
is_venv = hasattr(sys, 'real_prefix') or sys.prefix != getattr(sys, 'base_prefix', sys.prefix)
|
||||||
|
need_user_flag = loader.USER_INSTALL and not is_venv
|
||||||
|
|
||||||
pip = await asyncio.create_subprocess_exec(
|
pip = await asyncio.create_subprocess_exec(
|
||||||
sys.executable,
|
sys.executable,
|
||||||
"-m",
|
"-m",
|
||||||
|
@ -671,7 +674,7 @@ class LoaderMod(loader.Module):
|
||||||
"-q",
|
"-q",
|
||||||
"--disable-pip-version-check",
|
"--disable-pip-version-check",
|
||||||
"--no-warn-script-location",
|
"--no-warn-script-location",
|
||||||
*["--user"] if loader.USER_INSTALL else [],
|
*["--user"] if need_user_flag else [],
|
||||||
*requirements,
|
*requirements,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue