Use the python path from virtualenv in end to end tests

Signed-off-by: hemildesai <[email protected]>

Author: hemildesai

end-to-end-test/end_to_end_test/test_checkout.py

@@ -6,6 +6,8 @@
 import subprocess
 import pytest  # type: ignore
 
+from .utils import PYTHON_PATH
+
 
 @pytest.mark.parametrize(
     "repository_backend,use_root",
@@ -17,7 +19,9 @@
         pytest.param("s3", True, marks=pytest.mark.external),
     ],
 )
-def test_checkout(repository_backend, use_root, tmpdir, temp_bucket_factory, tmpdir_factory):
+def test_checkout(
+    repository_backend, use_root, tmpdir, temp_bucket_factory, tmpdir_factory
+):
     tmpdir = str(tmpdir)
     if repository_backend == "s3":
         repository = "s3://" + temp_bucket_factory.s3()
@@ -68,7 +72,7 @@ def main():
     env = os.environ
     env["PATH"] = "/usr/local/bin:" + os.environ["PATH"]
 
-    cmd = ["python", "train.py"]
+    cmd = [PYTHON_PATH, "train.py"]
     subprocess.run(cmd, cwd=tmpdir, env=env, check=True)
 
     experiments = json.loads(

end-to-end-test/end_to_end_test/test_delete.py

@@ -4,7 +4,7 @@
 from pathlib import Path
 import pytest  # type: ignore
 
-from .utils import path_exists
+from .utils import path_exists, PYTHON_PATH
 
 
 @pytest.mark.parametrize(
@@ -17,7 +17,9 @@
         pytest.param("s3", True, marks=pytest.mark.external),
     ],
 )
-def test_delete(repository_backend, use_root, tmpdir, temp_bucket_factory, tmpdir_factory):
+def test_delete(
+    repository_backend, use_root, tmpdir, temp_bucket_factory, tmpdir_factory
+):
     tmpdir = str(tmpdir)
     if repository_backend == "s3":
         repository = "s3://" + temp_bucket_factory.s3()
@@ -57,7 +59,7 @@ def main():
     env = os.environ
     env["PATH"] = "/usr/local/bin:" + os.environ["PATH"]
 
-    cmd = ["python", "train.py", "--foo"]
+    cmd = [PYTHON_PATH, "train.py", "--foo"]
     subprocess.run(cmd, cwd=tmpdir, env=env, check=True)
 
     experiments = json.loads(
@@ -77,7 +79,10 @@ def main():
     assert path_exists(repository, checkpoint_storage_path)
 
     subprocess.run(
-        ["replicate", "delete", "--force", checkpoint_id], cwd=tmpdir, env=env, check=True
+        ["replicate", "delete", "--force", checkpoint_id],
+        cwd=tmpdir,
+        env=env,
+        check=True,
     )
 
     experiments = json.loads(
@@ -100,7 +105,10 @@ def main():
     assert path_exists(repository, experiment_storage_path)
 
     subprocess.run(
-        ["replicate", "delete", "--force", experiment_id], cwd=tmpdir, env=env, check=True
+        ["replicate", "delete", "--force", experiment_id],
+        cwd=tmpdir,
+        env=env,
+        check=True,
     )
 
     experiments = json.loads(

end-to-end-test/end_to_end_test/test_list.py

@@ -4,7 +4,7 @@
 import pytest  # type: ignore
 from dateutil.parser import parse as parse_date
 
-from .utils import get_env
+from .utils import get_env, PYTHON_PATH
 
 
 @pytest.mark.parametrize(
@@ -58,7 +58,7 @@ def main():
 
     env = get_env()
 
-    subprocess.run(["python", "train.py", "--foo"], cwd=tmpdir, env=env, check=True)
+    subprocess.run([PYTHON_PATH, "train.py", "--foo"], cwd=tmpdir, env=env, check=True)
 
     experiments = json.loads(
         subprocess.run(
@@ -106,7 +106,9 @@ def main():
 experiment.checkpoint(path=".", step=3)
 """
         )
-    subprocess.run(["python", "train2.py", exp["id"]], cwd=tmpdir, env=env, check=True)
+    subprocess.run(
+        [PYTHON_PATH, "train2.py", exp["id"]], cwd=tmpdir, env=env, check=True
+    )
     experiments = json.loads(
         subprocess.run(
             ["replicate", "--verbose", "list", "--json"],

end-to-end-test/end_to_end_test/utils.py

@@ -5,6 +5,7 @@
 from google.cloud import storage as google_storage
 
 ROOT_DIRECTORY = Path(__file__).parent.parent.parent
+PYTHON_PATH = os.path.abspath(os.path.join(ROOT_DIRECTORY, "venv/bin/python"))
 
 
 def get_env():
@@ -41,7 +42,7 @@ def path_exists(repository, path):
             s3.Object(root, str(path)).load()
             return True
         except botocore.exceptions.ClientError as e:
-            if e.response['Error']['Code'] == "404":
+            if e.response["Error"]["Code"] == "404":
                 return False
             else:
                 # Something else has gone wrong.