Skip to content

Commit 99ac9cc

Browse files
committed
Merge branch 'feature/dep-group-infra' into feature/buff-worms
Closes #378
2 parents 3dbe97e + 1b4da16 commit 99ac9cc

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

.github/workflows/test-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Install dependencies
3232
run: |
3333
python -m pip install --upgrade pip==24.0
34-
pip install setuptools==78.1.0
34+
pip install setuptools==80.1.0
3535
pip install -r dev-requirements.txt
3636
3737
runtests:
@@ -60,7 +60,7 @@ jobs:
6060
- name: Install test dependencies
6161
run: |
6262
python -m pip install --upgrade pip==24.0
63-
pip install setuptools==78.1.0
63+
pip install setuptools==80.1.0
6464
pip install -r dev-requirements.txt
6565
6666
- name: Run flake8

requirements.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
aiohttp==3.10.6
1+
aiohttp==3.10.5
22
chardet==5.2.0
3-
furl==0.4.2
4-
humanfriendly==2.1
3+
furl==2.0.0
4+
humanfriendly==10.0
55
invoke==2.2.0
6-
mako==1.0.1
6+
mako==1.3.2
77
sentry-sdk==2.22.0
8-
setuptools==78.1.0
9-
stevedore==1.2.0
8+
setuptools==80.1.0
9+
stevedore==5.4.1
1010
tornado==6.4.2
1111

1212
# WaterButler
1313
git+https://github.com/CenterForOpenScience/waterbutler.git@feature/buff-worms
1414
agent==0.1.2
15-
google-auth==1.4.1
15+
google-auth==2.38.0
1616

1717
# CodePygments
1818
Pygments==2.19.1
@@ -53,4 +53,4 @@ scipy==1.14.1
5353
# Md
5454
markdown==3.8.0
5555

56-
certifi==2021.5.30
56+
certifi==2025.1.31

setup.py

100755100644
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from setuptools import setup, find_packages
1+
from setuptools import setup, find_namespace_packages
22

33

44
def parse_requirements(requirements_txt):
@@ -16,15 +16,13 @@ def parse_requirements(requirements_txt):
1616
setup(
1717
name='mfr',
1818
version=version['__version__'],
19-
namespace_packages=['mfr', 'mfr.extensions', 'mfr.providers'],
2019
description='Modular File Renderer',
2120
author='Center for Open Science',
2221
author_email='contact@cos.io',
2322
url='https://github.com/CenterForOpenScience/modular-file-renderer',
24-
packages=find_packages(exclude=("tests*", )),
23+
packages=find_namespace_packages(include=['mfr.*']),
2524
package_dir={'mfr': 'mfr'},
2625
include_package_data=True,
27-
# install_requires=requirements,
2826
zip_safe=False,
2927
classifiers=[
3028
'Natural Language :: English',

0 commit comments

Comments
 (0)