summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreea Radoescu <randreea23@gmail.com>2024-11-17 19:04:03 +0100
committerAndreea Radoescu <randreea23@gmail.com>2024-11-17 19:04:03 +0100
commitbda43e5bca1de67b7de7231a61bec9795a9d75cb (patch)
tree4c9d1dccce2b6897063c1b150c3d50618fcc10d1
parente289af0c914058490949ace441aada8182de0126 (diff)
parentb2cfaf91387bb030274a100b02094daa39571616 (diff)
Merge branch 'master' into feature/addGUI
-rw-r--r--pre-commit2
-rw-r--r--tests/session_integrationtest.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/pre-commit b/pre-commit
index 9c577e5..668071c 100644
--- a/pre-commit
+++ b/pre-commit
@@ -1,4 +1,4 @@
#!/bin/sh
-./venv/bin/pytest tests/*
+make test
exit $?
diff --git a/tests/session_integrationtest.py b/tests/session_integrationtest.py
index ddabff9..267e374 100644
--- a/tests/session_integrationtest.py
+++ b/tests/session_integrationtest.py
@@ -1,7 +1,7 @@
import pytest
import json
-from flashcards.session import Session
+from flashcards import Session
@pytest.fixture
def cardFiles(tmp_path):