From c860191a1ac9b0212186828faa9aa3e50257f8a9 Mon Sep 17 00:00:00 2001
From: David Verdeguer <daverlo@github.com>
Date: Mon, 19 Oct 2020 12:21:04 +0200
Subject: [PATCH] Run python deps tests on mac

---
 .../{python-deps-linux.yml => python-deps.yml}      | 13 ++++++++++---
 python-setup/install_tools.sh                       |  3 ---
 2 files changed, 10 insertions(+), 6 deletions(-)
 rename .github/workflows/{python-deps-linux.yml => python-deps.yml} (83%)

diff --git a/.github/workflows/python-deps-linux.yml b/.github/workflows/python-deps.yml
similarity index 83%
rename from .github/workflows/python-deps-linux.yml
rename to .github/workflows/python-deps.yml
index 0ec27f7e7..f7a35eeeb 100644
--- a/.github/workflows/python-deps-linux.yml
+++ b/.github/workflows/python-deps.yml
@@ -1,4 +1,4 @@
-name: Test Python Package Installation on Linux
+name: Test Python Package Installation on Linux and Mac
 
 on:
   push:
@@ -8,10 +8,11 @@ on:
 jobs:
 
   test-setup-python-scripts:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
         fail-fast: false
         matrix:
+          os: [ubuntu-latest, macos-latest]
           include:
             - test_dir: python-setup/tests/pipenv/requests-2
               test_script: $GITHUB_WORKSPACE/python-setup/tests/check_requests_123.sh 2
@@ -52,7 +53,13 @@ jobs:
         $GITHUB_WORKSPACE/python-setup/install_tools.sh
         echo -e '\n\n\n\n\n' && sleep 0.5
         cd $GITHUB_WORKSPACE/${{ matrix.test_dir }}
-        find /opt/hostedtoolcache/CodeQL -path "*x64/codeql" -exec $GITHUB_WORKSPACE/python-setup/auto_install_packages.py {} \;
+        unameOut="$(uname -s)"
+        case "${unameOut}" in
+            Linux*)     basePath="/opt";;
+            Darwin*)    basePath="/Users/runner";;
+        esac
+        echo ${basePath}
+        find ${basePath}/hostedtoolcache/CodeQL -path "*x64/codeql" -exec $GITHUB_WORKSPACE/python-setup/auto_install_packages.py {} \;
     - name: Setup for extractor
       run: |
         echo $CODEQL_PYTHON
diff --git a/python-setup/install_tools.sh b/python-setup/install_tools.sh
index 5179a5c24..b5a6e8dce 100755
--- a/python-setup/install_tools.sh
+++ b/python-setup/install_tools.sh
@@ -18,9 +18,6 @@ python3 -m pip install --user --upgrade pip setuptools wheel
 python2 -m pip install --user virtualenv
 python3 -m pip install --user virtualenv
 
-# venv is required for installation of poetry or pipenv (I forgot which)
-sudo apt-get install -y python3-venv
-
 # We install poetry with pip instead of the recommended way, since the recommended way
 # caused some problem since `poetry run` gives output like:
 #