Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fixed various stuff that were blocking a new out of the box installation only using the GNUmakefile #763

Merged
merged 1 commit into from
Nov 27, 2023
Merged

fix: fixed various stuff that were blocking a new out of the box installation only using the GNUmakefile #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: the reason this breaks is because the use of .ONESHELL:. That feature doesn't exist in the version of make that ships with macs, resulting in diverging behaviors.

Once we have a more complete docker dev env, I'll argue for removing much of the makefile targets that downloads executables and sets up venvs and so on.

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
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/utils/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/integration/utils/kafka_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down