Merge branch 'feature/dep-group-tests' into feature/buff-worms

 Closes #379

Author: felliott

mfr/core/remote_logging.py

@@ -113,7 +113,7 @@ async def _send_to_keen(payload, collection, project_id, write_key, action, doma
                                                    settings.KEEN_API_VERSION,
                                                    project_id, collection)
 
-    async with await aiohttp.request('POST', url, headers=headers, data=serialized) as resp:
+    async with aiohttp.request('POST', url, headers=headers, data=serialized) as resp:
         if resp.status == 201:
             logger.info(f'Successfully logged {action} to {collection} collection in {domain} Keen')
         else:

mfr/providers/osf/provider.py

@@ -7,7 +7,6 @@
 
 import furl
 import aiohttp
-from aiohttp.errors import ContentEncodingError
 
 from waterbutler.core import streams
 
@@ -92,7 +91,7 @@ async def metadata(self):
 
             try:
                 metadata = {'data': json.loads(response_headers['x-waterbutler-metadata'])['attributes']}
-            except ContentEncodingError:
+            except Exception:
                 pass  # hack: aiohttp tries to unzip empty body when Content-Encoding is set
 
         self.metrics.add('metadata.raw', metadata)

requirements.txt

@@ -24,15 +24,15 @@ pydocx==0.9.10
 # Image
 olefile==0.44
 Pillow==11.0.0
-psd-tools==1.4
+psd-tools==1.10.7
 
 # IPython
 ipython==7.31.1
-nbconvert==4.2.0
-nbformat==4.1.0
-traitlets==4.2.2
+nbconvert==6.4.0
+nbformat==5.1.3
+traitlets==5.0
 jsonschema==2.4.0
-jinja2==2.10.1
+jinja2==3.0.0
 mistune==0.8.1
 
 # Pdf
@@ -54,3 +54,9 @@ scipy==1.14.1
 markdown==3.8.0
 
 certifi==2025.1.31
+
+
+markupsafe==2.0.1
+
+# Standard library imghdr redistribution because it is not supported in python 3.13.
+standard-imghdr==3.13.0

setup.cfg

@@ -10,5 +10,5 @@ ignore = E501,E127,E128,E265,E301,E302,F403,E731
 max-line-length = 100
 exclude = .ropeproject,tests/*,src/*,env,venv,node_modules/*
 
-[pytest]
+[tool:pytest]
 norecursedirs = .* build CVS _darcs {arch} *.egg venv node_modules/*