replace filelock with dependency (#2491)

fixes #2490

Author: Vladimir Kotal

opengrok-tools/requirements.txt

@@ -1,5 +1,6 @@
 certifi==2018.8.24
 chardet==3.0.4
+filelock==3.0.10
 idna==2.7
 JsonForm==0.0.2
 jsonschema==2.6.0

opengrok-tools/setup.py

@@ -56,7 +56,8 @@ def get_version(version):
         'jsonschema==2.6.0',
         'pyyaml',
         'requests>=2.20.0',
-        'resource'
+        'resource',
+        'filelock'
     ],
     entry_points={
         'console_scripts': [

opengrok-tools/src/main/python/opengrok_tools/mirror.py

@@ -36,8 +36,8 @@
 import sys
 import tempfile
 from logging.handlers import RotatingFileHandler
+from filelock import Timeout, FileLock
 
-from .utils.filelock import Timeout, FileLock
 from .utils.hook import run_hook
 from .utils.log import get_console_logger
 from .utils.opengrok import get_repos, get_config_value, get_repo_type

opengrok-tools/src/main/python/opengrok_tools/projadm.py

@@ -34,9 +34,9 @@
 import sys
 import tempfile
 from os import path
+from filelock import Timeout, FileLock
 
 from .utils.command import Command
-from .utils.filelock import Timeout, FileLock
 from .utils.log import get_console_logger
 from .utils.opengrok import get_configuration, set_configuration, \
     add_project, delete_project, get_config_value

opengrok-tools/src/main/python/opengrok_tools/sync.py

@@ -38,9 +38,9 @@
 import tempfile
 from multiprocessing import Pool
 from os import path
+from filelock import Timeout, FileLock
 
 from .utils.commandsequence import CommandSequence, CommandSequenceBase
-from .utils.filelock import Timeout, FileLock
 from .utils.opengrok import list_indexed_projects, get_config_value
 from .utils.readconfig import read_config
 from .utils.utils import is_web_uri

opengrok-tools/src/main/python/opengrok_tools/utils/__init__.py

@@ -2,7 +2,6 @@
 from . import command
 from . import opengrok
 from . import utils
-from . import filelock
 from . import hook
 from . import repofactory
 from . import webutil
@@ -13,7 +12,6 @@
     'utils',
     'command',
     'commandsequence',
-    'filelock',
     'hook',
     'repofactory',
     'webutil',