From 3aa37f7ea4ddd5ac77f10d9dc5ef9c827d7ef972 Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Thu, 25 Jun 2015 16:34:35 +1200 Subject: [PATCH] Move commands into cmds subdir. This is a useful hint to readers about whether a module is library or UI. Change-Id: I177449fc6820e82fed938f2c216b6b9f9192957f --- openstack_requirements/cmds/__init__.py | 0 openstack_requirements/{ => cmds}/generate.py | 0 openstack_requirements/{ => cmds}/update.py | 0 openstack_requirements/tests/common.py | 2 +- openstack_requirements/tests/test_generate.py | 2 +- openstack_requirements/tests/test_update.py | 2 +- openstack_requirements/tests/test_update_pbr.py | 2 +- openstack_requirements/tests/test_update_suffix.py | 2 +- setup.cfg | 4 ++-- update.py | 2 +- 10 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 openstack_requirements/cmds/__init__.py rename openstack_requirements/{ => cmds}/generate.py (100%) rename openstack_requirements/{ => cmds}/update.py (100%) diff --git a/openstack_requirements/cmds/__init__.py b/openstack_requirements/cmds/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openstack_requirements/generate.py b/openstack_requirements/cmds/generate.py similarity index 100% rename from openstack_requirements/generate.py rename to openstack_requirements/cmds/generate.py diff --git a/openstack_requirements/update.py b/openstack_requirements/cmds/update.py similarity index 100% rename from openstack_requirements/update.py rename to openstack_requirements/cmds/update.py diff --git a/openstack_requirements/tests/common.py b/openstack_requirements/tests/common.py index 75e4975e86..3706491016 100644 --- a/openstack_requirements/tests/common.py +++ b/openstack_requirements/tests/common.py @@ -15,9 +15,9 @@ import shutil import fixtures +from openstack_requirements.cmds import update from openstack_requirements import project from openstack_requirements import requirement -from openstack_requirements import update def _file_to_list(fname): diff --git a/openstack_requirements/tests/test_generate.py b/openstack_requirements/tests/test_generate.py index 799a991a33..d6c7be39c0 100644 --- a/openstack_requirements/tests/test_generate.py +++ b/openstack_requirements/tests/test_generate.py @@ -16,7 +16,7 @@ import fixtures import testtools from testtools import matchers -from openstack_requirements import generate +from openstack_requirements.cmds import generate class TestFreeze(testtools.TestCase): diff --git a/openstack_requirements/tests/test_update.py b/openstack_requirements/tests/test_update.py index 3b7e0fa775..94ce34370b 100644 --- a/openstack_requirements/tests/test_update.py +++ b/openstack_requirements/tests/test_update.py @@ -23,10 +23,10 @@ import testscenarios import testtools from testtools import matchers +from openstack_requirements.cmds import update from openstack_requirements import project from openstack_requirements import requirement from openstack_requirements.tests import common -from openstack_requirements import update load_tests = testscenarios.load_tests_apply_scenarios diff --git a/openstack_requirements/tests/test_update_pbr.py b/openstack_requirements/tests/test_update_pbr.py index 9e58c1d125..f9e46d37f3 100644 --- a/openstack_requirements/tests/test_update_pbr.py +++ b/openstack_requirements/tests/test_update_pbr.py @@ -20,9 +20,9 @@ from __future__ import print_function import testtools +from openstack_requirements.cmds import update from openstack_requirements import project from openstack_requirements.tests import common -from openstack_requirements import update class UpdateTestPbr(testtools.TestCase): diff --git a/openstack_requirements/tests/test_update_suffix.py b/openstack_requirements/tests/test_update_suffix.py index 5d7c61b667..54bff0b53d 100644 --- a/openstack_requirements/tests/test_update_suffix.py +++ b/openstack_requirements/tests/test_update_suffix.py @@ -16,9 +16,9 @@ from __future__ import print_function import testtools +from openstack_requirements.cmds import update from openstack_requirements import project from openstack_requirements.tests import common -from openstack_requirements import update class UpdateTestWithSuffix(testtools.TestCase): diff --git a/setup.cfg b/setup.cfg index 9eaae8024d..8c0277b424 100644 --- a/setup.cfg +++ b/setup.cfg @@ -23,5 +23,5 @@ packages = [entry_points] console_scripts = - generate-constraints = openstack_requirements.generate:main - update-requirements = openstack_requirements.update:main + generate-constraints = openstack_requirements.cmds.generate:main + update-requirements = openstack_requirements.cmds.update:main diff --git a/update.py b/update.py index 7ccd5e9114..d715f12ed5 120000 --- a/update.py +++ b/update.py @@ -1 +1 @@ -openstack_requirements/update.py \ No newline at end of file +openstack_requirements/cmds/update.py \ No newline at end of file