Skip to content

Commit 01ab7f9

Browse files
committed
Remove uv commands from Makefile
1 parent 6a0ff2e commit 01ab7f9

2 files changed

Lines changed: 8 additions & 10 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
-
7474
name: Run Integration Tests
7575
run: |
76-
make integ_test
76+
uv run -- make integ_test
7777
7878
build-and-test:
7979
name: 'Core / Unit Test Pipeline'

Makefile

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
# test, coverage and lint
33
###
44

5-
PRE_CMD = uv run --
6-
75
PYTEST_JUNIT_ARGS = --junitxml=tests_xml/tests.xml
86

97
PYTEST_COV_ARGS = \
@@ -18,32 +16,32 @@ help: ## Use one of the following instructions:
1816

1917
.PHONY : lint
2018
lint : ## Static code analysis with Pylint
21-
$(PRE_CMD) pylint -ry climada > pylint.log || true
19+
pylint -ry climada > pylint.log || true
2220

2321
.PHONY : unit_test
2422
unit_test : ## Unit tests execution with coverage and xml reports
25-
$(PRE_CMD) pytest $(PYTEST_ARGS) --ignore=climada/test climada/
23+
pytest $(PYTEST_ARGS) --ignore=climada/test climada/
2624

2725
.PHONY : install_test
2826
install_test : ## Test installation was successful
29-
$(PRE_CMD) pytest $(PYTEST_JUNIT_ARGS) --pyargs climada.engine.test.test_cost_benefit \
27+
pytest $(PYTEST_JUNIT_ARGS) --pyargs climada.engine.test.test_cost_benefit \
3028
climada.engine.test.test_impact
3129

3230
.PHONY : data_test
3331
data_test : ## Test data APIs
34-
$(PRE_CMD) pytest $(PYTEST_JUNIT_ARGS) script/jenkins/test_data_api.py
32+
pytest $(PYTEST_JUNIT_ARGS) script/jenkins/test_data_api.py
3533

3634
.PHONY : notebook_test
3735
notebook_test : ## Test notebooks in doc/tutorial
38-
$(PRE_CMD) pytest $(PYTEST_JUNIT_ARGS) script/jenkins/test_notebooks.py
36+
pytest $(PYTEST_JUNIT_ARGS) script/jenkins/test_notebooks.py
3937

4038
.PHONY : integ_test
4139
integ_test : ## Integration tests execution with xml reports
42-
$(PRE_CMD) pytest $(PYTEST_ARGS) climada/test/
40+
pytest $(PYTEST_ARGS) climada/test/
4341

4442
.PHONY : test
4543
test : ## Unit and integration tests execution with coverage and xml reports
46-
$(PRE_CMD) pytest $(PYTEST_ARGS) climada/
44+
pytest $(PYTEST_ARGS) climada/
4745

4846
.PHONY : ci-clean
4947
ci-clean :

0 commit comments

Comments
 (0)