From 3e10e215a438fac9dfcde77bec31db1648e2ba77 Mon Sep 17 00:00:00 2001 From: Red-Giuliano Date: Wed, 17 Jan 2024 19:43:18 -0500 Subject: [PATCH 1/2] made cli fixes to make mac version work.: --- zt_backend/tests/test_e2e.py | 2 +- zt_dev_cli/cli.py | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/zt_backend/tests/test_e2e.py b/zt_backend/tests/test_e2e.py index a89a75f4..b307d9cc 100644 --- a/zt_backend/tests/test_e2e.py +++ b/zt_backend/tests/test_e2e.py @@ -14,7 +14,7 @@ import time -notebook_str = '''notebookId = "08bdd530-3544-473b-af28-bb04f8646dbd" +notebook_str = '''notebookId = "08bdd530-3544-473b-af28-bb04f8646dba" [cells.57fbbd59-8f30-415c-87bf-8caae0374070] cellType = "code" diff --git a/zt_dev_cli/cli.py b/zt_dev_cli/cli.py index 2eaf1269..d6c1d762 100644 --- a/zt_dev_cli/cli.py +++ b/zt_dev_cli/cli.py @@ -65,11 +65,11 @@ def app(port: Annotated[Optional[int], typer.Argument(help="Port number to bind log_path = os.path.normpath(pkg_resources.resource_filename('zt_dev_cli', 'log_config.yaml')) os.environ['RUN_MODE'] = 'app' frontend_cmd = ["yarn", "run", "app", str(port)] - backend_cmd = ["start", "uvicorn", "zt_backend.main:app", "--reload", f"--log-config={log_path}"] + backend_cmd = ["uvicorn", "zt_backend.main:app", "--reload", f"--log-config={log_path}"] - backend_process = subprocess.Popen(backend_cmd, shell=True) + backend_process = subprocess.Popen(backend_cmd, shell=(os.name == 'nt')) os.chdir("zt_frontend") - frontend_process = subprocess.Popen(frontend_cmd, shell=True) + frontend_process = subprocess.Popen(frontend_cmd, shell=(os.name == 'nt')) backend_process.wait() frontend_process.wait() @@ -82,11 +82,12 @@ def notebook(port: Annotated[Optional[int], typer.Argument(help="Port number to log_path = os.path.normpath(pkg_resources.resource_filename('zt_dev_cli', 'log_config.yaml')) os.environ['RUN_MODE'] = 'dev' frontend_cmd = ["yarn", "run", "dev", str(port)] - backend_cmd = ["start", "uvicorn", "zt_backend.main:app", "--reload", f"--log-config={log_path}"] + backend_cmd = ["uvicorn", "zt_backend.main:app", "--reload", f"--log-config={log_path}"] - backend_process = subprocess.Popen(backend_cmd, shell=True) + + backend_process = subprocess.Popen(backend_cmd, shell=(os.name == 'nt')) os.chdir("zt_frontend") - frontend_process = subprocess.Popen(frontend_cmd, shell=True) + frontend_process = subprocess.Popen(frontend_cmd, shell=(os.name == 'nt')) backend_process.wait() frontend_process.wait() From 2dec39cf8720a39f0155a6d61c0c09afd13e27bf Mon Sep 17 00:00:00 2001 From: Red-Giuliano Date: Wed, 17 Jan 2024 19:47:21 -0500 Subject: [PATCH 2/2] version bump --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index fd663057..397fbdc4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,7 +3,7 @@ name = zero-true description = A collaborative notebook built for data scientists long_description = file: README.md long_description_content_type = text/markdown -version = 0.0.dev42 +version = 0.0.dev43 [options] include_package_data = true