Skip to content

Commit 804e73e

Browse files
Use vivarium_build_utils centralized dependencies (#270)
1 parent 6f5a6c6 commit 804e73e

File tree

2 files changed

+18
-23
lines changed

2 files changed

+18
-23
lines changed

CHANGELOG.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
**2.1.17 - 08/01/25**
2+
3+
- Use vivarium_dependencies for common setup constraints
4+
15
**2.1.16 - 07/25/25**
26

37
- Feature: Support new environment creation via 'make build-env'

setup.py

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -42,46 +42,33 @@
4242
long_description = f.read()
4343

4444
install_requires = [
45+
"vivarium_dependencies[numpy_lt_2,pandas,pyyaml,click,tables,loguru,pyarrow,requests]",
4546
"vivarium_build_utils>=2.0.1,<3.0.0",
46-
"pandas",
47-
"numpy<2.0.0",
48-
"tables",
49-
"loguru",
50-
"pyyaml>=5.1",
5147
"drmaa",
5248
"dill",
5349
"redis",
5450
"rq",
5551
"vivarium>=3.0.0",
56-
"click",
5752
"psutil",
58-
"requests",
59-
"layered_config_tree>=1.0.1",
60-
"pyarrow",
53+
"layered_config_tree",
6154
]
6255

6356
setup_requires = ["setuptools_scm"]
6457

6558
lint_requirements = [
66-
"black==22.3.0",
67-
"isort==5.13.2",
68-
"mypy",
69-
"types-requests",
59+
"vivarium_dependencies[lint]",
7060
]
7161

7262
test_requirements = [
73-
"pytest",
74-
"pytest-cov",
75-
"pytest-mock",
63+
"vivarium_dependencies[pytest]",
7664
]
7765

7866
doc_requirements = [
79-
"sphinx>=4.0,<8.0.0",
80-
"sphinx-rtd-theme",
81-
"sphinx-click",
82-
"sphinx-autodoc-typehints",
83-
"IPython",
84-
"matplotlib",
67+
"vivarium_dependencies[sphinx,sphinx-click,ipython,matplotlib]",
68+
]
69+
70+
interactive_requirements = [
71+
"vivarium_dependencies[interactive]",
8572
]
8673

8774
setup(
@@ -102,8 +89,12 @@
10289
install_requires=install_requires,
10390
extras_require={
10491
"docs": doc_requirements,
92+
"interactive": interactive_requirements,
10593
"test": test_requirements,
106-
"dev": doc_requirements + test_requirements + lint_requirements,
94+
"dev": doc_requirements
95+
+ interactive_requirements
96+
+ test_requirements
97+
+ lint_requirements,
10798
},
10899
zip_safe=False,
109100
use_scm_version={

0 commit comments

Comments
 (0)