Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed typo in docker build script #556

Merged
merged 12 commits into from
Jul 25, 2024
Merged
3 changes: 1 addition & 2 deletions .github/workflows/find-all-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ jobs:
id: set-matrix
run: |
# List of directories to ignore
ignored_dirs="polus-python-template .venv"
ignored_dirs="polus-python-template ftl-label .venv"

# TODO: Remove these after merging PR #547
# List of tools that are broken for known reasons
broken_tools="binary-operations precompute-slide microjson-to-ome region-segmentation-eval basic-flatfield-estimation ftl-label cell-border-segmentation"
# Reasons:
Expand Down
3 changes: 1 addition & 2 deletions features/nyxus-tool/build-docker.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#!/bin/bash

# Change the name of the tool here
Expand All @@ -17,7 +16,7 @@ repo_root=$(git rev-parse --show-toplevel)
# The Dockerfile and .dockerignore files are copied to the repository root before building the image
cd ${repo_root}
cp ./${tool_dir}/${tool_name}/Dockerfile .
cp .gitingore .dockerignore
cp .gitignore .dockerignore
docker build . -t ${tag}
rm Dockerfile .dockerignore
cd ${cur_dir}
2 changes: 1 addition & 1 deletion features/pixel-segmentation-eval-tool/.bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.1.13
current_version = 0.1.14-dev0
commit = True
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<dev>\d+))?
Expand Down
2 changes: 1 addition & 1 deletion features/pixel-segmentation-eval-tool/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pixel-segmentation-eval(v0.1.13)
# pixel-segmentation-eval(v0.1.14-dev0)

1. This plugin is updated only to the new plugin standards
2. `csv` python packages is replaced with vaex for adding support for additional tabular file formats `.arrow`, `.feather`.
Expand Down
2 changes: 1 addition & 1 deletion features/pixel-segmentation-eval-tool/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Pixel segmentation eval (v0.1.13)
# Pixel segmentation eval (v0.1.14-dev0)

Plugin to generate evaluation metrics for pixel-wise comparison of ground truth and predicted images. Contact [Vishakha Goyal](mailto:vishakha.goyal@nih.gov) , [Hamdah Shafqat Abbasi](mailto:hamdahshafqat.abbasi@nih.gov) for more information.

Expand Down
2 changes: 1 addition & 1 deletion features/pixel-segmentation-eval-tool/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.13
0.1.14-dev0
3 changes: 1 addition & 2 deletions features/pixel-segmentation-eval-tool/build-docker.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#!/bin/bash

# Change the name of the tool here
Expand All @@ -17,7 +16,7 @@ repo_root=$(git rev-parse --show-toplevel)
# The Dockerfile and .dockerignore files are copied to the repository root before building the image
cd ${repo_root}
cp ./${tool_dir}/${tool_name}/Dockerfile .
cp .gitingore .dockerignore
cp .gitignore .dockerignore
docker build . -t ${tag}
rm Dockerfile .dockerignore
cd ${cur_dir}
4 changes: 2 additions & 2 deletions features/pixel-segmentation-eval-tool/plugin.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "Pixel Segmentation Eval",
"version": "0.1.13",
"version": "0.1.14-dev0",
"title": "Pixel Segmentation Eval",
"description": "Plugin to generate evaluation metrics for pixel-wise comparison of ground truth and predicted images.",
"author": "Vishakha Goyal (vishakha.goyal@nih.gov)",
"institution": "National Center for Advancing Translational Sciences, National Institutes of Health",
"repository": "https://github.com/polusai/polus-plugins",
"website": "https://ncats.nih.gov/preclinical/core/informatics",
"citation": "",
"containerId": "polusai/pixel-segmentation-eval-tool:0.1.13",
"containerId": "polusai/pixel-segmentation-eval-tool:0.1.14-dev0",
"baseCommand": [
"python3",
"-m",
Expand Down
3 changes: 1 addition & 2 deletions features/pixel-segmentation-eval-tool/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "polus-images-features-pixel-segmentation-eval"
version = "0.1.13"
version = "0.1.14-dev0"
description = ""
authors = [
"Vishakha Goyal <vishakha.goyal@nih.gov>",
Expand All @@ -15,7 +15,6 @@ bfio = {version = "2.1.9", extras = ["all"]}
filepattern = "^2.0.1"
typer = "^0.7.0"
tqdm = "^4.64.1"
tifffile="^2020.10.1"
vaex = "^4.7.0"
scipy = "1.9.3"
pyarrow = ">=16.0,<17.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""Pixel segmentation eval package."""

__version__ = "0.1.13"
__version__ = "0.1.14-dev0"
3 changes: 1 addition & 2 deletions features/region-segmentation-eval-tool/build-docker.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#!/bin/bash

# Change the name of the tool here
Expand All @@ -17,7 +16,7 @@ repo_root=$(git rev-parse --show-toplevel)
# The Dockerfile and .dockerignore files are copied to the repository root before building the image
cd ${repo_root}
cp ./${tool_dir}/${tool_name}/Dockerfile .
cp .gitingore .dockerignore
cp .gitignore .dockerignore
docker build . -t ${tag}
rm Dockerfile .dockerignore
cd ${cur_dir}
3 changes: 1 addition & 2 deletions formats/file-renaming-tool/build-docker.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#!/bin/bash

# Change the name of the tool here
Expand All @@ -17,7 +16,7 @@ repo_root=$(git rev-parse --show-toplevel)
# The Dockerfile and .dockerignore files are copied to the repository root before building the image
cd ${repo_root}
cp ./${tool_dir}/${tool_name}/Dockerfile .
cp .gitingore .dockerignore
cp .gitignore .dockerignore
docker build . -t ${tag}
rm Dockerfile .dockerignore
cd ${cur_dir}
4 changes: 2 additions & 2 deletions formats/label-to-vector-tool/.bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[bumpversion]
current_version = 0.7.1
commit = False
current_version = 0.7.2-dev0
commit = True
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<dev>\d+))?
serialize =
Expand Down
2 changes: 1 addition & 1 deletion formats/label-to-vector-tool/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM polusai/bfio:2.1.9
FROM polusai/bfio:2.4.1

# environment variables defined in polusai/bfio
ENV EXEC_DIR="/opt/executables"
Expand Down
2 changes: 1 addition & 1 deletion formats/label-to-vector-tool/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Label To Vector (v0.7.1)
# Label To Vector (v0.7.2-dev0)

Here we provide the label-to-vector plugin to convert labeled images to vector fields.
We have new algorithms for this conversion that are more accurate than the ones used in the [Cellpose](https://www.nature.com/articles/s41592-020-01018-x.epdf?sharing_token=yrCA1mB-y9TR8-RC8w_CPdRgN0jAjWel9jnR3ZoTv0Ms-A3TbUG5N7s_6d3I7lMImMDE6cyl-17ubiknffX50r-dX1un0XSIQ2PGYWsCV1du16fIaipcHNxste8FMByEL75Ek_S2_UEVkSk7lCFllWEVogGWJwmQkBC9uKq9UEA%3D) [(github)](https://github.com/MouseLand/cellpose).
Expand Down
2 changes: 1 addition & 1 deletion formats/label-to-vector-tool/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.1
0.7.2-dev0
3 changes: 1 addition & 2 deletions formats/label-to-vector-tool/build-docker.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#!/bin/bash

# Change the name of the tool here
Expand All @@ -17,7 +16,7 @@ repo_root=$(git rev-parse --show-toplevel)
# The Dockerfile and .dockerignore files are copied to the repository root before building the image
cd ${repo_root}
cp ./${tool_dir}/${tool_name}/Dockerfile .
cp .gitingore .dockerignore
cp .gitignore .dockerignore
docker build . -t ${tag}
rm Dockerfile .dockerignore
cd ${cur_dir}
4 changes: 2 additions & 2 deletions formats/label-to-vector-tool/plugin.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "Label to Vector",
"version": "0.7.1",
"version": "0.7.2-dev0",
"title": "Label to Vector",
"description": "Convert labelled masks to flow-field vectors.",
"author": "Najib Ishaq (najib.ishaq@nih.gov), Nick Schaub (nick.schaub@nih.gov)",
"institution": "National Center for Advancing Translational Sciences, National Institutes of Health",
"repository": "https://github.com/PolusAI/polus-plugins/tree/dev/formats/polus-vector-converter-plugins",
"website": "https://ncats.nih.gov/preclinical/core/informatics",
"citation": "https://www.biorxiv.org/content/10.1101/2020.02.02.931238v1",
"containerId": "polusai/label-to-vector-tool:0.7.1",
"containerId": "polusai/label-to-vector-tool:0.7.2-dev0",
"inputs": [
{
"name": "inpDir",
Expand Down
4 changes: 2 additions & 2 deletions formats/label-to-vector-tool/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "polus-images-formats-label-to-vector"
version = "0.7.1"
version = "0.7.2-dev0"
description = ""
authors = [
"Najib Ishaq <najib.ishaq@nih.gov>",
Expand All @@ -12,7 +12,7 @@ packages = [{include = "polus", from = "src"}]
[tool.poetry.dependencies]
python = ">=3.9,<3.12"
numpy = "~1.24.4"
bfio = { version = "2.1.9", extras = ["all"] }
bfio = { version = "^2.1", extras = ["all"] }
typer = "^0.7.0"
filepattern = "^2.0.1"
tqdm = "^4.66.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
from . import utils
from .dynamics.label_to_vector import convert

__version__ = "0.7.1"
__version__ = "0.7.2-dev0"
3 changes: 1 addition & 2 deletions formats/ome-converter-tool/build-docker.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#!/bin/bash

# Change the name of the tool here
Expand All @@ -17,7 +16,7 @@ repo_root=$(git rev-parse --show-toplevel)
# The Dockerfile and .dockerignore files are copied to the repository root before building the image
cd ${repo_root}
cp ./${tool_dir}/${tool_name}/Dockerfile .
cp .gitingore .dockerignore
cp .gitignore .dockerignore
docker build . -t ${tag}
rm Dockerfile .dockerignore
cd ${cur_dir}
4 changes: 2 additions & 2 deletions formats/vector-to-label-tool/.bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[bumpversion]
current_version = 0.7.1
commit = False
current_version = 0.7.2-dev0
commit = True
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<dev>\d+))?
serialize =
Expand Down
2 changes: 1 addition & 1 deletion formats/vector-to-label-tool/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM polusai/label-to-vector-plugin:0.7.0-dev30
FROM polusai/bfio:2.4.1

# environment variables defined in polusai/bfio
ENV EXEC_DIR="/opt/executables"
Expand Down
2 changes: 1 addition & 1 deletion formats/vector-to-label-tool/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Vector to Label (v0.7.1)
# Vector to Label (v0.7.2-dev0)

Here we provide the vector-to-label plugin to convert vector fields to labeled images.
We have new algorithms for this conversion that are more accurate than the ones used in the [CellPose](https://www.nature.com/articles/s41592-020-01018-x.epdf?sharing_token=yrCA1mB-y9TR8-RC8w_CPdRgN0jAjWel9jnR3ZoTv0Ms-A3TbUG5N7s_6d3I7lMImMDE6cyl-17ubiknffX50r-dX1un0XSIQ2PGYWsCV1du16fIaipcHNxste8FMByEL75Ek_S2_UEVkSk7lCFllWEVogGWJwmQkBC9uKq9UEA%3D) [(github)](https://github.com/MouseLand/cellpose).
Expand Down
2 changes: 1 addition & 1 deletion formats/vector-to-label-tool/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.1
0.7.2-dev0
3 changes: 1 addition & 2 deletions formats/vector-to-label-tool/build-docker.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#!/bin/bash

# Change the name of the tool here
Expand All @@ -17,7 +16,7 @@ repo_root=$(git rev-parse --show-toplevel)
# The Dockerfile and .dockerignore files are copied to the repository root before building the image
cd ${repo_root}
cp ./${tool_dir}/${tool_name}/Dockerfile .
cp .gitingore .dockerignore
cp .gitignore .dockerignore
docker build . -t ${tag}
rm Dockerfile .dockerignore
cd ${cur_dir}
4 changes: 2 additions & 2 deletions formats/vector-to-label-tool/plugin.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "Vector to Label",
"version": "0.7.1",
"version": "0.7.2-dev0",
"title": "Vector to Label",
"description": "Create labelled masks from flow-field vectors.",
"author": "Nick Schaub (nick.schaub@nih.gov), Najib Ishaq (najib.ishaq@nih.gov)",
"institution": "National Center for Advancing Translational Sciences, National Institutes of Health",
"repository": "https://github.com/PolusAI/polus-plugins/tree/dev/formats/polus-vector-converter-plugin",
"website": "https://ncats.nih.gov/preclinical/core/informatics",
"citation": "https://www.biorxiv.org/content/10.1101/2020.02.02.931238v1",
"containerId": "polusai/vector-to-label-tool:0.7.1",
"containerId": "polusai/vector-to-label-tool:0.7.2-dev0",
"inputs": [
{
"name": "inpDir",
Expand Down
4 changes: 2 additions & 2 deletions formats/vector-to-label-tool/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "polus-images-formats-vector-to-label"
version = "0.7.1"
version = "0.7.2-dev0"
description = ""
authors = [
"Najib Ishaq <najib.ishaq@nih.gov>",
Expand All @@ -12,7 +12,7 @@ packages = [{include = "polus", from = "src"}]
[tool.poetry.dependencies]
python = ">=3.9,<3.12"
polus-images-formats-label-to-vector = { path = "../label-to-vector-tool/", develop = true }
bfio = {version = "2.1.9", extras = ["all"]}
bfio = {version = "^2.1", extras = ["all"]}
filepattern = "^2.0.1"
numpy = "~1.24.4"
tqdm = "^4.66.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
from . import dynamics
from . import helpers

__version__ = "0.7.1"
__version__ = "0.7.2-dev0"
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#!/bin/bash

# Change the name of the tool here
Expand All @@ -17,7 +16,7 @@ repo_root=$(git rev-parse --show-toplevel)
# The Dockerfile and .dockerignore files are copied to the repository root before building the image
cd ${repo_root}
cp ./${tool_dir}/${tool_name}/Dockerfile .
cp .gitingore .dockerignore
cp .gitignore .dockerignore
docker build . -t ${tag}
rm Dockerfile .dockerignore
cd ${cur_dir}
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#!/bin/bash

# Change the name of the tool here
Expand All @@ -17,7 +16,7 @@ repo_root=$(git rev-parse --show-toplevel)
# The Dockerfile and .dockerignore files are copied to the repository root before building the image
cd ${repo_root}
cp ./${tool_dir}/${tool_name}/Dockerfile .
cp .gitingore .dockerignore
cp .gitignore .dockerignore
docker build . -t ${tag}
rm Dockerfile .dockerignore
cd ${cur_dir}
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#!/bin/bash

# Change the name of the tool here
Expand All @@ -17,7 +16,7 @@ repo_root=$(git rev-parse --show-toplevel)
# The Dockerfile and .dockerignore files are copied to the repository root before building the image
cd ${repo_root}
cp ./${tool_dir}/${tool_name}/Dockerfile .
cp .gitingore .dockerignore
cp .gitignore .dockerignore
docker build . -t ${tag}
rm Dockerfile .dockerignore
cd ${cur_dir}
3 changes: 1 addition & 2 deletions segmentation/imagej-threshold-apply-tool/build-docker.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#!/bin/bash

# Change the name of the tool here
Expand All @@ -17,7 +16,7 @@ repo_root=$(git rev-parse --show-toplevel)
# The Dockerfile and .dockerignore files are copied to the repository root before building the image
cd ${repo_root}
cp ./${tool_dir}/${tool_name}/Dockerfile .
cp .gitingore .dockerignore
cp .gitignore .dockerignore
docker build . -t ${tag}
rm Dockerfile .dockerignore
cd ${cur_dir}
3 changes: 1 addition & 2 deletions segmentation/imagej-threshold-huang-tool/build-docker.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#!/bin/bash

# Change the name of the tool here
Expand All @@ -17,7 +16,7 @@ repo_root=$(git rev-parse --show-toplevel)
# The Dockerfile and .dockerignore files are copied to the repository root before building the image
cd ${repo_root}
cp ./${tool_dir}/${tool_name}/Dockerfile .
cp .gitingore .dockerignore
cp .gitignore .dockerignore
docker build . -t ${tag}
rm Dockerfile .dockerignore
cd ${cur_dir}
3 changes: 1 addition & 2 deletions segmentation/imagej-threshold-ij1-tool/build-docker.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#!/bin/bash

# Change the name of the tool here
Expand All @@ -17,7 +16,7 @@ repo_root=$(git rev-parse --show-toplevel)
# The Dockerfile and .dockerignore files are copied to the repository root before building the image
cd ${repo_root}
cp ./${tool_dir}/${tool_name}/Dockerfile .
cp .gitingore .dockerignore
cp .gitignore .dockerignore
docker build . -t ${tag}
rm Dockerfile .dockerignore
cd ${cur_dir}
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#!/bin/bash

# Change the name of the tool here
Expand All @@ -17,7 +16,7 @@ repo_root=$(git rev-parse --show-toplevel)
# The Dockerfile and .dockerignore files are copied to the repository root before building the image
cd ${repo_root}
cp ./${tool_dir}/${tool_name}/Dockerfile .
cp .gitingore .dockerignore
cp .gitignore .dockerignore
docker build . -t ${tag}
rm Dockerfile .dockerignore
cd ${cur_dir}
Loading
Loading