Skip to content

Commit

Permalink
Build fix - Pinning package versions and Custom browser endpoints sho…
Browse files Browse the repository at this point in the history
…uld not have a proxy set (dgtlmoon#2204)
  • Loading branch information
dgtlmoon authored Feb 20, 2024
1 parent d2569ba commit 904ef84
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
6 changes: 3 additions & 3 deletions changedetectionio/processors/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@ def call_browser(self):

proxy_url = None
if preferred_proxy_id:
# Custom browser endpoints should not have a proxy added
if not preferred_proxy_id.startswith('ui-'):
# Custom browser endpoints should NOT have a proxy added
if not prefer_fetch_backend.startswith('extra_browser_'):
proxy_url = self.datastore.proxy_list.get(preferred_proxy_id).get('url')
logger.debug(f"Selected proxy key '{preferred_proxy_id}' as proxy URL '{proxy_url}' for {url}")
else:
logger.debug(f"Skipping adding proxy data when custom Browser endpoint is specified.")
logger.debug(f"Skipping adding proxy data when custom Browser endpoint is specified. ")

# Now call the fetcher (playwright/requests/etc) with arguments that only a fetcher would need.
# When browser_connection_url is None, it method should default to working out whats the best defaults (os env vars etc)
Expand Down
8 changes: 5 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Used by Pyppeteer
pyee

eventlet>=0.33.3 # related to dnspython fixes
eventlet==0.33.3 # related to dnspython fixes
feedgen~=0.9
flask-compress
# 0.6.3 included compatibility fix for werkzeug 3.x (2.x had deprecation of url handlers)
Expand All @@ -22,13 +22,15 @@ validators~=0.21
brotli~=1.0
requests[socks]

urllib3>1.26
urllib3==1.26.18
chardet>2.3.0

wtforms~=3.0
jsonpath-ng~=1.5.3

dnspython~=2.4 # related to eventlet fixes
# Pinned: module 'eventlet.green.select' has no attribute 'epoll'
# https://github.com/eventlet/eventlet/issues/805#issuecomment-1640463482
dnspython==2.3.0 # related to eventlet fixes

# jq not available on Windows so must be installed manually

Expand Down

0 comments on commit 904ef84

Please sign in to comment.