auto install

ZoneMinder · Jul 15, 2019 · bdfcc26 · bdfcc26
1 parent d9e1e6e
commit bdfcc26
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/docs/guides/hooks.rst b/docs/guides/hooks.rst
@@ -91,11 +91,6 @@ If automatic install fails for you, or you like to be in control:
     git clone https://github.com/pliablepixels/zmeventnotification # if you don't already have it downloaded
     cd zmeventnotification/
 
--  Install the object detection dependencies:
-
-   .. code:: bash
-
-       sudo -H pip3 install -r  hook/requirements.txt 
 
 -  Install object detection files:
 

diff --git a/hook/detect.py b/hook/detect.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 # Main detection script that loads different detection models
 # look at zmes_hook_helpers for different detectors

diff --git a/hook/requirements.txt b/hook/requirements.txt
@@ -1,7 +1,7 @@
-numpy>=1.14.5
-opencv_python>=3.4.3.18
-imutils>=0.4.6
-configparser>=3.7.1
+opencv_contrib_python>=4.1.0.25
+future>=0.15.2
+numpy>=1.13.3
+requests>=2.18.4
 Shapely>=1.6.4.post2
-future
-requests
+face_recognition>=1.2.3
+imutils>=0.5.2
diff --git a/hook/setup.py b/hook/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import io
 import os
@@ -10,13 +10,18 @@
 #Package meta-data.
 NAME = 'zmes_hooks'
 DESCRIPTION = 'ZoneMinder EventServer hooks'
-URL = 'https://github.com/pliablepixels/zmeventserver/tree/master/hook'
+URL = 'https://github.com/pliablepixels/zmeventserver/'
 AUTHOR_EMAIL = 'pliablepixels@gmail.com'
 AUTHOR = 'Pliable Pixels'
 LICENSE = 'GPL'
+INSTALL_REQUIRES=['opencv_contrib_python', 'numpy', 'requests', 'Shapely', 'imutils']
 
 
 here = os.path.abspath(os.path.dirname(__file__))
+# read the contents of your README file
+with open(os.path.join(here, 'README.md'), encoding='utf-8') as f:
+    long_description = f.read()
+
 def read(*parts):
     with codecs.open(os.path.join(here, *parts), 'r') as fp:
         return fp.read()
@@ -33,8 +38,11 @@ def find_version(*file_paths):
       description = DESCRIPTION,
       author = AUTHOR,
       author_email = AUTHOR_EMAIL,
+      long_description = long_description,
+      long_description_content_type='text/markdown',
       url = URL,
       license = LICENSE,
+      install_requires=INSTALL_REQUIRES,
       py_modules = ['zmes_hook_helpers.common_params',
                     'zmes_hook_helpers.log',
                     'zmes_hook_helpers.yolo',

diff --git a/hook/zmes_hook_helpers/__init__.py b/hook/zmes_hook_helpers/__init__.py
@@ -1,2 +1,2 @@
-__version__ = "3.3.5"
+__version__ = "3.3.6"
 VERSION=__version__