From eb9ee31b3ff5879546d70737903cd6941562fb2d Mon Sep 17 00:00:00 2001 From: Elia Migliore Date: Fri, 24 Nov 2023 16:15:14 +0100 Subject: [PATCH] fix: fixed various stuff that were blocking a new out of the box installation only using the `GNUmakefile` fixed errors that I've encountered by cloning the project from scratch in a new folder and using the `GNUmakefile` to set it up and running. --- GNUmakefile | 6 +++--- tests/integration/utils/config.py | 2 +- tests/integration/utils/kafka_server.py | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 0eb6d33d4..0b5afdbb5 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -86,9 +86,9 @@ cleanest: cleaner requirements: export CUSTOM_COMPILE_COMMAND='make requirements' requirements: pip install --upgrade pip setuptools pip-tools - cd requirements && pip-compile --upgrade --resolver=backtracking requirements.in - cd requirements && pip-compile --upgrade --resolver=backtracking requirements-dev.in - cd requirements && pip-compile --upgrade --resolver=backtracking requirements-typing.in + pip-compile --upgrade --resolver=backtracking requirements/requirements.in -o requirements/requirements.txt + pip-compile --upgrade --resolver=backtracking requirements/requirements-dev.in -o requirements/requirements-dev.txt + pip-compile --upgrade --resolver=backtracking requirements/requirements-typing.in -o requirements/requirements-typing.txt .PHONY: schema schema: against := origin/main diff --git a/tests/integration/utils/config.py b/tests/integration/utils/config.py index d68efc507..63b7f5b48 100644 --- a/tests/integration/utils/config.py +++ b/tests/integration/utils/config.py @@ -24,7 +24,7 @@ def from_dict(data: dict) -> "ZKConfig": @dataclass(frozen=True) class KafkaDescription: version: str - kafka_tgz: str + kafka_tgz: Path install_dir: Path download_url: str protocol_version: str diff --git a/tests/integration/utils/kafka_server.py b/tests/integration/utils/kafka_server.py index 9a54698d0..d137c949f 100644 --- a/tests/integration/utils/kafka_server.py +++ b/tests/integration/utils/kafka_server.py @@ -63,6 +63,7 @@ def maybe_download_kafka(kafka_description: KafkaDescription) -> None: if not os.path.exists(kafka_description.install_dir): log.info("Downloading Kafka '%s'", kafka_description.download_url) download = requests.get(kafka_description.download_url, stream=True) + kafka_description.kafka_tgz.parent.mkdir(parents=True, exist_ok=True) with open(kafka_description.kafka_tgz, "wb") as fd: for chunk in download.iter_content(chunk_size=None): fd.write(chunk)