diff --git a/.woodpecker/dev.yaml b/.woodpecker/dev.yaml index dbe313d..f837559 100644 --- a/.woodpecker/dev.yaml +++ b/.woodpecker/dev.yaml @@ -13,5 +13,3 @@ steps: - event: pull_request evaluate: 'CI_COMMIT_PULL_REQUEST_LABELS contains "ci-ready"' - event: manual - depends_on: - - name: python diff --git a/.woodpecker/latest.yaml b/.woodpecker/latest.yaml index 1ce29a7..8309154 100644 --- a/.woodpecker/latest.yaml +++ b/.woodpecker/latest.yaml @@ -12,5 +12,3 @@ steps: when: - event: [ tag, push, manual ] branch: master - depends_on: - - name: python diff --git a/.woodpecker/python.yaml b/.woodpecker/python.yaml deleted file mode 100644 index fa5c5a3..0000000 --- a/.woodpecker/python.yaml +++ /dev/null @@ -1,16 +0,0 @@ -steps: - - name: test - image: ghcr.io/astral-sh/uv:0.9-python3.12-alpine - commands: - - uv sync - - pytest - - | - python src/karl/__init__.py 2>&1 | while IFS= read -r line; do - echo "$line" - if echo "$line" | grep -q "Uvicorn running on"; then - pkill -f "uvicorn" - break - fi - done - when: - - event: push diff --git a/src/karl/services/vcs.py b/src/karl/services/vcs.py index 50be523..0d70139 100644 --- a/src/karl/services/vcs.py +++ b/src/karl/services/vcs.py @@ -2,7 +2,7 @@ from git import Repo, Remote from injectable import injectable from karl.config import GitConfig, get_settings -from karl.model.vcs import Head +from model.vcs import Head @injectable(singleton=True) diff --git a/tests/test_mo_env.py b/tests/test_mo_env.py index 5e245b9..b5e26a7 100644 --- a/tests/test_mo_env.py +++ b/tests/test_mo_env.py @@ -8,7 +8,8 @@ from karl.services.mo import Mo @pytest.fixture(scope='class') def target_path(): - p = Path('tests/files/test1/test.env') + # p = Path('tests/files/test1/test.env') + p = Path('files/test1/test.env') # posprzątaj przed testem, gdyby plik istniał z poprzednich uruchomień if p.exists(): p.unlink() @@ -21,7 +22,8 @@ def target_path(): @pytest.fixture(scope='class') def test1_content(target_path: Path): mo = Mo(Passwords()) - mo.process(Path('tests/files/test1/test.mo.env').absolute()) + mo.process(Path('files/test1/test.mo.env').absolute()) + # mo.process(Path('tests/files/test1/test.mo.env').absolute()) assert target_path.absolute().exists() diff --git a/tests/test_woodpecker.py b/tests/test_woodpecker.py index f4104db..9bb4616 100644 --- a/tests/test_woodpecker.py +++ b/tests/test_woodpecker.py @@ -1,4 +1,4 @@ -from karl.core import woodpecker +from core import woodpecker files = [".gitignore", "compose/nginx/docker-compose.yaml", "config/heimdall.kdbx", "files/nginx/cert/fullchain.mo.pem", "files/nginx/cert/key.mo.pem", "files/nginx/conf.d/default.conf", "files/nginx/conf.d/forge.conf",