Merge pull request #24 from BotBuilderCommunity/feature/fix-package-s…

…tructure Updates to resolve import issues
BotBuilderCommunity · Nov 24, 2019 · 5e73740 · 5e73740
2 parents 14d8652 + 7bb343a
commit 5e73740
Show file tree

Hide file tree

Showing 15 changed files with 8 additions and 8 deletions.
diff --git a/...munity-dialogs-prompts/source/__init__.py → ...der/community/dialogs/prompts/__init__.py b/...munity-dialogs-prompts/source/__init__.py → ...der/community/dialogs/prompts/__init__.py
diff --git a/...community-dialogs-prompts/source/about.py → ...uilder/community/dialogs/prompts/about.py b/...community-dialogs-prompts/source/about.py → ...uilder/community/dialogs/prompts/about.py
diff --git a/...ty-dialogs-prompts/source/email_prompt.py → ...community/dialogs/prompts/email_prompt.py b/...ty-dialogs-prompts/source/email_prompt.py → ...community/dialogs/prompts/email_prompt.py
diff --git a/...ity-dialogs-prompts/source/guid_prompt.py → .../community/dialogs/prompts/guid_prompt.py b/...ity-dialogs-prompts/source/guid_prompt.py → .../community/dialogs/prompts/guid_prompt.py
diff --git a/...rompts/source/internet_protocol_prompt.py → ...alogs/prompts/internet_protocol_prompt.py b/...rompts/source/internet_protocol_prompt.py → ...alogs/prompts/internet_protocol_prompt.py
diff --git a/...prompts/source/number_with_type_prompt.py → ...ialogs/prompts/number_with_type_prompt.py b/...prompts/source/number_with_type_prompt.py → ...ialogs/prompts/number_with_type_prompt.py
diff --git a/...prompts/source/number_with_unit_prompt.py → ...ialogs/prompts/number_with_unit_prompt.py b/...prompts/source/number_with_unit_prompt.py → ...ialogs/prompts/number_with_unit_prompt.py
diff --git a/...ty-dialogs-prompts/source/phone_prompt.py → ...community/dialogs/prompts/phone_prompt.py b/...ty-dialogs-prompts/source/phone_prompt.py → ...community/dialogs/prompts/phone_prompt.py
diff --git a/libraries/botbuilder-community-dialogs-prompts/setup.py b/libraries/botbuilder-community-dialogs-prompts/setup.py
@@ -13,7 +13,7 @@
 
 root = os.path.abspath(os.path.dirname(__file__))
 
-with open(os.path.join(root, "source", "about.py")) as f:
+with open(os.path.join(root, "botbuilder", "community", "dialogs", "prompts", "about.py")) as f:
     package_info = {}
     info = f.read()
     exec(info, package_info)
@@ -32,7 +32,7 @@
     long_description_content_type="text/markdown",
     license=package_info["__license__"],
     packages=[
-        "source",
+        "botbuilder.community.dialogs.prompts",
     ],
     install_requires=REQUIRES + TESTS_REQUIRES,
     tests_require=TESTS_REQUIRES,

diff --git a/libraries/botbuilder-community-dialogs-prompts/test/test_email_prompt.py b/libraries/botbuilder-community-dialogs-prompts/test/test_email_prompt.py
@@ -5,7 +5,7 @@
 import asyncio
 
 current = pathlib.Path(__file__).parent.parent
-libpath = current.joinpath("source")
+libpath = current.joinpath("botbuilder").joinpath("community").joinpath("dialogs").joinpath("prompts")
 sys.path.append(str(libpath))
 
 from botbuilder.dialogs.prompts import (

diff --git a/libraries/botbuilder-community-dialogs-prompts/test/test_guid_prompt.py b/libraries/botbuilder-community-dialogs-prompts/test/test_guid_prompt.py
@@ -5,7 +5,7 @@
 import asyncio
 
 current = pathlib.Path(__file__).parent.parent
-libpath = current.joinpath("source")
+libpath = current.joinpath("botbuilder").joinpath("community").joinpath("dialogs").joinpath("prompts")
 sys.path.append(str(libpath))
 
 from botbuilder.dialogs.prompts import (

diff --git a/libraries/botbuilder-community-dialogs-prompts/test/test_internet_protocol_prompt.py b/libraries/botbuilder-community-dialogs-prompts/test/test_internet_protocol_prompt.py
@@ -5,7 +5,7 @@
 import asyncio
 
 current = pathlib.Path(__file__).parent.parent
-libpath = current.joinpath("source")
+libpath = current.joinpath("botbuilder").joinpath("community").joinpath("dialogs").joinpath("prompts")
 sys.path.append(str(libpath))
 
 from botbuilder.dialogs.prompts import (

diff --git a/libraries/botbuilder-community-dialogs-prompts/test/test_number_with_type_prompt.py b/libraries/botbuilder-community-dialogs-prompts/test/test_number_with_type_prompt.py
@@ -5,7 +5,7 @@
 import asyncio
 
 current = pathlib.Path(__file__).parent.parent
-libpath = current.joinpath("source")
+libpath = current.joinpath("botbuilder").joinpath("community").joinpath("dialogs").joinpath("prompts")
 sys.path.append(str(libpath))
 
 from botbuilder.dialogs.prompts import (

diff --git a/libraries/botbuilder-community-dialogs-prompts/test/test_number_with_unit_prompt.py b/libraries/botbuilder-community-dialogs-prompts/test/test_number_with_unit_prompt.py
@@ -5,7 +5,7 @@
 import asyncio
 
 current = pathlib.Path(__file__).parent.parent
-libpath = current.joinpath("source")
+libpath = current.joinpath("botbuilder").joinpath("community").joinpath("dialogs").joinpath("prompts")
 sys.path.append(str(libpath))
 
 from botbuilder.dialogs.prompts import (

diff --git a/libraries/botbuilder-community-dialogs-prompts/test/test_phone_prompt.py b/libraries/botbuilder-community-dialogs-prompts/test/test_phone_prompt.py
@@ -5,7 +5,7 @@
 import asyncio
 
 current = pathlib.Path(__file__).parent.parent
-libpath = current.joinpath("source")
+libpath = current.joinpath("botbuilder").joinpath("community").joinpath("dialogs").joinpath("prompts")
 sys.path.append(str(libpath))
 
 from botbuilder.dialogs.prompts import (