From 11b00228eeb02171f4636be749f47997563169ca Mon Sep 17 00:00:00 2001 From: Ying Chen Date: Thu, 9 Jan 2025 18:10:23 -0800 Subject: [PATCH] [test] Move pytest and its dependencies from `make apps` to `make test_prep` --- Makefile | 9 ++++++++- Makefile.vars | 1 + desktop/core/base_requirements.txt | 4 ---- desktop/core/test_requirements.txt | 3 +++ 4 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 desktop/core/test_requirements.txt diff --git a/Makefile b/Makefile index 0a42db6ec0d..becf5750587 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,7 @@ default: @echo ' clean : Remove desktop build products' @echo ' distclean : Remove desktop and thirdparty build products' # <<<< DEV ONLY - @echo ' doc : Build documentation' + @echo ' doc : Build documentation' @echo ' prod : Generate a tar file for production distribution' @echo ' locales : Extract strings and update dictionary of each locale' @echo ' ace : Builds the Ace Editor tool' @@ -108,6 +108,13 @@ all: default # <<<< DEV ONLY include Makefile.tarball +################################### +# Build docs (unused) +################################### +.PHONY: test_prep +test_prep: apps + @$(ENV_PIP) install -r $(REQUIREMENT_TEST_FILE) + ################################### # Build docs (unused) ################################### diff --git a/Makefile.vars b/Makefile.vars index e4b7b5d4b4b..b05ebf84b0b 100644 --- a/Makefile.vars +++ b/Makefile.vars @@ -140,6 +140,7 @@ PYBABEL := $(ROOT)/build/env/bin/pybabel ############################## REQUIREMENT_FILE := $(ROOT)/desktop/core/requirements.txt REQUIREMENT_DOT_FILE := $(ROOT)/desktop/core/.requirements +REQUIREMENT_TEST_FILE := $(ROOT)/desktop/core/test_requirements.txt NAVOPTAPI_WHL := $(ROOT)/desktop/core/wheels/navoptapi-1.0.0-py3-none-any.whl ############################## diff --git a/desktop/core/base_requirements.txt b/desktop/core/base_requirements.txt index 13069cb1112..d277a6a9f88 100644 --- a/desktop/core/base_requirements.txt +++ b/desktop/core/base_requirements.txt @@ -43,12 +43,8 @@ openpyxl==3.0.9 phoenixdb==1.2.1 prompt-toolkit==3.0.39 protobuf==3.20.3 -py==1.11.0 pyarrow==17.0.0 pyformance==0.3.2 -pytest==8.1.1 -pytest-django==4.8.0 -pytest-html==4.1.1 python-dateutil==2.8.2 python-daemon==2.2.4 python-ldap==3.4.3 diff --git a/desktop/core/test_requirements.txt b/desktop/core/test_requirements.txt new file mode 100644 index 00000000000..bf6a6c2edcf --- /dev/null +++ b/desktop/core/test_requirements.txt @@ -0,0 +1,3 @@ +pytest==8.1.1 +pytest-django==4.8.0 +pytest-html==4.1.1 \ No newline at end of file