Remove logshipper and pyinotify from requirements files

Author: blag

contrib/linux/requirements.txt

@@ -1,3 +1 @@
-# used by file watcher sensor
-pyinotify>=0.9.5,<=0.10
--e git+https://github.com/StackStorm/logshipper.git@stackstorm_patched#egg=logshipper
+watchdog

fixed-requirements.txt

@@ -27,7 +27,6 @@ paramiko==2.7.1
 passlib==1.7.1
 prance==0.9.0
 prompt-toolkit==1.0.15
-pyinotify==0.9.6; platform_system=="Linux"
 pymongo==3.10.0
 python-editor==1.0.4
 python-gnupg==0.4.5

requirements.txt

@@ -14,7 +14,6 @@ cryptography==2.8
 dnspython<2.0.0,>=1.16.0
 eventlet==0.25.1
 flex==6.14.0
-git+https://github.com/StackStorm/logshipper.git@stackstorm_patched#egg=logshipper
 git+https://github.com/StackStorm/orquesta.git@v1.2.0#egg=orquesta
 git+https://github.com/StackStorm/st2-auth-backend-flat-file.git@master#egg=st2-auth-backend-flat-file
 git+https://github.com/StackStorm/st2-auth-ldap.git@master#egg=st2-auth-ldap
@@ -42,7 +41,6 @@ passlib==1.7.1
 prettytable
 prompt-toolkit==1.0.15
 psutil==5.6.6
-pyinotify==0.9.6 ; platform_system == "Linux"
 pymongo==3.10.0
 pyrabbit
 python-dateutil==2.8.0
@@ -65,6 +63,7 @@ stevedore==1.30.1
 tooz==1.66.1
 ujson==1.35
 unittest2
+watchdog
 webob==1.8.5
 webtest
 zake==0.2.2

st2actions/in-requirements.txt

@@ -14,7 +14,6 @@ python-json-logger
 gitpython
 lockfile
 # needed by core "linux" pack - TODO: create virtualenv for linux pack on postinst
-pyinotify
-git+https://github.com/StackStorm/logshipper.git@stackstorm_patched#egg=logshipper
+watchdog
 # required by pack_mgmt/setup_virtualenv.py#L135
 virtualenv

st2actions/requirements.txt

@@ -7,16 +7,15 @@
 # update the component requirements.txt
 apscheduler==3.6.3
 eventlet==0.25.1
-git+https://github.com/StackStorm/logshipper.git@stackstorm_patched#egg=logshipper
 gitpython==2.1.15
 jinja2==2.10.3
 kombu==4.6.6
 lockfile==0.12.2
 oslo.config<1.13,>=1.12.1
 oslo.utils<=3.37.0,>=3.36.2
-pyinotify==0.9.6 ; platform_system == "Linux"
 python-dateutil==2.8.0
 python-json-logger
 pyyaml==5.1.2
 requests[security]==2.23.0
 six==1.13.0
+watchdog