diff --git a/pyproject.toml b/pyproject.toml index ef24930..4291ad2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,7 @@ dependencies = [ "google-cloud-storage", "yfinance", "quant-platform-kit @ git+https://github.com/QuantStrategyLab/QuantPlatformKit.git@0063af3b4a974650ea58a7d3f26dd1b94f65d3e8", - "us-equity-strategies @ git+https://github.com/QuantStrategyLab/UsEquityStrategies.git@67e1ed69d7b9c318f94c8809121d2b9481d6b11a", + "us-equity-strategies @ git+https://github.com/QuantStrategyLab/UsEquityStrategies.git@1643f37d723c4d0fdc475ce1030b3d911c07aacb", "hk-equity-strategies @ git+https://github.com/QuantStrategyLab/HkEquityStrategies.git@61993bf261aeccf64b5a75428b9405f4e1d1d682", ] diff --git a/tests/test_runtime_config_support.py b/tests/test_runtime_config_support.py index 80cc8f0..a42551f 100644 --- a/tests/test_runtime_config_support.py +++ b/tests/test_runtime_config_support.py @@ -73,7 +73,6 @@ "soxl_soxx_trend_income", "tqqq_growth_income", "us_equity_combo", - "us_equity_combo_core", "us_equity_combo_leveraged", "hk_global_etf_tactical_rotation", "hk_low_vol_dividend_quality_snapshot", @@ -749,16 +748,13 @@ def test_load_platform_runtime_settings_accepts_nasdaq_sp500_smart_dca(monkeypat assert settings.strategy_profile == "nasdaq_sp500_smart_dca" -def test_load_platform_runtime_settings_accepts_us_equity_combo_core(monkeypatch): +def test_load_platform_runtime_settings_rejects_us_equity_combo_core_shadow(monkeypatch): monkeypatch.setenv("RUNTIME_TARGET_JSON", runtime_target_json("us_equity_combo_core")) monkeypatch.setenv("ACCOUNT_GROUP", "paper") monkeypatch.setenv("IB_ACCOUNT_GROUP_CONFIG_JSON", MINIMAL_GROUP_JSON) - settings = load_platform_runtime_settings(project_id_resolver=lambda: "project-1") - - assert settings.strategy_profile == "us_equity_combo_core" - assert settings.strategy_display_name == "US Core Combo Shadow" - assert settings.strategy_target_mode == "weight" + with pytest.raises(ValueError, match="Unsupported STRATEGY_PROFILE"): + load_platform_runtime_settings(project_id_resolver=lambda: "project-1") def test_load_platform_runtime_settings_rejects_legacy_qqq_tech_alias(monkeypatch): @@ -801,9 +797,7 @@ def test_platform_profile_status_matrix_matches_current_ibkr_rollout(): assert by_profile["tqqq_growth_income"]["enabled"] is True assert "nasdaq_sp500_smart_dca" in by_profile assert "ibit_smart_dca" in by_profile - assert by_profile["us_equity_combo_core"]["display_name"] == "US Core Combo Shadow" - assert by_profile["us_equity_combo_core"]["eligible"] is True - assert by_profile["us_equity_combo_core"]["enabled"] is True + assert "us_equity_combo_core" not in by_profile assert by_profile["hk_global_etf_tactical_rotation"] == { "canonical_profile": "hk_global_etf_tactical_rotation", "display_name": "HK Global ETF Tactical Rotation", @@ -850,9 +844,9 @@ def test_print_strategy_profile_status_json_matches_registry(): assert by_profile["global_etf_rotation"]["requires_strategy_config_path"] is False assert "nasdaq_sp500_smart_dca" in by_profile assert "ibit_smart_dca" in by_profile - assert by_profile["us_equity_combo_core"]["profile_group"] == "direct_runtime_inputs" - assert by_profile["us_equity_combo_core"]["input_mode"] == "current_holdings+russell_snapshot" - assert by_profile["us_equity_combo_core"]["requires_strategy_config_path"] is False + assert by_profile["us_equity_combo"]["profile_group"] == "direct_runtime_inputs" + assert by_profile["us_equity_combo"]["input_mode"] == "current_holdings+russell_snapshot" + assert by_profile["us_equity_combo"]["requires_strategy_config_path"] is False assert by_profile["us_equity_combo_leveraged"]["profile_group"] == "direct_runtime_inputs" assert by_profile["us_equity_combo_leveraged"]["input_mode"] == "market_data" assert by_profile["us_equity_combo_leveraged"]["requires_strategy_config_path"] is False diff --git a/uv.lock b/uv.lock index 9c1b094..7f583b9 100644 --- a/uv.lock +++ b/uv.lock @@ -791,7 +791,7 @@ requires-dist = [ { name = "quant-platform-kit", git = "https://github.com/QuantStrategyLab/QuantPlatformKit.git?rev=0063af3b4a974650ea58a7d3f26dd1b94f65d3e8" }, { name = "requests" }, { name = "ruff", marker = "extra == 'test'" }, - { name = "us-equity-strategies", git = "https://github.com/QuantStrategyLab/UsEquityStrategies.git?rev=67e1ed69d7b9c318f94c8809121d2b9481d6b11a" }, + { name = "us-equity-strategies", git = "https://github.com/QuantStrategyLab/UsEquityStrategies.git?rev=1643f37d723c4d0fdc475ce1030b3d911c07aacb" }, { name = "yfinance" }, ] provides-extras = ["test"] @@ -1490,7 +1490,7 @@ wheels = [ [[package]] name = "us-equity-strategies" version = "0.7.60" -source = { git = "https://github.com/QuantStrategyLab/UsEquityStrategies.git?rev=67e1ed69d7b9c318f94c8809121d2b9481d6b11a#67e1ed69d7b9c318f94c8809121d2b9481d6b11a" } +source = { git = "https://github.com/QuantStrategyLab/UsEquityStrategies.git?rev=1643f37d723c4d0fdc475ce1030b3d911c07aacb#1643f37d723c4d0fdc475ce1030b3d911c07aacb" } dependencies = [ { name = "pandas" }, { name = "pytz" },