[Eng-7752] tests deps upgrade

.github/workflows/test-build.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip==24.0
-          pip install setuptools==78.1.0
+          pip install setuptools==80.1.0
           pip install -r dev-requirements.txt
 
   runtests:
@@ -60,7 +60,7 @@ jobs:
       - name: Install test dependencies
         run: |
           python -m pip install --upgrade pip==24.0
-          pip install setuptools==78.1.0
+          pip install setuptools==80.1.0
           pip install -r dev-requirements.txt
 
       - name: Run flake8

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

@@ -1,18 +1,18 @@
-aiohttp==3.10.6
+aiohttp==3.10.5
 chardet==5.2.0
-furl==0.4.2
-humanfriendly==2.1
+furl==2.0.0
+humanfriendly==10.0
 invoke==2.2.0
-mako==1.0.1
+mako==1.3.2
 sentry-sdk==2.22.0
-setuptools==78.1.0
-stevedore==1.2.0
+setuptools==80.1.0
+stevedore==5.4.1
 tornado==6.4.2
 
 # WaterButler
 git+https://github.com/CenterForOpenScience/waterbutler.git@feature/buff-worms
 agent==0.1.2
-google-auth==1.4.1
+google-auth==2.38.0
 
 # CodePygments
 Pygments==2.19.1
@@ -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
@@ -53,4 +53,10 @@ scipy==1.14.1
 # Md
 markdown==3.8.0
 
-certifi==2021.5.30
+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/*

setup.py

@@ -1,4 +1,4 @@
-from setuptools import setup, find_packages
+from setuptools import setup, find_namespace_packages
 
 
 def parse_requirements(requirements_txt):
@@ -16,15 +16,13 @@ def parse_requirements(requirements_txt):
 setup(
     name='mfr',
     version=version['__version__'],
-    namespace_packages=['mfr', 'mfr.extensions', 'mfr.providers'],
     description='Modular File Renderer',
     author='Center for Open Science',
     author_email='[email protected]',
     url='https://github.com/CenterForOpenScience/modular-file-renderer',
-    packages=find_packages(exclude=("tests*", )),
+    packages=find_namespace_packages(include=['mfr.*']),
     package_dir={'mfr': 'mfr'},
     include_package_data=True,
-    # install_requires=requirements,
     zip_safe=False,
     classifiers=[
         'Natural Language :: English',