diff --git a/cvpubsubs/__init__.py b/cvpubsubs/__init__.py index 7fd229a..fc79d63 100644 --- a/cvpubsubs/__init__.py +++ b/cvpubsubs/__init__.py @@ -1 +1 @@ -__version__ = '0.2.0' +__version__ = '0.2.1' diff --git a/pyproject.toml b/pyproject.toml index c5cab61..f0cca88 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ description = 'Simple tool for working with multiple streams from OpenCV.' author = 'SimLeek' author_email = 'josh.miklos@gmail.com' license = 'MIT/Apache-2.0' -url = 'https://github.com/_/CVPubSubs' +url = 'https://github.com/simleek/CVPubSubs' [requires] python_version = ['2.7', '3.5', '3.6', 'pypy', 'pypy3'] diff --git a/requirements.txt b/requirements.txt index 08f0fc3..d04d9fd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ pubsub -opencv-python \ No newline at end of file +numpy +opencv_python \ No newline at end of file diff --git a/setup.py b/setup.py index 15f066f..77354bd 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ with open('cvpubsubs/__init__.py', 'r') as f: with open('README.md', 'r', encoding='utf-8') as f: readme = f.read() -REQUIRES = [] +REQUIRES = ['pubsub', 'numpy', 'opencv_python'] setup( name='CVPubSubs', diff --git a/tests/test_sub_win.py b/tests/test_sub_win.py index 6582ff9..0645a1b 100644 --- a/tests/test_sub_win.py +++ b/tests/test_sub_win.py @@ -47,8 +47,7 @@ class TestSubWin(ut.TestCase): def test_sub_with_callback(self): def redden_frame_print_spam(frame, cam_id): frame[:, :, 0] = 0 - frame[:, :, 1] = 0 - print("Spam!") + frame[:, :, 2] = 0 w.VideoHandlerThread(callbacks=[redden_frame_print_spam] + w.display_callbacks).display() @@ -71,8 +70,8 @@ class TestSubWin(ut.TestCase): t.join() def test_multi_cams_multi_source(self): - t1 = w.VideoHandlerThread(0) - t2 = w.VideoHandlerThread(1) + t1 = w.VideoHandlerThread(0, request_size=(1920,1080)) + t2 = w.VideoHandlerThread(1, request_size=(1920,1080)) t1.start() t2.start()