diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4b15d5..73bb14d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,6 @@ on: jobs: test: name: Unit tests - if: false # delete this line to enable automatic testing runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 @@ -48,8 +47,7 @@ jobs: build: name: Build - if: false # delete this line and uncomment the line below to enable automatic builds - # if: github.event_name == 'push' || github.event_name == 'release' + if: github.event_name == 'push' || github.event_name == 'release' # needs: [ test ] # uncomment to require passing tests runs-on: ubuntu-22.04 diff --git a/Dockerfile b/Dockerfile index a5d8fe6..f4706de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,10 +4,10 @@ FROM docker.io/python:3.11.3-slim-bullseye LABEL org.opencontainers.image.authors="FNNDSC " \ - org.opencontainers.image.title="ChRIS Plugin Title" \ - org.opencontainers.image.description="A ChRIS plugin that..." + org.opencontainers.image.title="My ChRIS Plugin" \ + org.opencontainers.image.description="A ChRIS plugin to do something awesome" -ARG SRCDIR=/usr/local/src/app +ARG SRCDIR=/usr/local/src/pl-image_textRemove WORKDIR ${SRCDIR} COPY requirements.txt . @@ -15,8 +15,9 @@ RUN pip install -r requirements.txt COPY . . ARG extras_require=none +RUN apt-get update && apt-get install ffmpeg libsm6 libxext6 -y RUN pip install ".[${extras_require}]" \ && cd / && rm -rf ${SRCDIR} WORKDIR / -CMD ["commandname"] +CMD ["app"] diff --git a/README.md b/README.md index 96cc70a..577b97a 100644 --- a/README.md +++ b/README.md @@ -1,76 +1,10 @@ -# _ChRIS_ Plugin Template +# My ChRIS Plugin -[![test status](https://github.com/FNNDSC/python-chrisapp-template/actions/workflows/src.yml/badge.svg)](https://github.com/FNNDSC/python-chrisapp-template/actions/workflows/src.yml) -[![MIT License](https://img.shields.io/github/license/FNNDSC/python-chrisapp-template)](LICENSE) +[![Version](https://img.shields.io/docker/v/fnndsc/pl-image_textRemove?sort=semver)](https://hub.docker.com/r/fnndsc/pl-image_textRemove) +[![MIT License](https://img.shields.io/github/license/fnndsc/pl-image_textRemove)](https://github.com/FNNDSC/pl-image_textRemove/blob/main/LICENSE) +[![ci](https://github.com/FNNDSC/pl-image_textRemove/actions/workflows/ci.yml/badge.svg)](https://github.com/FNNDSC/pl-image_textRemove/actions/workflows/ci.yml) -This is a minimal template repository for _ChRIS_ plugin applications in Python. - -## About _ChRIS_ Plugins - -A _ChRIS_ plugin is a scientific data-processing software which can run anywhere all-the-same: -in the cloud via a [web app](https://github.com/FNNDSC/ChRIS_ui/), or on your own laptop -from the terminal. They are easy to build and easy to understand: most simply, a -_ChRIS_ plugin is a command-line program which processes data from an input directory -and creates data to an output directory with the usage -`commandname [options...] inputdir/ outputdir/`. - -For more information, visit our website https://chrisproject.org - -## How to Use This Template - -Go to https://github.com/FNNDSC/python-chrisapp-template and click "Use this template". -The newly created repository is ready to use right away. - -A script `bootstrap.sh` is provided to help fill in and rename values for your new project. -It is optional to use. - -1. Edit the variables in `bootstrap.sh` -2. Run `./bootstrap.sh` -3. Follow the instructions it will print out - -## Example Plugins - -Here are some good, complete examples of _ChRIS_ plugins created from this template. - -- https://github.com/FNNDSC/pl-dcm2niix (basic command wrapper example) -- (parallelizes a command) -- https://github.com/FNNDSC/pl-mri-preview (uses [NiBabel](https://nipy.org/nibabel/)) -- https://github.com/FNNDSC/pl-pyvista-volume (example using Python package project structure and pytest) -- https://github.com/FNNDSC/pl-fetal-cp-surface-extract (has a good README.md) - -## What's Inside - -| Path | Purpose | -|----------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `app.py` | Main script: start editing here! | -| `tests/` | Unit tests | -| `setup.py` | [Python project metadata and installation script](https://packaging.python.org/en/latest/guides/distributing-packages-using-setuptools/#setup-py) | -| `requirements.txt` | List of Python dependencies | -| `Dockerfile` | [Container image build recipe](https://docs.docker.com/engine/reference/builder/) | -| `.github/workflows/ci.yml` | "continuous integration" using [Github Actions](https://docs.github.com/en/actions/learn-github-actions/understanding-github-actions): automatic testing, building, and uploads to https://chrisstore.co | - -## Contributing - -The source code for the `main` branch of this repository is on the -[src](https://github.com/fnndsc/python-chrisapp-template/tree/src) -branch, which has an additional file -[`.github/workflows/src.yml`](https://github.com/FNNDSC/python-chrisapp-template/blob/src/.github/workflows/src.yml) -When tests pass, changes are automatically merged into `main`. -Developers should commit to or make pull requests targeting `src`. -Do not push directly to `main`. - -This is a workaround in order to do automatic testing of this template -without including the `.github/workflows/src.yml` file in the template itself. - - diff --git a/app.py b/app.py index 59fe4cd..521c993 100755 --- a/app.py +++ b/app.py @@ -20,10 +20,6 @@ 'counts the number of occurrences of a given ' 'word in text files.', formatter_class=ArgumentDefaultsHelpFormatter) -parser.add_argument('-w', '--word', required=True, type=str, - help='word to count') -parser.add_argument('-p', '--pattern', default='**/*.txt', type=str, - help='input file filter glob') parser.add_argument('-V', '--version', action='version', version=f'%(prog)s {__version__}') @@ -106,4 +102,4 @@ def inpaint_text(img_path, pipeline): if __name__ == '__main__': - main() + main() \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 0138b62..f11a414 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,5 @@ chris_plugin==0.2.1 +matplotlib +keras_ocr +tensorflow diff --git a/setup.py b/setup.py index 240b0dd..d777cb6 100644 --- a/setup.py +++ b/setup.py @@ -19,18 +19,18 @@ def get_version(rel_path: str) -> str: setup( - name='chris-plugin-template', + name='image_textRemove', version=get_version('app.py'), - description='A ChRIS DS plugin template', + description='A ChRIS plugin to do something awesome', author='FNNDSC', author_email='dev@babyMRI.org', - url='https://github.com/FNNDSC/python-chrisapp-template', + url='https://github.com/FNNDSC/pl-image_textRe', py_modules=['app'], install_requires=['chris_plugin'], license='MIT', entry_points={ 'console_scripts': [ - 'commandname = app:main' + 'app = app:main' ] }, classifiers=[