elifesciences · HazalCiplak · Oct 7, 2024 · Oct 7, 2024 · Oct 7, 2024 · Oct 7, 2024
diff --git a/Makefile b/Makefile
@@ -41,6 +41,7 @@ ARGS =
 
 .PHONY: build
 
+PYTEST_WATCH_MODULES = tests/unit_test
 
 venv-clean:
 	@if [ -d "$(VENV)" ]; then \
@@ -99,18 +100,18 @@ dev-nbstripout-install:
 	$(VENV)/bin/nbstripout --install
 
 
-dev-lint: dev-flake8 dev-pylint dev-notebook-lint
+dev-lint: dev-flake8 dev-pylint dev-mypy dev-notebook-lint
 
 
-dev-pytest:
-	$(PYTHON) -m pytest -p no:cacheprovider $(ARGS)
+dev-unittest:
+	$(PYTHON) -m pytest -p no:cacheprovider $(ARGS) tests/unit_test
 
 
 dev-watch:
-	$(PYTHON) -m pytest_watch -- -p no:cacheprovider -p no:warnings $(ARGS)
+	$(PYTHON) -m pytest_watch -- -p no:cacheprovider $(ARGS) $(PYTEST_WATCH_MODULES)
 
 
-dev-test: dev-lint dev-pytest
+dev-test: dev-lint dev-unittest
 
 
 dev-run-sample-notebook:
@@ -199,16 +200,16 @@ notebook-nbstripout-check:
 	'
 
 
-pytest:
-	$(DEV_RUN) pytest -p no:cacheprovider $(ARGS)
+unittest:
+	$(DEV_RUN) pytest -p no:cacheprovider $(ARGS) tests/unit_test
 
 
-pytest-not-slow:
-	@$(MAKE) ARGS="$(ARGS) $(NOT_SLOW_PYTEST_ARGS)" pytest
+unittest-not-slow:
+	@$(MAKE) ARGS="$(ARGS) $(NOT_SLOW_PYTEST_ARGS)" unittest
 
 
 .watch:
-	$(DEV_RUN) pytest-watch -- -p no:cacheprovider -p no:warnings $(ARGS)
+	$(DEV_RUN) pytest-watch -- -p no:cacheprovider $(ARGS) $(PYTEST_WATCH_MODULES)
 
 
 watch-slow:
@@ -222,7 +223,7 @@ watch:
 lint: flake8 pylint mypy notebook-lint
 
 
-test: lint pytest
+test: lint unittest
 
 
 airflow-build:

diff --git a/run_test.sh b/run_test.sh
@@ -18,6 +18,7 @@ flake8 tests/ data_science_pipeline/ dags/
 echo "running mypy"
 mypy tests/ data_science_pipeline/ dags/
 
-pytest tests/ -p no:cacheprovider -s --disable-warnings
+echo "running unit tests"
+pytest tests/unit_test -p no:cacheprovider -s --disable-warnings
 
 echo "done"
diff --git a/tests/peerscout/__init__.py → tests/unit_test/__init__.py b/tests/peerscout/__init__.py → tests/unit_test/__init__.py
diff --git a/tests/conftest.py → tests/unit_test/conftest.py b/tests/conftest.py → tests/unit_test/conftest.py
diff --git a/...scout_recommend_reviewing_editors_test.py → ...scout_recommend_reviewing_editors_test.py b/...scout_recommend_reviewing_editors_test.py → ...scout_recommend_reviewing_editors_test.py
diff --git a/tests/utils/__init__.py → tests/unit_test/peerscout/__init__.py b/tests/utils/__init__.py → tests/unit_test/peerscout/__init__.py
diff --git a/tests/peerscout/models_test.py → tests/unit_test/peerscout/models_test.py b/tests/peerscout/models_test.py → tests/unit_test/peerscout/models_test.py
diff --git a/tests/project_test.py → tests/unit_test/project_test.py b/tests/project_test.py → tests/unit_test/project_test.py
diff --git a/tests/unit_test/utils/__init__.py b/tests/unit_test/utils/__init__.py
diff --git a/tests/utils/bq_test.py → tests/unit_test/utils/bq_test.py b/tests/utils/bq_test.py → tests/unit_test/utils/bq_test.py
diff --git a/tests/utils/dags_test.py → tests/unit_test/utils/dags_test.py b/tests/utils/dags_test.py → tests/unit_test/utils/dags_test.py
diff --git a/tests/utils/editor_recommendation_test.py → ..._test/utils/editor_recommendation_test.py b/tests/utils/editor_recommendation_test.py → ..._test/utils/editor_recommendation_test.py
diff --git a/tests/utils/europepmc_test.py → tests/unit_test/utils/europepmc_test.py b/tests/utils/europepmc_test.py → tests/unit_test/utils/europepmc_test.py
diff --git a/tests/utils/json_test.py → tests/unit_test/utils/json_test.py b/tests/utils/json_test.py → tests/unit_test/utils/json_test.py
diff --git a/tests/utils/misc_test.py → tests/unit_test/utils/misc_test.py b/tests/utils/misc_test.py → tests/unit_test/utils/misc_test.py
diff --git a/tests/utils/notebook_test.py → tests/unit_test/utils/notebook_test.py b/tests/utils/notebook_test.py → tests/unit_test/utils/notebook_test.py
diff --git a/tests/utils/pubmed_test.py → tests/unit_test/utils/pubmed_test.py b/tests/utils/pubmed_test.py → tests/unit_test/utils/pubmed_test.py
diff --git a/tests/utils/timeseries_test.py → tests/unit_test/utils/timeseries_test.py b/tests/utils/timeseries_test.py → tests/unit_test/utils/timeseries_test.py