Python3.8 on centos dance

This commit is contained in:
jpic 2020-02-16 15:15:54 +01:00
parent e20946a0f6
commit 440761fea2
2 changed files with 19 additions and 16 deletions

View File

@ -10,22 +10,24 @@ class Pip(Action):
super().__init__(*pip_packages, pip=pip, requirements=requirements)
async def call(self, *args, **kwargs):
pip = await self.which('pip3', 'pip', 'pip2')
if pip:
pip = pip[0]
else:
from .packages import Packages
action = self.action(
Packages,
'python3,apk', 'python3-pip,apt',
args=args, kwargs=kwargs
)
await action(*args, **kwargs)
pip = self.kwargs.get('pip', None)
if not pip:
pip = await self.which('pip3', 'pip', 'pip2')
if not pip:
raise Exception('Could not install a pip command')
else:
if pip:
pip = pip[0]
else:
from .packages import Packages
action = self.action(
Packages,
'python3,apk', 'python3-pip,apt',
args=args, kwargs=kwargs
)
await action(*args, **kwargs)
pip = await self.which('pip3', 'pip', 'pip2')
if not pip:
raise Exception('Could not install a pip command')
else:
pip = pip[0]
if 'CACHE_DIR' in os.environ:
cache = os.path.join(os.getenv('CACHE_DIR'), 'pip')
@ -38,7 +40,8 @@ class Pip(Action):
await self.exec(f'{pip} install --upgrade pip')
# https://github.com/pypa/pip/issues/5599
pip = 'python3 -m pip'
if 'pip' not in self.kwargs:
pip = 'python3 -m pip'
source = [p for p in self.args if p.startswith('/') or p.startswith('.')]
if source:

View File

@ -17,7 +17,7 @@ build = Buildah(
'''),
Copy('shlax/', 'setup.py', '/app'),
),
Pip('/app'),
Pip('/app', pip='python3.8 -m pip'),
commit='yourlabs/shlax',
workdir='/app',
)