Git-Mirrors/brozzler
1
0
Fork 0
mirror of https://github.com/internetarchive/brozzler.git synced 2025-02-23 16:19:49 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #282 from galgeek/2407-deps-update

Browse Source 
websocket-client update, plus yt-dlp update
This commit is contained in:
Barbara Miller 2024-07-30 12:37:39 -07:00 committed by GitHub
commit c1f5aaf318
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
brozzler/browser.py
View File

@ -1,7 +1,7 @@
""" """
brozzler/browser.py - manages the browsers for brozzler brozzler/browser.py - manages the browsers for brozzler
Copyright (C) 2014-2023 Internet Archive Copyright (C) 2014-2024 Internet Archive
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -138,6 +138,10 @@ class BrowserPool:
return len(self._in_use) return len(self._in_use)
# uncomment the next line for LOTS of debugging logging
# websocket.enableTrace(True)
class WebsockReceiverThread(threading.Thread): class WebsockReceiverThread(threading.Thread):
logger = logging.getLogger(__module__ + "." + __qualname__) logger = logging.getLogger(__module__ + "." + __qualname__)
@ -173,7 +177,7 @@ class WebsockReceiverThread(threading.Thread):
def pop_result(self, msg_id): def pop_result(self, msg_id):
return self._result_messages.pop(msg_id) return self._result_messages.pop(msg_id)
def _on_close(self, websock): def _on_close(self, websock, close_status_code, close_msg):
pass pass
# self.logger.info('GOODBYE GOODBYE WEBSOCKET') # self.logger.info('GOODBYE GOODBYE WEBSOCKET')

4
setup.py
View File

@ -66,10 +66,9 @@ setuptools.setup(
}, },
install_requires=[ install_requires=[
"PyYAML>=5.1", "PyYAML>=5.1",
"yt_dlp<2023.11.16",
"reppy==0.3.4", "reppy==0.3.4",
"requests>=2.21", "requests>=2.21",
"websocket-client>=0.39.0,<=0.48.0", "websocket-client==1.8.0",
"pillow>=5.2.0", "pillow>=5.2.0",
"urlcanon>=0.1.dev23", "urlcanon>=0.1.dev23",
"doublethink @ git+https://github.com/internetarchive/doublethink.git@Py311", "doublethink @ git+https://github.com/internetarchive/doublethink.git@Py311",
@ -80,6 +79,7 @@ setuptools.setup(
"python-magic>=0.4.15", "python-magic>=0.4.15",
], ],
extras_require={ extras_require={
"yt-dlp": ["yt-dlp==2024.7.25"],
"dashboard": ["flask>=1.0", "gunicorn>=19.8.1"], "dashboard": ["flask>=1.0", "gunicorn>=19.8.1"],
"easy": [ "easy": [
"warcprox>=2.4.31", "warcprox>=2.4.31",