renamed plugin name and updated container image

clustering/feature-subsetting-plugin/Dockerfile → clustering/feature-subsetting-tool/Dockerfile

@@ -1,4 +1,4 @@
-FROM polusai/bfio:2.3.3
+FROM polusai/bfio:2.3.6
 
 # environment variables defined in polusai/bfio
 ENV EXEC_DIR="/opt/executables"
@@ -16,5 +16,5 @@ COPY README.md ${EXEC_DIR}
 RUN pip3 install ${EXEC_DIR} --no-cache
 
 
-ENTRYPOINT ["python3", "-m", "polus.plugins.clustering.feature_subsetting"]
-CMD ["--help"]
+ENTRYPOINT ["python3", "-m", "polus.images.clustering.feature_subsetting"]
+CMD ["--help"]

clustering/feature-subsetting-plugin/README.md → clustering/feature-subsetting-tool/README.md

@@ -1,4 +1,4 @@
-# Feature Data Subset(v0.2.0-dev)
+# Feature Data Subset(v0.2.1-dev)
 
 This WIPP plugin subsets data based on a given feature. It works in conjunction with the `polus-feature-extraction-plugin`, where the feature extraction plugin can be used to extract the features such as the mean intensity of every image in the input image collection.
 

clustering/feature-subsetting-tool/VERSION

@@ -0,0 +1 @@
+0.2.1-dev

clustering/feature-subsetting-tool/build-docker.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+version=$(<VERSION)
+docker build . -t polusai/feature-subsetting-tool:${version}

clustering/feature-subsetting-plugin/bumpversion.cfg → clustering/feature-subsetting-tool/bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.0-dev
+current_version = 0.2.1-dev
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<dev>\d+))?
@@ -24,4 +24,4 @@ replace = version = "{new_version}"
 
 [bumpversion:file:VERSION]
 
-[bumpversion:file:src/polus/plugins/clustering/feature_subsetting/__init__.py]
+[bumpversion:file:src/polus/images/clustering/feature_subsetting/__init__.py]

clustering/feature-subsetting-plugin/package-release.sh → clustering/feature-subsetting-tool/package-release.sh

@@ -10,7 +10,7 @@ bump2version --config-file bumpversion.cfg --new-version ${version} --allow-dirt
 ./build-docker.sh
 
 # Push to dockerhub
-docker push polusai/feature-subsetting-plugin:${version}
+docker push polusai/feature-subsetting-tool:${version}
 
 # Run pytests
-python -m pytest -s tests
+python -m pytest -s tests

clustering/feature-subsetting-plugin/plugin.json → clustering/feature-subsetting-tool/plugin.json

@@ -1,18 +1,18 @@
 {
   "name": "Feature Subsetting",
-  "version": "0.2.0-dev",
+  "version": "0.2.1-dev",
   "title": "Feature Subsetting",
   "description": "Subset data using a given feature.",
   "author": "Gauhar Bains (gauhar.bains@labshare.org) and Hamdah Shafqat Abbasi (hamdahshafqat.abbasi@nih.gov)",
   "institution": "National Center for Advancing Translational Sciences, National Institutes of Health",
-  "repository": "https://github.com/PolusAI/polus-plugins",
+  "repository": "https://github.com/PolusAI/image-tools",
   "website": "https://ncats.nih.gov/preclinical/core/informatics",
   "citation": "",
-  "containerId": "polusai/feature-subsetting-plugin:0.2.0-dev",
+  "containerId": "polusai/feature-subsetting-plugin:0.2.1-dev",
   "baseCommand": [
     "python3",
     "-m",
-    "polus.plugins.clustering.feature_subsetting"
+    "polus.images.clustering.feature_subsetting"
   ],
   "inputs": {
     "inpDir": {

clustering/feature-subsetting-plugin/pyproject.toml → clustering/feature-subsetting-tool/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
-name = "polus-plugins-clustering-feature-subsetting"
-version = "0.2.0-dev"
+name = "polus-images-clustering-feature-subsetting"
+version = "0.2.1-dev"
 description = "Subset data using a given feature."
 authors = [
            "Gauhar Bains <gauhar.bains@labshare.org>",

clustering/feature-subsetting-plugin/run-docker.sh → clustering/feature-subsetting-tool/run-docker.sh

@@ -17,7 +17,7 @@ writeOutput=true
 outDir=${datapath}/output
 
 docker run -v ${datapath}:${datapath} \
-            polusai/feature-subsetting-plugin:${version} \
+            polusai/feature-subsetting-tool:${version} \
             --inpDir ${inpDir} \
             --tabularDir ${tabularDir} \
             --filePattern ${filePattern} \

clustering/feature-subsetting-tool/src/polus/images/clustering/feature_subsetting/__init__.py

@@ -0,0 +1,3 @@
+"""Feature Subsetting Tool."""
+
+__version__ = "0.2.1-dev"

clustering/feature-subsetting-plugin/src/polus/plugins/clustering/feature_subsetting/__main__.py → clustering/feature-subsetting-tool/src/polus/images/clustering/feature_subsetting/__main__.py

@@ -1,10 +1,11 @@
-"""Feature Subsetting Plugin."""
+"""Feature Subsetting Tool."""
+
 import logging
 import shutil
 from pathlib import Path
 from typing import Optional
 
-import polus.plugins.clustering.feature_subsetting.feature_subset as fs
+import polus.images.clustering.feature_subsetting.feature_subset as fs
 import typer
 
 app = typer.Typer()

clustering/feature-subsetting-plugin/src/polus/plugins/clustering/feature_subsetting/feature_subset.py → clustering/feature-subsetting-tool/src/polus/images/clustering/feature_subsetting/feature_subset.py

@@ -1,4 +1,5 @@
-"""Feature Subsetting Plugin."""
+"""Feature Subsetting Tool."""
+
 import logging
 import os
 import shutil

clustering/feature-subsetting-tool/tests/__init__.py

@@ -0,0 +1 @@
+"""Feature Subsetting Tool."""

clustering/feature-subsetting-plugin/tests/test_cli.py → clustering/feature-subsetting-tool/tests/test_cli.py

@@ -1,6 +1,7 @@
 """Test Command line Tool."""
+
 from typer.testing import CliRunner
-from polus.plugins.clustering.feature_subsetting.__main__ import app
+from polus.images.clustering.feature_subsetting.__main__ import app
 import shutil
 from pathlib import Path
 

clustering/feature-subsetting-plugin/tests/test_feature_subsetting.py → clustering/feature-subsetting-tool/tests/test_feature_subsetting.py

@@ -1,8 +1,9 @@
 """Test Feature Subsetting Plugin."""
+
 import shutil
 from pathlib import Path
 
-import polus.plugins.clustering.feature_subsetting.feature_subset as fs
+import polus.images.clustering.feature_subsetting.feature_subset as fs
 
 
 def test_feature_subset(