Skip to content

Commit 7c4c50b

Browse files
committed
Use consolekit to provide force_option and no_pager_option
1 parent 613570c commit 7c4c50b

File tree

6 files changed

+5
-72
lines changed

6 files changed

+5
-72
lines changed

repo_helper/cli/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@
4444
# 3rd party
4545
import click
4646
from consolekit import CONTEXT_SETTINGS, click_group
47+
from consolekit.options import force_option
4748
from domdf_python_tools.paths import PathPlus
4849
from southwark.click import commit_message_option, commit_option
4950

5051
# this package
5152
from repo_helper import __version__
52-
from repo_helper.cli.options import force_option
5353
from repo_helper.cli.utils import run_repo_helper
5454

5555
__all__ = ["cli", "cli_command", "cli_group"]

repo_helper/cli/commands/init.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@
3434
import click
3535
import jinja2
3636
from apeye.requests_url import RequestsURL
37+
from consolekit.options import force_option
3738
from domdf_python_tools.paths import PathPlus, maybe_make
3839
from domdf_python_tools.stringlist import StringList
3940
from jinja2 import BaseLoader, Environment, StrictUndefined
4041
from southwark.click import commit_message_option, commit_option
4142

4243
# this package
4344
from repo_helper.cli import cli_command
44-
from repo_helper.cli.options import force_option
4545
from repo_helper.cli.utils import run_repo_helper
4646
from repo_helper.templates import init_repo_template_dir
4747

repo_helper/cli/commands/release.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import click
3434
from click import Command
3535
from consolekit import CONTEXT_SETTINGS
36+
from consolekit.options import force_option
3637
from consolekit.terminal_colours import Fore
3738
from consolekit.utils import abort
3839
from domdf_python_tools.paths import PathPlus
@@ -46,7 +47,6 @@
4647

4748
# this package
4849
from repo_helper.cli import cli_group
49-
from repo_helper.cli.options import force_option
5050
from repo_helper.cli.utils import commit_changed_files
5151
from repo_helper.configupdater2 import ConfigUpdater
5252
from repo_helper.core import RepoHelper

repo_helper/cli/commands/show.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,10 @@
3131
# 3rd party
3232
import click
3333
from consolekit import CONTEXT_SETTINGS
34-
from consolekit.options import colour_option
34+
from consolekit.options import colour_option, no_pager_option
3535

3636
# this package
3737
from repo_helper.cli import cli_group
38-
from repo_helper.cli.options import no_pager_option
3938

4039
__all__ = ["show", "show_command", "version", "log", "changelog"]
4140

repo_helper/cli/options.py

Lines changed: 0 additions & 66 deletions
This file was deleted.

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ appdirs>=1.4.4
33
attrs>=20.2.0
44
click==7.1.2
55
configconfig>=0.4.0
6-
consolekit>=0.4.0
6+
consolekit>=0.5.0
77
css-parser==1.0.6
88
domdf-python-tools>=1.5.0
99
dulwich>=0.19.16

0 commit comments

Comments
 (0)