mirror of
https://github.com/hanzoai/datastore.git
synced 2026-09-26 13:55:07 +00:00
Resolve conflicts from the Ruff cleanup against master: - `test_move_ttl_broken_compatibility`, `test_session_settings_table`, `test_replicated_database/test_settings_recover_lost_replica`, and `test_storage_s3_queue/test_migration` were deleted on master; keep the deletions (the branch only applied import cleanups to them). - `test_storage_s3_queue/test_3` (`test_upgrade`, `test_upgrade_2`) and `test_storage_s3_queue/test_5` (`test_upgrade_3`) were removed on master after bumping `CLICKHOUSE_CI_MIN_TESTED_VERSION`; keep the removals and drop the now-unused `import uuid` in `test_3`. - `test_storage_delta`/`test_storage_s3`: keep master's imports that are now used (`CLICKHOUSE_CI_MIN_TESTED_VERSION`), drop the genuinely unused ones (`helpers.client` in delta, `ClickHouseInstance` in s3) to satisfy F401. - `test_const_node_optimization`: master switched to `tag=CLICKHOUSE_CI_MIN_TESTED_VERSION`, so restore that import that the branch had removed when the tag was hardcoded. `ruff check .` passes cleanly after the merge. Co-Authored-By: Claude Opus 4.8 <[email protected]>