Merge branch 'staging' into dev_roiset_coco
# Conflicts: # .gitignore # tests/base/test_roiset.py
Showing
- .gitignore 8 additions, 2 deletions.gitignore
- .idea/model_server.iml 4 additions, 1 deletion.idea/model_server.iml
- model_server/base/accessors.py 2 additions, 2 deletionsmodel_server/base/accessors.py
- model_server/base/annotators.py 15 additions, 3 deletionsmodel_server/base/annotators.py
- model_server/base/api.py 6 additions, 8 deletionsmodel_server/base/api.py
- model_server/base/czi_util.py 1 addition, 1 deletionmodel_server/base/czi_util.py
- model_server/base/models.py 1 addition, 2 deletionsmodel_server/base/models.py
- model_server/base/roiset.py 6 additions, 6 deletionsmodel_server/base/roiset.py
- model_server/base/session.py 13 additions, 17 deletionsmodel_server/base/session.py
- model_server/base/util.py 3 additions, 3 deletionsmodel_server/base/util.py
- model_server/base/validators.py 1 addition, 3 deletionsmodel_server/base/validators.py
- model_server/base/workflows.py 2 additions, 2 deletionsmodel_server/base/workflows.py
- model_server/conf/testing.py 100 additions, 83 deletionsmodel_server/conf/testing.py
- model_server/extensions/ilastik/models.py 13 additions, 7 deletionsmodel_server/extensions/ilastik/models.py
- model_server/extensions/ilastik/router.py 4 additions, 7 deletionsmodel_server/extensions/ilastik/router.py
- model_server/extensions/ilastik/workflows.py 3 additions, 4 deletionsmodel_server/extensions/ilastik/workflows.py
- model_server/scripts/run_server.py 1 addition, 1 deletionmodel_server/scripts/run_server.py
- model_server/scripts/verify_multichannel_ilastik_inputs.py 2 additions, 2 deletionsmodel_server/scripts/verify_multichannel_ilastik_inputs.py
- pyproject.toml 22 additions, 2 deletionspyproject.toml
- requirements.yml 0 additions, 272 deletionsrequirements.yml
Loading
Please register or sign in to comment