Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charmcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ parts:
source: .
after:
- poetry-deps
poetry-export-extra-args: ['--only', 'main,charm-libs,single-kernel']
poetry-export-extra-args: ['--only', 'main,charm-libs']
build-packages:
- libffi-dev # Needed to build Python dependencies with Rust from source
- libssl-dev # Needed to build Python dependencies with Rust from source
Expand Down
26 changes: 14 additions & 12 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ pysyncobj = "^0.3.15"
charm-refresh = "^3.1.0.2"
charmlibs-snap = "^1.0.1"
charmlibs-systemd = "^1.0.0"

[tool.poetry.group.single-kernel.dependencies]
postgresql-charms-single-kernel = "16.3.0"
postgresql-charms-single-kernel = "16.3.1"

[tool.poetry.group.charm-libs.dependencies]
# data_platform_libs/v0/data_models.py
Expand Down Expand Up @@ -79,6 +77,7 @@ allure-pytest-default-results = "^0.1.4"
tomli = "^2.4.1"
tomli-w = "^1.2.0"
pysyncobj = "*"
postgresql-charms-single-kernel = "*"

[tool.poetry.group.build-refresh-version]
optional = true
Expand Down
23 changes: 0 additions & 23 deletions src/cluster.py

This file was deleted.

2 changes: 1 addition & 1 deletion src/raft_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@
from pysyncobj.utility import TcpUtility
from single_kernel_postgresql.config.enums import Substrates
from single_kernel_postgresql.config.literals import PATRONI_CLUSTER_STATUS_ENDPOINT
from single_kernel_postgresql.managers.patroni import ClusterMember
from single_kernel_postgresql.utils import (
create_directory,
parallel_patroni_get_request,
render_file,
)
from tenacity import RetryError, Retrying, stop_after_attempt, wait_fixed

from cluster import ClusterMember
from constants import RAFT_PARTNER_PREFIX, RAFT_PORT

if TYPE_CHECKING:
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ description = Run unit tests
set_env =
{[testenv]set_env}
commands_pre =
poetry install --only main,charm-libs,single-kernel,unit --no-root
poetry install --only main,charm-libs,unit --no-root
commands =
poetry run coverage run --source={[vars]src_path} \
-m pytest -v --tb native -s {posargs} {[vars]tests_path}/unit
Expand All @@ -66,6 +66,6 @@ pass_env =
LANDSCAPE_ACCOUNT_NAME
LANDSCAPE_REGISTRATION_KEY
commands_pre =
poetry install --only integration,single-kernel --no-root
poetry install --only integration --no-root
commands =
poetry run pytest -v --tb native --log-cli-level=INFO -s --ignore={[vars]tests_path}/unit/ {posargs}
Loading