From 0d556051a0bfcde5512425fe43ba2745cff09504 Mon Sep 17 00:00:00 2001 From: Florian Apolloner Date: Wed, 26 Sep 2018 20:37:28 +0200 Subject: [PATCH] Only ara is a namespace package, subpackages are not. Change-Id: I3cdb501da1380acf53eaf8facab01be4b7187c67 --- ara/api/__init__.py | 1 - ara/server/__init__.py | 1 - setup.cfg | 3 --- tox.ini | 4 ++-- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ara/api/__init__.py b/ara/api/__init__.py index de40ea7..e69de29 100644 --- a/ara/api/__init__.py +++ b/ara/api/__init__.py @@ -1 +0,0 @@ -__import__('pkg_resources').declare_namespace(__name__) diff --git a/ara/server/__init__.py b/ara/server/__init__.py index de40ea7..e69de29 100644 --- a/ara/server/__init__.py +++ b/ara/server/__init__.py @@ -1 +0,0 @@ -__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup.cfg b/setup.cfg index 3194c6c..d376214 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,9 +26,6 @@ setup-hooks = pbr.hooks.setup_hook [files] -namespace_packages = - ara.api - ara.server packages = ara diff --git a/tox.ini b/tox.ini index 28982c3..9877603 100644 --- a/tox.ini +++ b/tox.ini @@ -38,8 +38,8 @@ setenv = # Temporary venv to help bootstrap integration [testenv:ansible-integration] deps = - git+https://git.openstack.org/openstack/ara-plugins@master#egg=ara-plugins - git+https://git.openstack.org/openstack/ara-clients@master#egg=ara-clients + git+https://git.openstack.org/openstack/ara-plugins@master#egg=ara_plugins + git+https://git.openstack.org/openstack/ara-clients@master#egg=ara_clients commands = rm -f {toxinidir}/db.sqlite3 bash -c 'ANSIBLE_CALLBACK_PLUGINS=$(python -c "import os,ara.plugins; print(os.path.dirname(ara.plugins.__file__))")/callback ansible-playbook {toxinidir}/hacking/test-playbook.yml'