@@ -18,15 +18,16 @@ def __init__(self, nop=False):
18
18
def common_first (self ):
19
19
self .install_downloaders ()
20
20
self .setup_pip ()
21
- self .pip3_install ("wheel virtualenv" )
22
- self .pip3_install ("setuptools --upgrade" )
21
+ self .pip_install ("wheel virtualenv" )
22
+ self .pip_install ("setuptools --upgrade" )
23
23
24
24
if self .os == 'linux' :
25
25
self .install ("ca-certificates" )
26
- self .install ("git unzip wget patchelf awscli " )
26
+ self .install ("git unzip wget patchelf" )
27
27
self .install ("coreutils" ) # for realpath
28
28
29
29
def debian_compat (self ):
30
+ self .pip_install ("-IU --force-reinstall setuptools" )
30
31
self .install ("build-essential cmake" )
31
32
self .install ("python3-regex" )
32
33
self .install ("python3-venv python3-psutil python3-networkx python3-numpy" ) # python3-skimage
@@ -53,7 +54,7 @@ def redhat_compat(self):
53
54
else :
54
55
self .run ("amazon-linux-extras install epel" , output_on_error = True )
55
56
self .install ("python3-devel" )
56
- self .pip3_install ("psutil" )
57
+ self .pip_install ("psutil" )
57
58
58
59
self .install_git_lfs_on_linux ()
59
60
@@ -76,14 +77,15 @@ def macosx(self):
76
77
def common_last (self ):
77
78
self .run ("python3 -m pip uninstall -y ramp-packer RLTest || true" )
78
79
# redis-py-cluster should be installed from git due to redis-py dependency
79
- self .pip3_install ("--no-cache-dir git+https://github.com/Grokzen/redis-py-cluster.git@master" )
80
- self .pip3_install ("--no-cache-dir git+https://github.com/RedisLabsModules/RLTest.git@master" )
81
- self .pip3_install ("--no-cache-dir git+https://github.com/RedisLabs/RAMP@master" )
80
+ self .pip_install ("--no-cache-dir git+https://github.com/Grokzen/redis-py-cluster.git@master" )
81
+ self .pip_install ("--no-cache-dir git+https://github.com/RedisLabsModules/RLTest.git@master" )
82
+ self .pip_install ("--no-cache-dir git+https://github.com/RedisLabs/RAMP@master" )
82
83
83
- self .pip3_install ("-r %s/readies/paella/requirements.txt" % HERE )
84
- self .pip3_install ("-r %s/test/test_requirements.txt" % ROOT )
84
+ self .pip_install ("-r %s/readies/paella/requirements.txt" % HERE )
85
+ self .pip_install ("-r %s/test/test_requirements.txt" % ROOT )
85
86
86
- self .pip3_install ("mkdocs mkdocs-material mkdocs-extensions" )
87
+ self .pip_install ("awscli" )
88
+ self .pip_install ("mkdocs mkdocs-material mkdocs-extensions" )
87
89
88
90
#----------------------------------------------------------------------------------------------
89
91
0 commit comments