diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 269552b..bc3fccd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,17 +22,15 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: conda-incubator/setup-miniconda@v2 + - name: Set up Python + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - miniforge-variant: Miniforge3 - miniforge-version: latest - auto-update-conda: true - name: Install package and testing dependencies - run: | - pip install .[dev,test] + run: pip install nox - name: Test - run: nox -s test + run: | + nox -s test + nox -s test-cli diff --git a/noxfile.py b/noxfile.py index 2aa98e8..eeb3afa 100644 --- a/noxfile.py +++ b/noxfile.py @@ -11,7 +11,7 @@ PYTHON_VERSION = "3.12" -@nox.session(python=PYTHON_VERSION, venv_backend="conda") +@nox.session def test(session: nox.Session) -> None: """Run the tests.""" session.install(".[peg,testing]") @@ -26,6 +26,18 @@ def test(session: nox.Session) -> None: session.run("coverage", "report", "--ignore-errors", "--show-missing") +@nox.session(name="test-cli") +def test_cli(session: nox.Session) -> None: + """Test the cli.""" + session.install(".[peg]") + + session.run("standard-names", "--help") + session.run("standard-names", "--version") + for cmd in ("build", "dump", "scrape", "sql", "validate"): + session.run("standard-names", cmd, "--help") + session.run("standard-names", cmd) + + @nox.session def lint(session: nox.Session) -> None: """Look for lint.""" diff --git a/pyproject.toml b/pyproject.toml index 70cb3ab..3865261 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -66,7 +66,7 @@ docs = [ ] [project.scripts] -"standard-names" = "standard_names.cmd.main:main" +"standard-names" = "standard_names.cli.main:main" [build-system] requires = [ diff --git a/src/standard_names/_version.py b/src/standard_names/_version.py index a93b78a..bb0ee74 100644 --- a/src/standard_names/_version.py +++ b/src/standard_names/_version.py @@ -1 +1 @@ -__version__ = "0.2.8.dev0" +__version__ = "0.2.9.dev0" diff --git a/src/standard_names/cli/main.py b/src/standard_names/cli/main.py index 239fa58..b511bb4 100644 --- a/src/standard_names/cli/main.py +++ b/src/standard_names/cli/main.py @@ -63,7 +63,12 @@ def _add_cmd(name: str, *, help: str) -> argparse.ArgumentParser: "file", type=argparse.FileType("r"), nargs="*", help="Read names from a file" ) dump_parser.add_argument( - "--field", "-f", action="append", help="Fields to print", choices=VALID_FIELDS + "--field", + "-f", + action="append", + default=[], + help="Fields to print", + choices=VALID_FIELDS, ) dump_parser.add_argument( "--sort", action=argparse.BooleanOptionalAction, help="Sort/don't sort names" @@ -120,7 +125,7 @@ def build(args: argparse.Namespace) -> int: def dump(args: argparse.Namespace) -> int: - fields = [VALID_FIELDS[field] for field in args.field] or None + fields = [VALID_FIELDS[field] for field in args.field] registry = NamesRegistry([]) for file in args.file: