circleci: workaround for python ssl

RedisAI · Jan 27, 2020 · 90e1d24 · 90e1d24
1 parent 13b46a4
commit 90e1d24
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,7 +16,7 @@ commands:
           name: Install dependencies
           command: |
             ./opt/readies/bin/getpy
-            BREW_NO_UPDATE=1 ./opt/system-setup.py
+            BREW_NO_UPDATE=1 MACOS_PYTHON_SSL_FIX=1 ./opt/system-setup.py
             git clone git://github.com/antirez/redis.git --branch 5.0.7
             (cd redis && make malloc=libc -j $(nproc) && make install)
             redis-server --version

diff --git a/opt/Makefile b/opt/Makefile
@@ -148,7 +148,7 @@ endif
 	python3 -m RLTest $(TEST_ARGS) --test $(TEST) --module $(INSTALL_DIR)/redisai.so --use-slaves ;\
 	python3 -m RLTest $(TEST_ARGS) --test $(TEST) --module $(INSTALL_DIR)/redisai.so --use-aof 
 	# Commented until the MacOS CI is available
-	python3 -m RLTest $(TEST_ARGS) --test double-panda.py --module $(INSTALL_DIR)/redisai.so
+	# python3 -m RLTest $(TEST_ARGS) --test double-panda.py --module $(INSTALL_DIR)/redisai.so
 
 #----------------------------------------------------------------------------------------------
 

diff --git a/opt/system-setup.py b/opt/system-setup.py
@@ -56,9 +56,10 @@ def macosx(self):
         if out.splitlines() == []:
             fatal("Xcode tools are not installed. Please run xcode-select --install.")
 
-         # workaround for ssl issue
-        self.run("brew unlink python@2")
-        self.run("brew reinstall python3")
+         # workaround for ssl issue, needed in CircleCI
+        if os.environ.get('MACOS_PYTHON_SSL_FIX') == '1':
+            self.run("brew unlink python@2")
+            self.run("brew reinstall python3")
 
         self.install_gnu_utils()
         self.install("git-lfs")