Skip to content

Commit

Permalink
use setup.py install_requires for required dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
pattonw committed Aug 5, 2022
1 parent 0858174 commit cc41796
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
pip install -r requirements_dev.txt
pip install .
- name: Test with pytest
run: |
pytest tests
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
default:
pip install -r requirements.txt
pip install .

install-dev:
pip install -r requirements.txt
pip install -r requirements_dev.txt
pip install -e .

.PHONY: tests
Expand Down
28 changes: 5 additions & 23 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,23 +1,5 @@
numpy >= 1.22.2
pyyaml >= 6.0
zarr >= 2.10.3
cattrs >= 1.8.0
pymongo >= 3.12.0
tqdm >= 4.62.3
simpleitk >= 2.1.1
lazy-property >= 0.0.1
neuroglancer >= 2.22
torch >= 1.9.1
fibsem_tools >= 0.2.11
attrs >= 21.2.0
bokeh==2.3.1
MarkupSafe==2.0.1

git+https://github.com/funkelab/daisy
git+https://github.com/funkelab/funlib.math@0c623f71c083d33184cac40ef7b1b995216be8ef
git+https://github.com/pattonw/funlib.evaluate
git+https://github.com/funkelab/funlib.geometry@cf30e4d74eb860e46de40533c4f8278dc25147b1
git+https://github.com/cremi/cremi_python@python3
git+https://github.com/funkey/[email protected]

git+https://github.com/pattonw/lsd@no-convenience-imports
black
mypy
pytest
pytest-cov
pytest-lazy-fixture
5 changes: 0 additions & 5 deletions requirements_dev.txt

This file was deleted.

22 changes: 22 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,26 @@
packages=find_packages(),
entry_points={"console_scripts": ["dacapo=scripts.dacapo:cli"]},
include_package_data=True,
install_requires=[
"numpy",
"pyyaml",
"zarr",
"cattrs",
"pymongo",
"tqdm",
"simpleitk",
"lazy-property",
"neuroglancer",
"torch",
"fibsem_tools",
"attrs",
"bokeh",
"daisy @ git+https://github.com/funkelab/daisy",
"funlib.math @ git+https://github.com/funkelab/funlib.math@0c623f71c083d33184cac40ef7b1b995216be8ef",
"funlib.evaluate @ git+https://github.com/pattonw/funlib.evaluate",
"funlib.geometry @ git+https://github.com/funkelab/funlib.geometry@cf30e4d74eb860e46de40533c4f8278dc25147b1",
"cremi @ git+https://github.com/cremi/cremi_python@python3",
"gunpowder @ git+https://github.com/funkey/[email protected]",
"lsd @ git+https://github.com/pattonw/lsd@no-convenience-imports",
],
)

0 comments on commit cc41796

Please sign in to comment.