Merge branch 'dev' into filter_workouts_by_name

This commit is contained in:
Sam
2023-04-08 11:12:33 +02:00
121 changed files with 2702 additions and 1455 deletions

View File

@ -69,7 +69,7 @@ class VisualCrossing(BaseWeather):
self.api_key, '*****'
)
)
r = requests.get(url, params=self.params)
r = requests.get(url, params=self.params, timeout=10)
r.raise_for_status()
res = r.json()
weather = res['currentConditions']

View File

@ -853,7 +853,7 @@ def get_map_tile(s: str, z: str, x: str, y: str) -> Tuple[Response, int]:
y=secure_filename(y),
)
headers = {'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:88.0)'}
response = requests.get(url, headers=headers)
response = requests.get(url, headers=headers, timeout=30)
return (
Response(
response.content,