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.

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

Removes cargo_sqlx and cargo_deb tasks #319

Merged
merged 3 commits into from
Feb 5, 2025
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
6 changes: 6 additions & 0 deletions .changelog/_unreleased.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,9 @@ id = "faea65a7-ef87-457c-8c7b-523bab205e00"
type = "improvement"
description = "Use `uv tool` instead of `pex` to run Python tools"
author = "scott@stevenson.io"

[[entries]]
id = "77dc091d-98c6-45bf-b373-ac5c87e2919b"
type = "breaking change"
description = "Remove cargo_sqlx* and cargo_generate_deb_package tasks (no longer used at our knowledge)"
author = "thomas.pellissier-tanon@helsing.ai"
84 changes: 0 additions & 84 deletions kraken-build/src/kraken/std/cargo/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,8 @@
from .tasks.cargo_clippy_task import CargoClippyTask
from .tasks.cargo_deny_task import CargoDenyTask
from .tasks.cargo_fmt_task import CargoFmtTask
from .tasks.cargo_generate_deb import CargoGenerateDebPackage
from .tasks.cargo_login import CargoLoginTask
from .tasks.cargo_publish_task import CargoPublishTask
from .tasks.cargo_sqlx_database_create import CargoSqlxDatabaseCreateTask
from .tasks.cargo_sqlx_database_drop import CargoSqlxDatabaseDropTask
from .tasks.cargo_sqlx_migrate import CargoSqlxMigrateTask
from .tasks.cargo_sqlx_prepare import CargoSqlxPrepareTask
from .tasks.cargo_sync_config_task import CargoSyncConfigTask
from .tasks.cargo_test_task import CargoTestTask
from .tasks.cargo_update_task import CargoUpdateTask
Expand All @@ -35,12 +30,9 @@
"cargo_clippy",
"cargo_deny",
"cargo_fmt",
"cargo_generate_deb_package",
"cargo_login",
"cargo_publish",
"cargo_registry",
"cargo_sqlx_migrate",
"cargo_sqlx_prepare",
"cargo_sync_config",
"cargo_update",
"CargoAuthProxyTask",
Expand All @@ -50,10 +42,6 @@
"CargoProject",
"CargoPublishTask",
"CargoRegistry",
"CargoSqlxDatabaseCreateTask",
"CargoSqlxDatabaseDropTask",
"CargoSqlxMigrateTask",
"CargoSqlxPrepareTask",
"CargoSyncConfigTask",
"CargoTestTask",
"cargo_check_toolchain_version",
Expand All @@ -78,71 +66,6 @@ def cargo_config(*, project: Project | None = None, nightly: bool = False) -> Ca
return config


def cargo_sqlx_database_create(
*,
name: str = "sqlxDatabaseCreate",
project: Project | None = None,
database_url: str | None = None,
) -> CargoSqlxDatabaseCreateTask:
project = project or Project.current()
task = project.task(name, CargoSqlxDatabaseCreateTask)
task.database_url = database_url
return task


def cargo_sqlx_database_drop(
*,
name: str = "sqlxDatabaseDrop",
project: Project | None = None,
database_url: str | None = None,
) -> CargoSqlxDatabaseDropTask:
project = project or Project.current()
task = project.task(name, CargoSqlxDatabaseDropTask)
task.database_url = database_url
return task


def cargo_sqlx_migrate(
*,
name: str = "sqlxMigrate",
project: Project | None = None,
base_directory: Path | None = None,
database_url: str | None = None,
migrations: Path | None = None,
) -> CargoSqlxMigrateTask:
project = project or Project.current()
task = project.task(name, CargoSqlxMigrateTask)
task.base_directory = base_directory
task.database_url = database_url
task.migrations = migrations
return task


def cargo_sqlx_prepare(
*,
name: str = "sqlxPrepare",
project: Project | None = None,
check: bool,
base_directory: Path | None = None,
database_url: str | None = None,
migrations: Path | None = None,
) -> CargoSqlxPrepareTask:
project = project or Project.current()
name = f"{name}Check" if check else name
task = project.task(name, CargoSqlxPrepareTask, group="check" if check else None)
task.check = check
task.base_directory = base_directory
task.database_url = database_url
task.migrations = migrations

# Preparing or checking sqlx metadata calls `cargo metadata`, which can require the auth proxy
# Without the auth proxy, cargo sqlx commands would fail with a cryptic error
# See https://github.com/launchbadge/sqlx/pull/2222 for details
task.depends_on(f":{CARGO_BUILD_SUPPORT_GROUP_NAME}?")

return task


def cargo_registry(
alias: str,
index: str,
Expand Down Expand Up @@ -483,10 +406,3 @@ def rustup_target_add(target: str, *, group: str | None = None, project: Project
task = project.task(f"rustupTargetAdd/{target}", RustupTargetAddTask, group=group)
task.target = target
return task


def cargo_generate_deb_package(*, project: Project | None = None, package_name: str) -> CargoGenerateDebPackage:
project = project or Project.current()
task = project.task("cargoGenerateDeb", CargoGenerateDebPackage)
task.package_name = package_name
return task
26 changes: 0 additions & 26 deletions kraken-build/src/kraken/std/cargo/tasks/_cargo_sqlx.py

This file was deleted.

38 changes: 0 additions & 38 deletions kraken-build/src/kraken/std/cargo/tasks/cargo_generate_deb.py

This file was deleted.

This file was deleted.

This file was deleted.

21 changes: 0 additions & 21 deletions kraken-build/src/kraken/std/cargo/tasks/cargo_sqlx_migrate.py

This file was deleted.

27 changes: 0 additions & 27 deletions kraken-build/src/kraken/std/cargo/tasks/cargo_sqlx_prepare.py

This file was deleted.

Loading