From c45e534823dc494e9f747c693c15bdd149241de8 Mon Sep 17 00:00:00 2001 From: Kieran Prasch Date: Fri, 9 Nov 2018 09:29:49 -0800 Subject: [PATCH] Understand nucypher CLI to be a module --- setup.py | 2 +- tests/cli/test_accounts.py | 2 +- tests/cli/test_config.py | 2 +- tests/cli/test_main.py | 2 +- tests/cli/test_run_ursula.py | 2 +- tests/cli/test_stake.py | 2 +- tests/conftest.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index 2c3413b0f..d475fa230 100644 --- a/setup.py +++ b/setup.py @@ -155,7 +155,7 @@ setup(name=ABOUT['__title__'], 'blockchain/eth/sol/source/zepellin/token/*']}, include_package_data=True, - entry_points={'console_scripts': ['{0}=scripts.cli:cli'.format(PACKAGE_NAME)]}, + entry_points={'console_scripts': ['{0}={0}.cli:cli'.format(PACKAGE_NAME)]}, cmdclass={'verify': VerifyVersionCommand}, classifiers=[ diff --git a/tests/cli/test_accounts.py b/tests/cli/test_accounts.py index 78994fc6c..42e5703bb 100644 --- a/tests/cli/test_accounts.py +++ b/tests/cli/test_accounts.py @@ -17,7 +17,7 @@ along with nucypher. If not, see . import pytest from click.testing import CliRunner -from scripts.cli import cli +from nucypher.cli import cli @pytest.mark.usefixtures("three_agents") diff --git a/tests/cli/test_config.py b/tests/cli/test_config.py index 382c2d342..d733d9495 100644 --- a/tests/cli/test_config.py +++ b/tests/cli/test_config.py @@ -21,7 +21,7 @@ import pytest import shutil from click.testing import CliRunner -from scripts.cli import cli +from nucypher.cli import cli from nucypher.config.node import NodeConfiguration from nucypher.utilities.sandbox.constants import TEST_URSULA_INSECURE_DEVELOPMENT_PASSWORD diff --git a/tests/cli/test_main.py b/tests/cli/test_main.py index 5708f5368..672f64cb2 100644 --- a/tests/cli/test_main.py +++ b/tests/cli/test_main.py @@ -16,7 +16,7 @@ along with nucypher. If not, see . """ from click.testing import CliRunner -from scripts.cli import cli +from nucypher.cli import cli def test_help_message(): diff --git a/tests/cli/test_run_ursula.py b/tests/cli/test_run_ursula.py index c11806408..081e09748 100644 --- a/tests/cli/test_run_ursula.py +++ b/tests/cli/test_run_ursula.py @@ -22,7 +22,7 @@ from click.testing import CliRunner from twisted.internet import threads from twisted.internet.error import CannotListenError -from scripts.cli import cli +from nucypher.cli import cli from nucypher.characters.base import Learner from nucypher.utilities.sandbox.constants import TEST_URSULA_INSECURE_DEVELOPMENT_PASSWORD diff --git a/tests/cli/test_stake.py b/tests/cli/test_stake.py index 1173c1fa9..f61e4e3b3 100644 --- a/tests/cli/test_stake.py +++ b/tests/cli/test_stake.py @@ -17,7 +17,7 @@ along with nucypher. If not, see . import pytest from click.testing import CliRunner -from scripts.cli import cli +from nucypher.cli import cli @pytest.mark.skip diff --git a/tests/conftest.py b/tests/conftest.py index dfd41c0f9..00c22d3ad 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -18,7 +18,7 @@ along with nucypher. If not, see . import pytest from twisted.logger import globalLogPublisher -from scripts.cli import NucypherClickConfig +from nucypher.cli import NucypherClickConfig from nucypher.utilities.logging import simpleObserver