diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 288214f22b1121d8413ee5b05e9013ee11ac5b46..46fe1652c85916d218b5aa6913a462b5f5eab18f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,8 +67,7 @@ before_script: # list packages - ${PYTHON} -m pip list installed script: - - cd gracedb - - ${PYTHON} -m pytest --cov . --junitxml=${CI_PROJECT_DIR}/junit.xml + - PYTHONPATH=${PYTHONPATH}:${PWD}/gracedb ${PYTHON} -m pytest --cov ./gracedb --junitxml=${CI_PROJECT_DIR}/junit.xml after_script: - rm -fvr ${PIP_CACHE_DIR}/log artifacts: diff --git a/gracedb/pytest.ini b/gracedb/pytest.ini deleted file mode 100644 index 716ac84a0a6b68d1552b622186324da18a6a78f7..0000000000000000000000000000000000000000 --- a/gracedb/pytest.ini +++ /dev/null @@ -1,5 +0,0 @@ -[pytest] -addopts = - -r a - --ignore events/tests/test_perms.py - --ignore api/v2 diff --git a/pytest.ini b/pytest.ini new file mode 100644 index 0000000000000000000000000000000000000000..e973c457b57b6212171f69e792d91268e178a9b2 --- /dev/null +++ b/pytest.ini @@ -0,0 +1,5 @@ +[pytest] +addopts = + -r a + --ignore=gracedb/events/tests/test_perms.py + --ignore=gracedb/api/v2