moveq-cli 0.1.2__tar.gz → 0.2.0__tar.gz

{moveq_cli-0.1.2/src/moveq_cli.egg-info → moveq_cli-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moveq-cli
-Version: 0.1.2
+Version: 0.2.0
 Summary: Command-line tool for moveq: Gini, Palma, Concentration Index, composite scores, and catalogue validation from CSV or JSON.
 Author-email: Soura <martisoura@gmail.com>
 License-Expression: BSD-3-Clause
@@ -54,7 +54,7 @@ only the argparse front-end.
 
 **`moveq gini`** and **`moveq palma`** read a CSV and treat one column as
 the service value (trips, departures, coverage) and another as the
-population weight. They print a single number:
+population weight. By default they print a single number:
 
 - Gini — overall inequality of that service across people (`0` = equal)
 - Palma — mean service of the best-served 10% of population over the
@@ -62,10 +62,11 @@ population weight. They print a single number:
   equal, including all-zero service; `inf` if the bottom 40% have no
   service and the top 10% do not)
 
-**`moveq ci`** is the Wagstaff Concentration Index. It needs a third
-column: socioeconomic rank (`1` = most deprived in this library).
-Positive values mean service is concentrated in less-deprived areas;
-negative values mean the opposite.
+**`moveq ci`** is the Wagstaff Concentration Index. It needs a rank
+column and **`--rank-direction`** (`higher-is-advantaged` or
+`higher-is-disadvantaged`). Positive values are advantage-concentrated;
+negative values are disadvantage-concentrated. A zero or cancelled mean
+exits with code `3`.
 
 **`moveq score`** builds a 0–100 weighted composite. Terms live in
 `[0, 1]`; JSON `null` means “this term was not collected.” Missing terms
@@ -77,6 +78,10 @@ in a JSON file (`--json`).
 the same / replace / omit rules: every base section must have an
 explicit decision, replacements need a title, omissions need a note.
 
+`moveq gini`, `moveq palma`, and `moveq ci` accept `--json` to print the
+full `EquityResult` (`metric`, `value`, `method`, `n_areas`, warnings).
+The default line is unchanged.
+
 Column names are whatever your CSV actually uses; you point at them with
 `--value`, `--weight`, and `--rank`.
 
@@ -95,7 +100,7 @@ Inequality from a CSV (headers `trips`, `population`, `deprivation_rank`):
 ```bash
 moveq gini data.csv --value trips --weight population
 moveq palma data.csv --value trips --weight population
-moveq ci data.csv --value trips --rank deprivation_rank --weight population
+moveq ci data.csv --value trips --rank deprivation_rank --weight population --rank-direction higher-is-advantaged
 ```
 
 Composite score, inline or from a file:

{moveq_cli-0.1.2 → moveq_cli-0.2.0}/README.md

@@ -19,7 +19,7 @@ only the argparse front-end.
 
 **`moveq gini`** and **`moveq palma`** read a CSV and treat one column as
 the service value (trips, departures, coverage) and another as the
-population weight. They print a single number:
+population weight. By default they print a single number:
 
 - Gini — overall inequality of that service across people (`0` = equal)
 - Palma — mean service of the best-served 10% of population over the
@@ -27,10 +27,11 @@ population weight. They print a single number:
   equal, including all-zero service; `inf` if the bottom 40% have no
   service and the top 10% do not)
 
-**`moveq ci`** is the Wagstaff Concentration Index. It needs a third
-column: socioeconomic rank (`1` = most deprived in this library).
-Positive values mean service is concentrated in less-deprived areas;
-negative values mean the opposite.
+**`moveq ci`** is the Wagstaff Concentration Index. It needs a rank
+column and **`--rank-direction`** (`higher-is-advantaged` or
+`higher-is-disadvantaged`). Positive values are advantage-concentrated;
+negative values are disadvantage-concentrated. A zero or cancelled mean
+exits with code `3`.
 
 **`moveq score`** builds a 0–100 weighted composite. Terms live in
 `[0, 1]`; JSON `null` means “this term was not collected.” Missing terms
@@ -42,6 +43,10 @@ in a JSON file (`--json`).
 the same / replace / omit rules: every base section must have an
 explicit decision, replacements need a title, omissions need a note.
 
+`moveq gini`, `moveq palma`, and `moveq ci` accept `--json` to print the
+full `EquityResult` (`metric`, `value`, `method`, `n_areas`, warnings).
+The default line is unchanged.
+
 Column names are whatever your CSV actually uses; you point at them with
 `--value`, `--weight`, and `--rank`.
 
@@ -60,7 +65,7 @@ Inequality from a CSV (headers `trips`, `population`, `deprivation_rank`):
 ```bash
 moveq gini data.csv --value trips --weight population
 moveq palma data.csv --value trips --weight population
-moveq ci data.csv --value trips --rank deprivation_rank --weight population
+moveq ci data.csv --value trips --rank deprivation_rank --weight population --rank-direction higher-is-advantaged
 ```
 
 Composite score, inline or from a file:

{moveq_cli-0.1.2 → moveq_cli-0.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "moveq-cli"
-version = "0.1.2"
+version = "0.2.0"
 description = "Command-line tool for moveq: Gini, Palma, Concentration Index, composite scores, and catalogue validation from CSV or JSON."
 readme = "README.md"
 license = "BSD-3-Clause"

{moveq_cli-0.1.2 → moveq_cli-0.2.0}/src/moveq_cli/__init__.py

@@ -1,3 +1,3 @@
 """moveq-cli — command-line tool for moveq."""
 
-__version__ = "0.1.2"
+__version__ = "0.2.0"

{moveq_cli-0.1.2 → moveq_cli-0.2.0}/src/moveq_cli/main.py

@@ -2,7 +2,7 @@
 
     moveq gini data.csv --value trips --weight population
     moveq palma data.csv --value trips --weight population
-    moveq ci data.csv --value trips --rank deprivation_rank --weight population
+    moveq ci data.csv --value trips --rank deprivation_rank --weight population --rank-direction higher-is-advantaged
     moveq score --terms '{"coverage": 0.8, "evening": 0.5}' --weights '{"coverage": 0.6, "evening": 0.4}'
     moveq score config.json
     moveq catalogue validate config.json
@@ -21,10 +21,11 @@ import numpy as np
 
 from moveq_catalogue import Catalogue, SectionAction
 from moveq_core import (
-    compute_concentration_index,
-    compute_gini,
-    compute_palma_ratio,
+    EquityResult,
     compute_score,
+    concentration_index_result,
+    gini_result,
+    palma_result,
 )
 
 
@@ -40,25 +41,49 @@ def _read_columns(path: str, columns: list[str]) -> dict[str, np.ndarray]:
     return {c: np.array([float(r[c]) for r in rows]) for c in columns}
 
 
+_RANK_DIRECTION_CLI = {
+    "higher-is-advantaged": "higher_is_advantaged",
+    "higher-is-disadvantaged": "higher_is_disadvantaged",
+}
+
+
+def _print_equity(result: EquityResult, label: str, as_json: bool) -> int:
+    if as_json:
+        print(json.dumps(result.to_dict(), indent=2))
+    elif result.status == "undefined" or result.value is None:
+        print(f"{label}: undefined", file=sys.stderr)
+        if result.reason:
+            print(f"reason: {result.reason}", file=sys.stderr)
+    else:
+        print(f"{label}: {result.value:.4f}")
+    if result.status == "undefined":
+        return 3
+    return 0
+
+
 def _cmd_gini(args: argparse.Namespace) -> int:
     cols = _read_columns(args.csv, [args.value, args.weight])
-    result = compute_gini(cols[args.value], cols[args.weight])
-    print(f"gini: {result:.4f}")
-    return 0
+    return _print_equity(gini_result(cols[args.value], cols[args.weight]), "gini", args.json)
 
 
 def _cmd_palma(args: argparse.Namespace) -> int:
     cols = _read_columns(args.csv, [args.value, args.weight])
-    result = compute_palma_ratio(cols[args.value], cols[args.weight])
-    print(f"palma: {result:.4f}")
-    return 0
+    return _print_equity(palma_result(cols[args.value], cols[args.weight]), "palma", args.json)
 
 
 def _cmd_ci(args: argparse.Namespace) -> int:
     cols = _read_columns(args.csv, [args.value, args.rank, args.weight])
-    result = compute_concentration_index(cols[args.value], cols[args.rank], cols[args.weight])
-    print(f"concentration_index: {result:.4f}")
-    return 0
+    rank_direction = _RANK_DIRECTION_CLI[args.rank_direction]
+    return _print_equity(
+        concentration_index_result(
+            cols[args.value],
+            cols[args.rank],
+            cols[args.weight],
+            rank_direction=rank_direction,
+        ),
+        "concentration_index",
+        args.json,
+    )
 
 
 def _cmd_score(args: argparse.Namespace) -> int:
@@ -178,6 +203,7 @@ def build_parser() -> argparse.ArgumentParser:
     gini.add_argument("csv", help="Path to input CSV file")
     gini.add_argument("--value", required=True, help="Service-level column")
     gini.add_argument("--weight", required=True, help="Population-weight column")
+    gini.add_argument("--json", action="store_true", help="Output machine-readable JSON")
     gini.set_defaults(func=_cmd_gini)
 
     # Palma
@@ -185,6 +211,7 @@ def build_parser() -> argparse.ArgumentParser:
     palma.add_argument("csv", help="Path to input CSV file")
     palma.add_argument("--value", required=True, help="Service-level column")
     palma.add_argument("--weight", required=True, help="Population-weight column")
+    palma.add_argument("--json", action="store_true", help="Output machine-readable JSON")
     palma.set_defaults(func=_cmd_palma)
 
     # Concentration Index
@@ -193,6 +220,13 @@ def build_parser() -> argparse.ArgumentParser:
     ci.add_argument("--value", required=True, help="Service-level column")
     ci.add_argument("--rank", required=True, help="Ranking column (e.g. deprivation rank)")
     ci.add_argument("--weight", required=True, help="Population-weight column")
+    ci.add_argument(
+        "--rank-direction",
+        required=True,
+        choices=sorted(_RANK_DIRECTION_CLI),
+        help="Which end of --rank is advantaged (required)",
+    )
+    ci.add_argument("--json", action="store_true", help="Output machine-readable JSON")
     ci.set_defaults(func=_cmd_ci)
 
     # Score

{moveq_cli-0.1.2 → moveq_cli-0.2.0/src/moveq_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moveq-cli
-Version: 0.1.2
+Version: 0.2.0
 Summary: Command-line tool for moveq: Gini, Palma, Concentration Index, composite scores, and catalogue validation from CSV or JSON.
 Author-email: Soura <martisoura@gmail.com>
 License-Expression: BSD-3-Clause
@@ -54,7 +54,7 @@ only the argparse front-end.
 
 **`moveq gini`** and **`moveq palma`** read a CSV and treat one column as
 the service value (trips, departures, coverage) and another as the
-population weight. They print a single number:
+population weight. By default they print a single number:
 
 - Gini — overall inequality of that service across people (`0` = equal)
 - Palma — mean service of the best-served 10% of population over the
@@ -62,10 +62,11 @@ population weight. They print a single number:
   equal, including all-zero service; `inf` if the bottom 40% have no
   service and the top 10% do not)
 
-**`moveq ci`** is the Wagstaff Concentration Index. It needs a third
-column: socioeconomic rank (`1` = most deprived in this library).
-Positive values mean service is concentrated in less-deprived areas;
-negative values mean the opposite.
+**`moveq ci`** is the Wagstaff Concentration Index. It needs a rank
+column and **`--rank-direction`** (`higher-is-advantaged` or
+`higher-is-disadvantaged`). Positive values are advantage-concentrated;
+negative values are disadvantage-concentrated. A zero or cancelled mean
+exits with code `3`.
 
 **`moveq score`** builds a 0–100 weighted composite. Terms live in
 `[0, 1]`; JSON `null` means “this term was not collected.” Missing terms
@@ -77,6 +78,10 @@ in a JSON file (`--json`).
 the same / replace / omit rules: every base section must have an
 explicit decision, replacements need a title, omissions need a note.
 
+`moveq gini`, `moveq palma`, and `moveq ci` accept `--json` to print the
+full `EquityResult` (`metric`, `value`, `method`, `n_areas`, warnings).
+The default line is unchanged.
+
 Column names are whatever your CSV actually uses; you point at them with
 `--value`, `--weight`, and `--rank`.
 
@@ -95,7 +100,7 @@ Inequality from a CSV (headers `trips`, `population`, `deprivation_rank`):
 ```bash
 moveq gini data.csv --value trips --weight population
 moveq palma data.csv --value trips --weight population
-moveq ci data.csv --value trips --rank deprivation_rank --weight population
+moveq ci data.csv --value trips --rank deprivation_rank --weight population --rank-direction higher-is-advantaged
 ```
 
 Composite score, inline or from a file:

moveq_cli-0.2.0/tests/test_main.py

@@ -0,0 +1,405 @@
+import csv
+import io
+import json
+from contextlib import redirect_stderr, redirect_stdout
+
+import pytest
+
+from moveq_cli.main import main
+
+
+def _write_csv(path, rows, fieldnames):
+    with open(path, "w", newline="", encoding="utf-8") as fh:
+        writer = csv.DictWriter(fh, fieldnames=fieldnames)
+        writer.writeheader()
+        writer.writerows(rows)
+
+
+def test_gini_command(tmp_path):
+    csv_path = tmp_path / "data.csv"
+    _write_csv(
+        csv_path,
+        [{"trips": "10", "population": "100"}, {"trips": "10", "population": "100"}],
+        ["trips", "population"],
+    )
+    buf = io.StringIO()
+    with redirect_stdout(buf):
+        code = main(["gini", str(csv_path), "--value", "trips", "--weight", "population"])
+    assert code == 0
+    assert buf.getvalue() == "gini: 0.0000\n"
+
+
+def test_gini_json_contains_metric_and_value(tmp_path):
+    csv_path = tmp_path / "data.csv"
+    _write_csv(
+        csv_path,
+        [{"trips": "10", "population": "100"}, {"trips": "10", "population": "100"}],
+        ["trips", "population"],
+    )
+    buf = io.StringIO()
+    with redirect_stdout(buf):
+        code = main(
+            ["gini", str(csv_path), "--value", "trips", "--weight", "population", "--json"]
+        )
+    assert code == 0
+    data = json.loads(buf.getvalue())
+    assert data["metric"] == "gini"
+    assert data["value"] == pytest.approx(0.0)
+
+
+def test_palma_command(tmp_path):
+    csv_path = tmp_path / "data.csv"
+    _write_csv(
+        csv_path,
+        [{"trips": str(i * 10), "population": "100"} for i in range(1, 11)],
+        ["trips", "population"],
+    )
+    buf = io.StringIO()
+    with redirect_stdout(buf):
+        code = main(["palma", str(csv_path), "--value", "trips", "--weight", "population"])
+    assert code == 0
+    assert "palma:" in buf.getvalue()
+
+
+def test_ci_command(tmp_path):
+    csv_path = tmp_path / "data.csv"
+    _write_csv(
+        csv_path,
+        [
+            {"trips": "10", "dep_rank": "1", "population": "100"},
+            {"trips": "20", "dep_rank": "2", "population": "100"},
+        ],
+        ["trips", "dep_rank", "population"],
+    )
+    buf = io.StringIO()
+    with redirect_stdout(buf):
+        code = main(
+            [
+                "ci",
+                str(csv_path),
+                "--value",
+                "trips",
+                "--rank",
+                "dep_rank",
+                "--weight",
+                "population",
+                "--rank-direction",
+                "higher-is-advantaged",
+            ]
+        )
+    assert code == 0
+    out = buf.getvalue()
+    assert "concentration_index:" in out
+    assert "{" not in out
+
+
+def test_palma_json_contains_metric_and_value(tmp_path):
+    csv_path = tmp_path / "data.csv"
+    _write_csv(
+        csv_path,
+        [{"trips": str(i * 10), "population": "100"} for i in range(1, 11)],
+        ["trips", "population"],
+    )
+    buf = io.StringIO()
+    with redirect_stdout(buf):
+        code = main(
+            ["palma", str(csv_path), "--value", "trips", "--weight", "population", "--json"]
+        )
+    assert code == 0
+    data = json.loads(buf.getvalue())
+    assert data["metric"] == "palma"
+    assert isinstance(data["value"], float)
+
+
+def test_ci_json_contains_metric_and_value(tmp_path):
+    csv_path = tmp_path / "data.csv"
+    _write_csv(
+        csv_path,
+        [
+            {"trips": "10", "dep_rank": "1", "population": "100"},
+            {"trips": "20", "dep_rank": "2", "population": "100"},
+        ],
+        ["trips", "dep_rank", "population"],
+    )
+    buf = io.StringIO()
+    with redirect_stdout(buf):
+        code = main(
+            [
+                "ci",
+                str(csv_path),
+                "--value",
+                "trips",
+                "--rank",
+                "dep_rank",
+                "--weight",
+                "population",
+                "--rank-direction",
+                "higher-is-advantaged",
+                "--json",
+            ]
+        )
+    assert code == 0
+    data = json.loads(buf.getvalue())
+    assert data["metric"] == "ci"
+    assert isinstance(data["value"], float)
+
+
+def test_missing_column_returns_error(tmp_path):
+    csv_path = tmp_path / "data.csv"
+    _write_csv(csv_path, [{"trips": "10"}], ["trips"])
+    code = main(["gini", str(csv_path), "--value", "trips", "--weight", "population"])
+    assert code == 1
+
+
+def test_score_inline_args():
+    buf = io.StringIO()
+    with redirect_stdout(buf):
+        code = main([
+            "score",
+            "--terms",
+            '{"coverage": 0.8, "evening": 0.5, "frequency": null}',
+            "--weights",
+            '{"coverage": 0.5, "evening": 0.3, "frequency": 0.2}',
+        ])
+    assert code == 0
+    out = buf.getvalue()
+    assert "score: 68.8" in out
+    assert "renormalised" in out
+
+
+def test_score_json_config(tmp_path):
+    config_path = tmp_path / "score_config.json"
+    config_path.write_text(
+        json.dumps({
+            "terms": {"coverage": 0.8, "evening": 0.5},
+            "weights": {"coverage": 0.6, "evening": 0.4},
+        }),
+        encoding="utf-8",
+    )
+    buf = io.StringIO()
+    with redirect_stdout(buf):
+        code = main(["score", str(config_path), "--json"])
+    assert code == 0
+    data = json.loads(buf.getvalue())
+    assert data["score"] == 68.0
+
+
+def test_score_missing_arguments():
+    code = main(["score"])
+    assert code == 1
+
+
+def test_catalogue_validate_valid(tmp_path):
+    cat_path = tmp_path / "catalogue.json"
+    cat_path.write_text(
+        json.dumps({
+            "country": "france",
+            "base_sections": ["s1", "s2", "s3"],
+            "mappings": [
+                {"section_id": "s1", "action": "same"},
+                {"section_id": "s2", "action": "replace", "replacement_title": "Local S2"},
+                {"section_id": "s3", "action": "omit", "note": "No census data available"},
+            ],
+        }),
+        encoding="utf-8",
+    )
+    buf = io.StringIO()
+    with redirect_stdout(buf):
+        code = main(["catalogue", "validate", str(cat_path)])
+    assert code == 0
+    assert "status: valid (fully specified)" in buf.getvalue()
+
+
+def test_catalogue_validate_invalid_unmapped(tmp_path):
+    cat_path = tmp_path / "catalogue_unmapped.json"
+    cat_path.write_text(
+        json.dumps({
+            "country": "france",
+            "base_sections": ["s1", "s2"],
+            "mappings": [
+                {"section_id": "s1", "action": "same"},
+            ],
+        }),
+        encoding="utf-8",
+    )
+    buf = io.StringIO()
+    with redirect_stdout(buf):
+        code = main(["catalogue", "validate", str(cat_path), "--json"])
+    assert code == 1
+    data = json.loads(buf.getvalue())
+    assert data["valid"] is False
+    assert len(data["issues"]) == 1
+
+
+def test_ci_missing_rank_direction_exits_nonzero(tmp_path):
+    csv_path = tmp_path / "data.csv"
+    _write_csv(
+        csv_path,
+        [
+            {"trips": "10", "dep_rank": "1", "population": "100"},
+            {"trips": "20", "dep_rank": "2", "population": "100"},
+        ],
+        ["trips", "dep_rank", "population"],
+    )
+    with pytest.raises(SystemExit) as excinfo:
+        main(
+            [
+                "ci",
+                str(csv_path),
+                "--value",
+                "trips",
+                "--rank",
+                "dep_rank",
+                "--weight",
+                "population",
+            ]
+        )
+    assert excinfo.value.code != 0
+
+
+def test_ci_invalid_rank_direction_exits_2(tmp_path):
+    csv_path = tmp_path / "data.csv"
+    _write_csv(
+        csv_path,
+        [
+            {"trips": "10", "dep_rank": "1", "population": "100"},
+            {"trips": "20", "dep_rank": "2", "population": "100"},
+        ],
+        ["trips", "dep_rank", "population"],
+    )
+    with pytest.raises(SystemExit) as excinfo:
+        main(
+            [
+                "ci",
+                str(csv_path),
+                "--value",
+                "trips",
+                "--rank",
+                "dep_rank",
+                "--weight",
+                "population",
+                "--rank-direction",
+                "sideways",
+            ]
+        )
+    assert excinfo.value.code == 2
+
+
+def test_ci_reversed_rank_with_flipped_direction_matches(tmp_path):
+    csv_a = tmp_path / "a.csv"
+    csv_b = tmp_path / "b.csv"
+    _write_csv(
+        csv_a,
+        [
+            {"trips": "10", "dep_rank": "1", "population": "100"},
+            {"trips": "20", "dep_rank": "2", "population": "100"},
+            {"trips": "30", "dep_rank": "3", "population": "100"},
+            {"trips": "40", "dep_rank": "4", "population": "100"},
+        ],
+        ["trips", "dep_rank", "population"],
+    )
+    _write_csv(
+        csv_b,
+        [
+            {"trips": "10", "dep_rank": "4", "population": "100"},
+            {"trips": "20", "dep_rank": "3", "population": "100"},
+            {"trips": "30", "dep_rank": "2", "population": "100"},
+            {"trips": "40", "dep_rank": "1", "population": "100"},
+        ],
+        ["trips", "dep_rank", "population"],
+    )
+    buf_a = io.StringIO()
+    buf_b = io.StringIO()
+    with redirect_stdout(buf_a):
+        code_a = main(
+            [
+                "ci",
+                str(csv_a),
+                "--value",
+                "trips",
+                "--rank",
+                "dep_rank",
+                "--weight",
+                "population",
+                "--rank-direction",
+                "higher-is-advantaged",
+            ]
+        )
+    with redirect_stdout(buf_b):
+        code_b = main(
+            [
+                "ci",
+                str(csv_b),
+                "--value",
+                "trips",
+                "--rank",
+                "dep_rank",
+                "--weight",
+                "population",
+                "--rank-direction",
+                "higher-is-disadvantaged",
+            ]
+        )
+    assert code_a == 0
+    assert code_b == 0
+    assert buf_a.getvalue() == buf_b.getvalue()
+
+
+def test_ci_undefined_exits_3(tmp_path):
+    csv_path = tmp_path / "data.csv"
+    _write_csv(
+        csv_path,
+        [
+            {"trips": "0", "dep_rank": "1", "population": "100"},
+            {"trips": "0", "dep_rank": "2", "population": "100"},
+        ],
+        ["trips", "dep_rank", "population"],
+    )
+    err = io.StringIO()
+    with redirect_stderr(err):
+        code = main(
+            [
+                "ci",
+                str(csv_path),
+                "--value",
+                "trips",
+                "--rank",
+                "dep_rank",
+                "--weight",
+                "population",
+                "--rank-direction",
+                "higher-is-advantaged",
+            ]
+        )
+    assert code == 3
+    assert "undefined" in err.getvalue()
+
+    buf = io.StringIO()
+    with redirect_stdout(buf):
+        json_code = main(
+            [
+                "ci",
+                str(csv_path),
+                "--value",
+                "trips",
+                "--rank",
+                "dep_rank",
+                "--weight",
+                "population",
+                "--rank-direction",
+                "higher-is-advantaged",
+                "--json",
+            ]
+        )
+    assert json_code == 3
+    data = json.loads(buf.getvalue())
+    assert data["value"] is None
+    assert data["status"] == "undefined"
+
+
+def test_help_command():
+    try:
+        main(["--help"])
+    except SystemExit as exc:
+        assert exc.code == 0
+

moveq_cli-0.1.2/tests/test_main.py

@@ -1,153 +0,0 @@
-import csv
-import io
-import json
-from contextlib import redirect_stdout
-
-from moveq_cli.main import main
-
-
-def _write_csv(path, rows, fieldnames):
-    with open(path, "w", newline="", encoding="utf-8") as fh:
-        writer = csv.DictWriter(fh, fieldnames=fieldnames)
-        writer.writeheader()
-        writer.writerows(rows)
-
-
-def test_gini_command(tmp_path):
-    csv_path = tmp_path / "data.csv"
-    _write_csv(
-        csv_path,
-        [{"trips": "10", "population": "100"}, {"trips": "10", "population": "100"}],
-        ["trips", "population"],
-    )
-    buf = io.StringIO()
-    with redirect_stdout(buf):
-        code = main(["gini", str(csv_path), "--value", "trips", "--weight", "population"])
-    assert code == 0
-    assert "gini: 0.0000" in buf.getvalue()
-
-
-def test_palma_command(tmp_path):
-    csv_path = tmp_path / "data.csv"
-    _write_csv(
-        csv_path,
-        [{"trips": str(i * 10), "population": "100"} for i in range(1, 11)],
-        ["trips", "population"],
-    )
-    buf = io.StringIO()
-    with redirect_stdout(buf):
-        code = main(["palma", str(csv_path), "--value", "trips", "--weight", "population"])
-    assert code == 0
-    assert "palma:" in buf.getvalue()
-
-
-def test_ci_command(tmp_path):
-    csv_path = tmp_path / "data.csv"
-    _write_csv(
-        csv_path,
-        [
-            {"trips": "10", "dep_rank": "1", "population": "100"},
-            {"trips": "20", "dep_rank": "2", "population": "100"},
-        ],
-        ["trips", "dep_rank", "population"],
-    )
-    buf = io.StringIO()
-    with redirect_stdout(buf):
-        code = main(["ci", str(csv_path), "--value", "trips", "--rank", "dep_rank", "--weight", "population"])
-    assert code == 0
-    assert "concentration_index:" in buf.getvalue()
-
-
-def test_missing_column_returns_error(tmp_path):
-    csv_path = tmp_path / "data.csv"
-    _write_csv(csv_path, [{"trips": "10"}], ["trips"])
-    code = main(["gini", str(csv_path), "--value", "trips", "--weight", "population"])
-    assert code == 1
-
-
-def test_score_inline_args():
-    buf = io.StringIO()
-    with redirect_stdout(buf):
-        code = main([
-            "score",
-            "--terms",
-            '{"coverage": 0.8, "evening": 0.5, "frequency": null}',
-            "--weights",
-            '{"coverage": 0.5, "evening": 0.3, "frequency": 0.2}',
-        ])
-    assert code == 0
-    out = buf.getvalue()
-    assert "score: 68.8" in out
-    assert "renormalised" in out
-
-
-def test_score_json_config(tmp_path):
-    config_path = tmp_path / "score_config.json"
-    config_path.write_text(
-        json.dumps({
-            "terms": {"coverage": 0.8, "evening": 0.5},
-            "weights": {"coverage": 0.6, "evening": 0.4},
-        }),
-        encoding="utf-8",
-    )
-    buf = io.StringIO()
-    with redirect_stdout(buf):
-        code = main(["score", str(config_path), "--json"])
-    assert code == 0
-    data = json.loads(buf.getvalue())
-    assert data["score"] == 68.0
-
-
-def test_score_missing_arguments():
-    code = main(["score"])
-    assert code == 1
-
-
-def test_catalogue_validate_valid(tmp_path):
-    cat_path = tmp_path / "catalogue.json"
-    cat_path.write_text(
-        json.dumps({
-            "country": "france",
-            "base_sections": ["s1", "s2", "s3"],
-            "mappings": [
-                {"section_id": "s1", "action": "same"},
-                {"section_id": "s2", "action": "replace", "replacement_title": "Local S2"},
-                {"section_id": "s3", "action": "omit", "note": "No census data available"},
-            ],
-        }),
-        encoding="utf-8",
-    )
-    buf = io.StringIO()
-    with redirect_stdout(buf):
-        code = main(["catalogue", "validate", str(cat_path)])
-    assert code == 0
-    assert "status: valid (fully specified)" in buf.getvalue()
-
-
-def test_catalogue_validate_invalid_unmapped(tmp_path):
-    cat_path = tmp_path / "catalogue_unmapped.json"
-    cat_path.write_text(
-        json.dumps({
-            "country": "france",
-            "base_sections": ["s1", "s2"],
-            "mappings": [
-                {"section_id": "s1", "action": "same"},
-            ],
-        }),
-        encoding="utf-8",
-    )
-    buf = io.StringIO()
-    with redirect_stdout(buf):
-        code = main(["catalogue", "validate", str(cat_path), "--json"])
-    assert code == 1
-    data = json.loads(buf.getvalue())
-    assert data["valid"] is False
-    assert len(data["issues"]) == 1
-
-
-def test_help_command():
-    try:
-        main(["--help"])
-    except SystemExit as exc:
-        assert exc.code == 0
-