Skip to content

Commit d872edd

Browse files
authored
system-setup: take precedence over preinstalled python module (#372) (#374)
1 parent 402f635 commit d872edd

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ jobs:
157157
- run:
158158
name: Build
159159
command: |
160-
docker build -f Dockerfile.gpu-test -t redisai-gpu:latest-x64-bionic-test .
160+
docker build -f Dockerfile.gpu-test --no-cache -t redisai-gpu:latest-x64-bionic-test .
161161
- run:
162162
name: Test
163163
command: |

opt/pack.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pack_ramp() {
3535

3636
# this is only to extract {semantic_version} into VERSION
3737
RAMPOUT=$(mktemp /tmp/ramp.XXXXXX)
38-
$RAMP_PROG pack -m $ROOT/ramp.yml -o $BINDIR/$PRODUCT.{os}-{architecture}.{semantic_version}.zip $INSTALL_DIR/$PRODUCT.so 2> /dev/null | grep '.zip' > $RAMPOUT
38+
$RAMP_PROG pack -m $ROOT/ramp.yml --packname-file $RAMPOUT -o $BINDIR/$PRODUCT.{os}-{architecture}.{semantic_version}.zip $INSTALL_DIR/$PRODUCT.so
3939
local rampfile=`realpath $(tail -1 $RAMPOUT)`
4040
rm -f $rampfile $RAMPOUT
4141
echo `basename $rampfile` | sed -e "s/[^.]*\.[^.]*\.\(.*\)\.zip/\1/" > $BINDIR/VERSION

opt/system-setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ def macosx(self):
6161
self.install("redis")
6262

6363
def common_last(self):
64+
self.run("python3 -m pip uninstall -y ramp-packer RLTest")
6465
# redis-py-cluster should be installed from git due to redis-py dependency
6566
self.pip3_install("--no-cache-dir git+https://github.com/Grokzen/redis-py-cluster.git@master")
6667
self.pip3_install("--no-cache-dir git+https://github.com/RedisLabsModules/RLTest.git@master")

0 commit comments

Comments
 (0)