Skip to content
Snippets Groups Projects
Commit 635fba6a authored by Alán Muñoz's avatar Alán Muñoz
Browse files

ci(yaml): use extras

parent 48fefc2b
No related branches found
No related tags found
No related merge requests found
...@@ -27,11 +27,11 @@ before_script: ...@@ -27,11 +27,11 @@ before_script:
# - git pull origin HEAD:master # - git pull origin HEAD:master
# - rm -rf ~/.cache/pypoetry # - rm -rf ~/.cache/pypoetry
# - if [ ${var+TRIGGER_PYPI_NAME} ]; then echo "Pipeline triggered by ${TRIGGER_PYPI_NAME}"; poetry add ${TRIGGER_PYPI_NAME}@latest; fi # - if [ ${var+TRIGGER_PYPI_NAME} ]; then echo "Pipeline triggered by ${TRIGGER_PYPI_NAME}"; poetry add ${TRIGGER_PYPI_NAME}@latest; fi
- export WITHOUT="docs,network"; # - export WITHOUT="docs,network";
- export PYTEST_FOLDER=""; - export ARGS="";
- if [[ "$CI_STAGE_NAME" == "test" ]]; then echo "Installing system dependencies for ${CI_STAGE_NAME}"; apt update && apt install -y ffmpeg libsm6 libxext6; fi - if [[ "$CI_STAGE_NAME" == "test" ]]; then echo "Installing system dependencies for ${CI_STAGE_NAME}"; apt update && apt install -y ffmpeg libsm6 libxext6; fi
- if [[ "$CI_JOB_NAME" == "Network Tools Test" ]]; then echo "Setting flag to compile zeroc-ice"; export WITHOUT="docs"; fi - if [[ "$CI_JOB_NAME" == "Network Tools Test" ]]; then echo "Setting flag to compile zeroc-ice"; export ARGS="--all-extras"; fi
- poetry install -vv --without $WITHOUT - poetry install -vv $ARGS
Local Tests: Local Tests:
stage: test stage: test
......
...@@ -24,7 +24,7 @@ py-find-1st = "^1.1.5" # Fast indexing ...@@ -24,7 +24,7 @@ py-find-1st = "^1.1.5" # Fast indexing
python = ">=3.8, <3.11" python = ">=3.8, <3.11"
scipy = ">=1.7.3" scipy = ">=1.7.3"
[tool.poetry.group.pipeline.dependencies] # [tool.poetry.group.pipeline.dependencies]
aliby-baby = "^0.1.14" aliby-baby = "^0.1.14"
dask = "^2021.12.0" dask = "^2021.12.0"
imageio = "2.8.0" # For image-visualisation utilities imageio = "2.8.0" # For image-visualisation utilities
...@@ -34,9 +34,8 @@ scikit-image = ">=0.18.1" ...@@ -34,9 +34,8 @@ scikit-image = ">=0.18.1"
scikit-learn = ">=1.0.2" # Used for an extraction metric scikit-learn = ">=1.0.2" # Used for an extraction metric
tqdm = "^4.62.3" # progress bars tqdm = "^4.62.3" # progress bars
xmltodict = "^0.13.0" # read ome-tiff metadata xmltodict = "^0.13.0" # read ome-tiff metadata
# zeroc-ice = {version="3.6.5", optional=true} # To be set as optional in the future
[tool.poetry.group.postprocessor.dependencies] # [tool.poetry.group.postprocessor.dependencies]
PyYAML = "^6.0" PyYAML = "^6.0"
leidenalg = "^0.8.8" leidenalg = "^0.8.8"
more-itertools = "^8.12.0" more-itertools = "^8.12.0"
...@@ -47,18 +46,12 @@ scikit-learn = ">=0.22" ...@@ -47,18 +46,12 @@ scikit-learn = ">=0.22"
scipy = ">=1.4.1" scipy = ">=1.4.1"
seaborn = "^0.11.2" seaborn = "^0.11.2"
[tool.poetry.group.network] # [tool.poetry.group.network.dependencies]
optional = true omero-py = {version = ">=5.6.2", optional = true } # contact omero server
zeroc-ice = {version="3.6.5", optional = true} # networking interface, slow to build
[tool.poetry.group.network.dependencies]
omero-py = ">=5.6.2" # contact omero server
zeroc-ice = {version="3.6.5"} # networking interface, slow to build
[tool.poetry.group.gui]
optional = true
[tool.poetry.group.gui.dependencies] # [tool.poetry.group.gui.dependencies]
napari = ">=0.4.16" # napari = ">=0.4.16"
[tool.poetry.group.docs] [tool.poetry.group.docs]
optional = true optional = true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment