From 113517967ec6b0d232d78d7b4fb4fbf567a5178e Mon Sep 17 00:00:00 2001
From: SimLeek <josh.miklos@gmail.com>
Date: Sat, 27 Jan 2018 18:59:26 -0700
Subject: [PATCH] modified package structure some more for pip

---
 __init__.py                                                | 2 +-
 cv_pubsubs/{cv_webcam_pub => webcam_pub}/__init__.py       | 0
 cv_pubsubs/{cv_webcam_pub => webcam_pub}/camctrl.py        | 0
 cv_pubsubs/{cv_webcam_pub => webcam_pub}/frame_handler.py  | 0
 cv_pubsubs/{cv_webcam_pub => webcam_pub}/get_cam_ids.py    | 0
 cv_pubsubs/{cv_webcam_pub => webcam_pub}/listen_default.py | 0
 cv_pubsubs/{cv_webcam_pub => webcam_pub}/pub_cam.py        | 0
 cv_pubsubs/{cv_window_sub => window_sub}/__init__.py       | 0
 cv_pubsubs/{cv_window_sub => window_sub}/cv_window_sub.py  | 2 +-
 setup.py                                                   | 2 +-
 tests_interactive/test_pub_cam.py                          | 2 +-
 tests_interactive/test_sub_win.py                          | 4 ++--
 12 files changed, 6 insertions(+), 6 deletions(-)
 rename cv_pubsubs/{cv_webcam_pub => webcam_pub}/__init__.py (100%)
 rename cv_pubsubs/{cv_webcam_pub => webcam_pub}/camctrl.py (100%)
 rename cv_pubsubs/{cv_webcam_pub => webcam_pub}/frame_handler.py (100%)
 rename cv_pubsubs/{cv_webcam_pub => webcam_pub}/get_cam_ids.py (100%)
 rename cv_pubsubs/{cv_webcam_pub => webcam_pub}/listen_default.py (100%)
 rename cv_pubsubs/{cv_webcam_pub => webcam_pub}/pub_cam.py (100%)
 rename cv_pubsubs/{cv_window_sub => window_sub}/__init__.py (100%)
 rename cv_pubsubs/{cv_window_sub => window_sub}/cv_window_sub.py (96%)

diff --git a/__init__.py b/__init__.py
index 3a5a3e6..05bfaf5 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,2 +1,2 @@
 # redirection, so we can use subtree like pip
-from .cv_pubsubs import cv_webcam_pub, cv_window_sub
+from .cv_pubsubs import webcam_pub, window_sub
diff --git a/cv_pubsubs/cv_webcam_pub/__init__.py b/cv_pubsubs/webcam_pub/__init__.py
similarity index 100%
rename from cv_pubsubs/cv_webcam_pub/__init__.py
rename to cv_pubsubs/webcam_pub/__init__.py
diff --git a/cv_pubsubs/cv_webcam_pub/camctrl.py b/cv_pubsubs/webcam_pub/camctrl.py
similarity index 100%
rename from cv_pubsubs/cv_webcam_pub/camctrl.py
rename to cv_pubsubs/webcam_pub/camctrl.py
diff --git a/cv_pubsubs/cv_webcam_pub/frame_handler.py b/cv_pubsubs/webcam_pub/frame_handler.py
similarity index 100%
rename from cv_pubsubs/cv_webcam_pub/frame_handler.py
rename to cv_pubsubs/webcam_pub/frame_handler.py
diff --git a/cv_pubsubs/cv_webcam_pub/get_cam_ids.py b/cv_pubsubs/webcam_pub/get_cam_ids.py
similarity index 100%
rename from cv_pubsubs/cv_webcam_pub/get_cam_ids.py
rename to cv_pubsubs/webcam_pub/get_cam_ids.py
diff --git a/cv_pubsubs/cv_webcam_pub/listen_default.py b/cv_pubsubs/webcam_pub/listen_default.py
similarity index 100%
rename from cv_pubsubs/cv_webcam_pub/listen_default.py
rename to cv_pubsubs/webcam_pub/listen_default.py
diff --git a/cv_pubsubs/cv_webcam_pub/pub_cam.py b/cv_pubsubs/webcam_pub/pub_cam.py
similarity index 100%
rename from cv_pubsubs/cv_webcam_pub/pub_cam.py
rename to cv_pubsubs/webcam_pub/pub_cam.py
diff --git a/cv_pubsubs/cv_window_sub/__init__.py b/cv_pubsubs/window_sub/__init__.py
similarity index 100%
rename from cv_pubsubs/cv_window_sub/__init__.py
rename to cv_pubsubs/window_sub/__init__.py
diff --git a/cv_pubsubs/cv_window_sub/cv_window_sub.py b/cv_pubsubs/window_sub/cv_window_sub.py
similarity index 96%
rename from cv_pubsubs/cv_window_sub/cv_window_sub.py
rename to cv_pubsubs/window_sub/cv_window_sub.py
index 130656c..55b80d5 100644
--- a/cv_pubsubs/cv_window_sub/cv_window_sub.py
+++ b/cv_pubsubs/window_sub/cv_window_sub.py
@@ -1,5 +1,5 @@
 import cv2
-from ..cv_webcam_pub.camctrl import CamCtrl
+from ..webcam_pub.camctrl import CamCtrl
 
 if False:
     from typing import List
diff --git a/setup.py b/setup.py
index 77c1959..2217471 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from distutils.core import setup
 
 setup(
     name= 'cv_pubsubs',
-    packages = ['cv_webcam_pub', 'cv_window_sub'],
+    packages = ['cv_pubsubs', 'cv_pubsubs.webcam_pub', 'cv_pubsubs.window_sub'],
     version='0.1',
     description='Pubsub interface for Python OpenCV',
     author='Josh Miklos',
diff --git a/tests_interactive/test_pub_cam.py b/tests_interactive/test_pub_cam.py
index 62e7c93..4da4d45 100644
--- a/tests_interactive/test_pub_cam.py
+++ b/tests_interactive/test_pub_cam.py
@@ -1,4 +1,4 @@
-import cv_pubsubs.cv_webcam_pub as w
+import cv_pubsubs.webcam_pub as w
 import unittest as ut
 
 
diff --git a/tests_interactive/test_sub_win.py b/tests_interactive/test_sub_win.py
index 497bfac..c64f3c4 100644
--- a/tests_interactive/test_sub_win.py
+++ b/tests_interactive/test_sub_win.py
@@ -1,6 +1,6 @@
 import unittest as ut
-import cv_pubsubs.cv_webcam_pub as w
-from cv_pubsubs.cv_window_sub import frame_dict, sub_win_loop
+import cv_pubsubs.webcam_pub as w
+from cv_pubsubs.window_sub import frame_dict, sub_win_loop
 
 
 class TestSubWin(ut.TestCase):