From 5d4efc36aafc5957382f23c6e97b2ae2af8a64bc Mon Sep 17 00:00:00 2001 From: Andre Anjos <andre.dos.anjos@gmail.com> Date: Wed, 1 Mar 2023 17:09:25 -0300 Subject: [PATCH] Use clapper (instead of clapp) --- conda/meta.yaml | 4 ++-- doc/catalog.json | 6 +++--- doc/conf.py | 2 +- doc/usage/index.rst | 4 ++-- environment.yaml | 2 +- pyproject.toml | 2 +- src/ptbench/scripts/aggregpred.py | 4 ++-- src/ptbench/scripts/cli.py | 2 +- src/ptbench/scripts/compare.py | 4 ++-- src/ptbench/scripts/config.py | 4 ++-- src/ptbench/scripts/dataset.py | 4 ++-- src/ptbench/scripts/evaluate.py | 4 ++-- src/ptbench/scripts/predict.py | 4 ++-- src/ptbench/scripts/predtojson.py | 4 ++-- src/ptbench/scripts/train.py | 4 ++-- src/ptbench/scripts/train_analysis.py | 4 ++-- src/ptbench/utils/rc.py | 2 +- 17 files changed, 30 insertions(+), 30 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 06149d3a..771b4a3f 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -37,7 +37,7 @@ requirements: - tqdm {{ tqdm }} - tensorboard {{ tensorboard }} - pytorch-lightning {{ pytorch_lightning }} - - clapp + - clapper run: - python >=3.9 - {{ pin_compatible('click') }} @@ -54,7 +54,7 @@ requirements: - {{ pin_compatible('tqdm') }} - {{ pin_compatible('tensorboard') }} - {{ pin_compatible('pytorch-lightning') }} - - clapp + - clapper test: source_files: diff --git a/doc/catalog.json b/doc/catalog.json index 0a78c0e3..795fb7d5 100644 --- a/doc/catalog.json +++ b/doc/catalog.json @@ -1,8 +1,8 @@ { - "clapp": { + "clapper": { "versions": { - "stable": "https://clapp.readthedocs.io/en/stable/", - "latest": "https://clapp.readthedocs.io/en/latest/" + "stable": "https://clapper.readthedocs.io/en/stable/", + "latest": "https://clapper.readthedocs.io/en/latest/" }, "sources": {} } diff --git a/doc/conf.py b/doc/conf.py index 0940274a..c46a3dad 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -122,7 +122,7 @@ auto_intersphinx_packages = [ "psutil", "torch", "torchvision", - ("clapp", "latest"), + ("clapper", "latest"), ("python", "3"), ] auto_intersphinx_catalog = "catalog.json" diff --git a/doc/usage/index.rst b/doc/usage/index.rst index df7ca1e9..34316bab 100644 --- a/doc/usage/index.rst +++ b/doc/usage/index.rst @@ -53,8 +53,8 @@ Indirect detection systems. We provide :ref:`command-line interfaces (CLI) <ptbench.cli>` that implement -each of the phases above. This interface is configurable using :ref:`clapp's -extensible configuration framework <clapp.config>`. In essence, each +each of the phases above. This interface is configurable using :ref:`clapper's +extensible configuration framework <clapper.config>`. In essence, each command-line option may be provided as a variable with the same name in a Python file. Each file may combine any number of variables that are pertinent to an application. diff --git a/environment.yaml b/environment.yaml index f5b539c3..9efe1b8c 100644 --- a/environment.yaml +++ b/environment.yaml @@ -6,7 +6,7 @@ dependencies: - click 8.1.3 - click >=8.1.3,<9.0a0 - coverage 7.0.5 -- clapp +- clapper - furo 2022.12.7 - matplotlib 3.6.3 - matplotlib >=3.6.3,<4.0a0 diff --git a/pyproject.toml b/pyproject.toml index 7a000d65..47820ed7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ classifiers = [ "Topic :: Software Development :: Libraries :: Python Modules", ] dependencies = [ - "clapp", + "clapper", "click", "numpy", "pandas", diff --git a/src/ptbench/scripts/aggregpred.py b/src/ptbench/scripts/aggregpred.py index a6d19747..ca174636 100644 --- a/src/ptbench/scripts/aggregpred.py +++ b/src/ptbench/scripts/aggregpred.py @@ -4,8 +4,8 @@ import click -from clapp.click import verbosity_option -from clapp.logging import setup +from clapper.click import verbosity_option +from clapper.logging import setup logger = setup(__name__.split(".")[0], format="%(levelname)s: %(message)s") diff --git a/src/ptbench/scripts/cli.py b/src/ptbench/scripts/cli.py index b5a7a48c..1be33f6e 100644 --- a/src/ptbench/scripts/cli.py +++ b/src/ptbench/scripts/cli.py @@ -4,7 +4,7 @@ import click -from clapp.click import AliasedGroup +from clapper.click import AliasedGroup from . import ( aggregpred, diff --git a/src/ptbench/scripts/compare.py b/src/ptbench/scripts/compare.py index 95223a37..6bc70ccc 100644 --- a/src/ptbench/scripts/compare.py +++ b/src/ptbench/scripts/compare.py @@ -4,8 +4,8 @@ import click -from clapp.click import verbosity_option -from clapp.logging import setup +from clapper.click import verbosity_option +from clapper.logging import setup logger = setup(__name__.split(".")[0], format="%(levelname)s: %(message)s") diff --git a/src/ptbench/scripts/config.py b/src/ptbench/scripts/config.py index 13ef09df..c58d6ff6 100644 --- a/src/ptbench/scripts/config.py +++ b/src/ptbench/scripts/config.py @@ -10,8 +10,8 @@ import typing import click -from clapp.click import AliasedGroup, verbosity_option -from clapp.logging import setup +from clapper.click import AliasedGroup, verbosity_option +from clapper.logging import setup logger = setup(__name__.split(".")[0], format="%(levelname)s: %(message)s") diff --git a/src/ptbench/scripts/dataset.py b/src/ptbench/scripts/dataset.py index 8febec79..7319cb54 100644 --- a/src/ptbench/scripts/dataset.py +++ b/src/ptbench/scripts/dataset.py @@ -9,8 +9,8 @@ import os import click -from clapp.click import AliasedGroup, verbosity_option -from clapp.logging import setup +from clapper.click import AliasedGroup, verbosity_option +from clapper.logging import setup logger = setup(__name__.split(".")[0], format="%(levelname)s: %(message)s") diff --git a/src/ptbench/scripts/evaluate.py b/src/ptbench/scripts/evaluate.py index 1204a79e..2ee71db0 100644 --- a/src/ptbench/scripts/evaluate.py +++ b/src/ptbench/scripts/evaluate.py @@ -4,8 +4,8 @@ import click -from clapp.click import ConfigCommand, ResourceOption, verbosity_option -from clapp.logging import setup +from clapper.click import ConfigCommand, ResourceOption, verbosity_option +from clapper.logging import setup logger = setup(__name__.split(".")[0], format="%(levelname)s: %(message)s") diff --git a/src/ptbench/scripts/predict.py b/src/ptbench/scripts/predict.py index 18e57c3d..41b10a29 100644 --- a/src/ptbench/scripts/predict.py +++ b/src/ptbench/scripts/predict.py @@ -4,8 +4,8 @@ import click -from clapp.click import ConfigCommand, ResourceOption, verbosity_option -from clapp.logging import setup +from clapper.click import ConfigCommand, ResourceOption, verbosity_option +from clapper.logging import setup logger = setup(__name__.split(".")[0], format="%(levelname)s: %(message)s") diff --git a/src/ptbench/scripts/predtojson.py b/src/ptbench/scripts/predtojson.py index 549aa3a9..2b782291 100644 --- a/src/ptbench/scripts/predtojson.py +++ b/src/ptbench/scripts/predtojson.py @@ -4,8 +4,8 @@ import click -from clapp.click import verbosity_option -from clapp.logging import setup +from clapper.click import verbosity_option +from clapper.logging import setup logger = setup(__name__.split(".")[0], format="%(levelname)s: %(message)s") diff --git a/src/ptbench/scripts/train.py b/src/ptbench/scripts/train.py index e3d9b043..07577a34 100644 --- a/src/ptbench/scripts/train.py +++ b/src/ptbench/scripts/train.py @@ -6,8 +6,8 @@ import os import click -from clapp.click import ConfigCommand, ResourceOption, verbosity_option -from clapp.logging import setup +from clapper.click import ConfigCommand, ResourceOption, verbosity_option +from clapper.logging import setup logger = setup(__name__.split(".")[0], format="%(levelname)s: %(message)s") diff --git a/src/ptbench/scripts/train_analysis.py b/src/ptbench/scripts/train_analysis.py index 8eddb18a..f33cd9ab 100644 --- a/src/ptbench/scripts/train_analysis.py +++ b/src/ptbench/scripts/train_analysis.py @@ -9,8 +9,8 @@ import os import click import matplotlib.pyplot as plt -from clapp.click import ConfigCommand, ResourceOption, verbosity_option -from clapp.logging import setup +from clapper.click import ConfigCommand, ResourceOption, verbosity_option +from clapper.logging import setup logger = setup(__name__.split(".")[0], format="%(levelname)s: %(message)s") diff --git a/src/ptbench/utils/rc.py b/src/ptbench/utils/rc.py index 8d313149..21ebda08 100644 --- a/src/ptbench/utils/rc.py +++ b/src/ptbench/utils/rc.py @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -from clapp.rc import UserDefaults +from clapper.rc import UserDefaults def load_rc() -> UserDefaults: -- GitLab