Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

websocket-client update, plus yt-dlp update #282

Merged
merged 7 commits into from
Jul 30, 2024
+8 −4
Merged

websocket-client update, plus yt-dlp update #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b41393f
yt_dlp 2024.7.16, websocket-client==1.8.0
Jul 24, 2024
f06e034
fix doc typos
Jul 24, 2024
704db5b
update on_close for websocket-client update
Jul 25, 2024
1ec4d03
skip websockt.enableTrace for now
Jul 25, 2024
81e640c
black'd
Jul 29, 2024
20841fb
mv yt-dlp to extras & update
Jul 29, 2024
124a390
Revert "fix doc typos"
Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions brozzler/browser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""
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");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -138,6 +138,10 @@ def num_in_use(self):
return len(self._in_use)


# uncomment the next line for LOTS of debugging logging
# websocket.enableTrace(True)


class WebsockReceiverThread(threading.Thread):
logger = logging.getLogger(__module__ + "." + __qualname__)

Expand Down Expand Up @@ -173,7 +177,7 @@ def received_result(self, msg_id):
def pop_result(self, 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
# self.logger.info('GOODBYE GOODBYE WEBSOCKET')

Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,9 @@ def find_package_data(package):
},
install_requires=[
"PyYAML>=5.1",
"yt_dlp<2023.11.16",
"reppy==0.3.4",
"requests>=2.21",
"websocket-client>=0.39.0,<=0.48.0",
"websocket-client==1.8.0",
"pillow>=5.2.0",
"urlcanon>=0.1.dev23",
"doublethink @ git+https://github.com/internetarchive/doublethink.git@Py311",
Expand All @@ -80,6 +79,7 @@ def find_package_data(package):
"python-magic>=0.4.15",
],
extras_require={
"yt-dlp": ["yt-dlp==2024.7.25"],
"dashboard": ["flask>=1.0", "gunicorn>=19.8.1"],
"easy": [
"warcprox>=2.4.31",
Expand Down