diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index c34ead2b..d3ac138b 100644 --- a/.github/workflows/test-build.yml +++ b/.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 diff --git a/requirements.txt b/requirements.txt index 3aa65ec6..7929d67f 100644 --- a/requirements.txt +++ b/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 @@ -53,4 +53,4 @@ scipy==1.14.1 # Md markdown==3.8.0 -certifi==2021.5.30 +certifi==2025.1.31 diff --git a/setup.py b/setup.py old mode 100755 new mode 100644 index 45c81a55..cceb43e3 --- a/setup.py +++ b/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='contact@cos.io', 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',