From 3adb84eb8d550f46fb7738dcd5f9db0d6d6d047d Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 26 May 2021 17:04:28 +0530 Subject: [PATCH] chore: Drop watchdog dependency Watchdog isn't used by Frappe, and there wasn't any mechanism to access it directly either. By default, bench serve (or start) uses Werkzeug's watchdogreloader --- frappe/utils/__init__.py | 36 ++++++------------------------------ requirements.txt | 1 - 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index 8d4905edd6..9985d2dcf3 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -520,41 +520,17 @@ def get_sites(sites_path=None): return sorted(sites) -def get_request_session(max_retries=3): +def get_request_session(max_retries=5): import requests from urllib3.util import Retry - session = requests.Session() - session.mount("http://", requests.adapters.HTTPAdapter(max_retries=Retry(total=5, status_forcelist=[500]))) - session.mount("https://", requests.adapters.HTTPAdapter(max_retries=Retry(total=5, status_forcelist=[500]))) - return session - -def watch(path, handler=None, debug=True): - import time - - from watchdog.events import FileSystemEventHandler - from watchdog.observers import Observer - class Handler(FileSystemEventHandler): - def on_any_event(self, event): - if debug: - print("File {0}: {1}".format(event.event_type, event.src_path)) - - if not handler: - print("No handler specified") - return + session = requests.Session() + http_adapter = requests.adapters.HTTPAdapter(max_retries=Retry(total=max_retries, status_forcelist=[500])) - handler(event.src_path, event.event_type) + session.mount("http://", http_adapter) + session.mount("https://", http_adapter) - event_handler = Handler() - observer = Observer() - observer.schedule(event_handler, path, recursive=True) - observer.start() - try: - while True: - time.sleep(1) - except KeyboardInterrupt: - observer.stop() - observer.join() + return session def markdown(text, sanitize=True, linkify=True): html = text if is_html(text) else frappe.utils.md_to_html(text) diff --git a/requirements.txt b/requirements.txt index b3bfc12567..9c61e500ef 100644 --- a/requirements.txt +++ b/requirements.txt @@ -72,7 +72,6 @@ stripe~=2.56.0 terminaltables~=3.1.0 unittest-xml-reporting~=3.0.4 urllib3~=1.26.4 -watchdog~=2.0.2 Werkzeug~=0.16.1 Whoosh~=2.7.4 wrapt~=1.12.1