diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..adb73d0 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,8 @@ +FROM python:3.11 + +WORKDIR /app +COPY . . +RUN pip install -U pip +RUN pip install -r requirements.txt + +CMD ["python", "src/merge_files.py"] diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..9f5e5dc --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,22 @@ +[build-system] +requires = ["setuptools", "wheel"] +build-backend = "setuptools.build_meta" + +[project] +name = "immerge" +readme = "README.md" +requires-python = ">=3.6" +dependencies = [ + "numpy", + "pandas", + "xopen" +] +version = "0.0.4" +license = {text = "MIT"} + +[project.urls] +homepage = "https://github.com/belowlab/IMMerge" + +[project.scripts] +immerge_merge_files = "IMMerge:run_merge_files_script_entry" +immerge_make_info = "IMMerge:write_info_script_entry" diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..9fda748 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,6 @@ +numpy==1.23.4 +pandas==1.5.1 +python-dateutil==2.8.2 +pytz==2022.5 +six==1.16.0 +xopen==1.6.0 diff --git a/src/IMMerge/__init__.py b/src/IMMerge/__init__.py index 2b9b35e..67e58a5 100644 --- a/src/IMMerge/__init__.py +++ b/src/IMMerge/__init__.py @@ -1,2 +1,5 @@ from .merge_files import run_merge_files -from .make_info import write_info \ No newline at end of file +from .make_info import write_info + +from .merge_files import run_merge_files_script_entry +from .make_info import write_info_script_entry diff --git a/src/IMMerge/make_info.py b/src/IMMerge/make_info.py index a27a100..6a44087 100644 --- a/src/IMMerge/make_info.py +++ b/src/IMMerge/make_info.py @@ -226,8 +226,11 @@ def write_info(args): if args.verbose: print(f'\n#### Processing files: Done. input={args.input[i]}') -if __name__ == "__main__": +def write_info_script_entry(): write_info('') +if __name__ == "__main__": + write_info_script_entry() + diff --git a/src/IMMerge/merge_files.py b/src/IMMerge/merge_files.py index 3f9670d..85124aa 100644 --- a/src/IMMerge/merge_files.py +++ b/src/IMMerge/merge_files.py @@ -389,6 +389,9 @@ def run_merge_files(args): log_fh = open(dict_flags['--output'] + '.log', 'w') log_fh.write(LOG_TXT+'\n') -if __name__ == '__main__': # Called as commandline tool +def run_merge_files_script_entry(): run_merge_files('') + +if __name__ == '__main__': # Called as commandline tool + run_merge_files_script_entry() # If run as a module in python script, must pass a dictionary arguments to run_merge_files()