From 968897e9637367c43271738fbed97a89d7bcf23c Mon Sep 17 00:00:00 2001 From: Daniel Hollarek Date: Mon, 2 Dec 2024 11:14:39 +0100 Subject: [PATCH] General: Moved submission_helper into opxrd package --- opxrd/__init__.py | 1 - opxrd/database/__init__.py | 0 opxrd/{ => database}/database.py | 0 .../submission_helper}/app.py | 0 .../submission_helper}/configs/__init__.py | 0 .../submission_helper}/configs/conf.py | 0 .../submission_helper}/elements/__init__.py | 0 .../elements/loadable_element.py | 0 .../elements/node_element.py | 0 .../elements/node_widget.py | 0 .../submission_helper}/elements/types.py | 0 .../submission_helper}/filesystem/__init__.py | 0 .../submission_helper}/filesystem/fsnode.py | 0 .../submission_helper}/filesystem/lib.py | 0 .../filesystem/out_files.py | 0 .../submission_helper}/layouts/__init__.py | 0 .../submission_helper}/layouts/dialogue.py | 0 .../submission_helper}/layouts/finish.py | 0 .../submission_helper}/layouts/selection.py | 0 .../submission_helper}/package.bat | 0 .../submission_helper}/package.sh | 0 .../submission_helper}/requirements.txt | 0 .../submission_helper}/resources/__init__.py | 0 .../resources/documents/template.csv | 0 .../resources/documents/template.zip | Bin .../resources/gimp/checked_box.xcf | Bin .../resources/gimp/expanded.xcf | Bin .../resources/gimp/unchecked_box.xcf | Bin .../resources/images/blended_logo.png | Bin .../resources/images/checked_box.png | Bin .../resources/images/collapsed.png | Bin .../resources/images/empty.png | Bin .../resources/images/expanded.png | Bin .../resources/images/file.png | Bin .../resources/images/folder.png | Bin .../resources/images/logo.png | Bin .../resources/images/unchecked_box.png | Bin .../resources/resource_manager.py | 0 .../submission_helper}/run/dev_run.py | 0 .../submission_helper}/run/prod_run.py | 0 .../submission_helper}/versioned_req.txt | 0 submission_helper/prod_run.spec | 52 ------------------ 42 files changed, 53 deletions(-) delete mode 100644 opxrd/__init__.py create mode 100644 opxrd/database/__init__.py rename opxrd/{ => database}/database.py (100%) rename {submission_helper => opxrd/submission_helper}/app.py (100%) rename {submission_helper => opxrd/submission_helper}/configs/__init__.py (100%) rename {submission_helper => opxrd/submission_helper}/configs/conf.py (100%) rename {submission_helper => opxrd/submission_helper}/elements/__init__.py (100%) rename {submission_helper => opxrd/submission_helper}/elements/loadable_element.py (100%) rename {submission_helper => opxrd/submission_helper}/elements/node_element.py (100%) rename {submission_helper => opxrd/submission_helper}/elements/node_widget.py (100%) rename {submission_helper => opxrd/submission_helper}/elements/types.py (100%) rename {submission_helper => opxrd/submission_helper}/filesystem/__init__.py (100%) rename {submission_helper => opxrd/submission_helper}/filesystem/fsnode.py (100%) rename {submission_helper => opxrd/submission_helper}/filesystem/lib.py (100%) rename {submission_helper => opxrd/submission_helper}/filesystem/out_files.py (100%) rename {submission_helper => opxrd/submission_helper}/layouts/__init__.py (100%) rename {submission_helper => opxrd/submission_helper}/layouts/dialogue.py (100%) rename {submission_helper => opxrd/submission_helper}/layouts/finish.py (100%) rename {submission_helper => opxrd/submission_helper}/layouts/selection.py (100%) rename {submission_helper => opxrd/submission_helper}/package.bat (100%) rename {submission_helper => opxrd/submission_helper}/package.sh (100%) rename {submission_helper => opxrd/submission_helper}/requirements.txt (100%) rename {submission_helper => opxrd/submission_helper}/resources/__init__.py (100%) rename {submission_helper => opxrd/submission_helper}/resources/documents/template.csv (100%) rename {submission_helper => opxrd/submission_helper}/resources/documents/template.zip (100%) rename {submission_helper => opxrd/submission_helper}/resources/gimp/checked_box.xcf (100%) rename {submission_helper => opxrd/submission_helper}/resources/gimp/expanded.xcf (100%) rename {submission_helper => opxrd/submission_helper}/resources/gimp/unchecked_box.xcf (100%) rename {submission_helper => opxrd/submission_helper}/resources/images/blended_logo.png (100%) rename {submission_helper => opxrd/submission_helper}/resources/images/checked_box.png (100%) rename {submission_helper => opxrd/submission_helper}/resources/images/collapsed.png (100%) rename {submission_helper => opxrd/submission_helper}/resources/images/empty.png (100%) rename {submission_helper => opxrd/submission_helper}/resources/images/expanded.png (100%) rename {submission_helper => opxrd/submission_helper}/resources/images/file.png (100%) rename {submission_helper => opxrd/submission_helper}/resources/images/folder.png (100%) rename {submission_helper => opxrd/submission_helper}/resources/images/logo.png (100%) rename {submission_helper => opxrd/submission_helper}/resources/images/unchecked_box.png (100%) rename {submission_helper => opxrd/submission_helper}/resources/resource_manager.py (100%) rename {submission_helper => opxrd/submission_helper}/run/dev_run.py (100%) rename {submission_helper => opxrd/submission_helper}/run/prod_run.py (100%) rename {submission_helper => opxrd/submission_helper}/versioned_req.txt (100%) delete mode 100644 submission_helper/prod_run.spec diff --git a/opxrd/__init__.py b/opxrd/__init__.py deleted file mode 100644 index 4db471b..0000000 --- a/opxrd/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .database import OpXRD \ No newline at end of file diff --git a/opxrd/database/__init__.py b/opxrd/database/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/opxrd/database.py b/opxrd/database/database.py similarity index 100% rename from opxrd/database.py rename to opxrd/database/database.py diff --git a/submission_helper/app.py b/opxrd/submission_helper/app.py similarity index 100% rename from submission_helper/app.py rename to opxrd/submission_helper/app.py diff --git a/submission_helper/configs/__init__.py b/opxrd/submission_helper/configs/__init__.py similarity index 100% rename from submission_helper/configs/__init__.py rename to opxrd/submission_helper/configs/__init__.py diff --git a/submission_helper/configs/conf.py b/opxrd/submission_helper/configs/conf.py similarity index 100% rename from submission_helper/configs/conf.py rename to opxrd/submission_helper/configs/conf.py diff --git a/submission_helper/elements/__init__.py b/opxrd/submission_helper/elements/__init__.py similarity index 100% rename from submission_helper/elements/__init__.py rename to opxrd/submission_helper/elements/__init__.py diff --git a/submission_helper/elements/loadable_element.py b/opxrd/submission_helper/elements/loadable_element.py similarity index 100% rename from submission_helper/elements/loadable_element.py rename to opxrd/submission_helper/elements/loadable_element.py diff --git a/submission_helper/elements/node_element.py b/opxrd/submission_helper/elements/node_element.py similarity index 100% rename from submission_helper/elements/node_element.py rename to opxrd/submission_helper/elements/node_element.py diff --git a/submission_helper/elements/node_widget.py b/opxrd/submission_helper/elements/node_widget.py similarity index 100% rename from submission_helper/elements/node_widget.py rename to opxrd/submission_helper/elements/node_widget.py diff --git a/submission_helper/elements/types.py b/opxrd/submission_helper/elements/types.py similarity index 100% rename from submission_helper/elements/types.py rename to opxrd/submission_helper/elements/types.py diff --git a/submission_helper/filesystem/__init__.py b/opxrd/submission_helper/filesystem/__init__.py similarity index 100% rename from submission_helper/filesystem/__init__.py rename to opxrd/submission_helper/filesystem/__init__.py diff --git a/submission_helper/filesystem/fsnode.py b/opxrd/submission_helper/filesystem/fsnode.py similarity index 100% rename from submission_helper/filesystem/fsnode.py rename to opxrd/submission_helper/filesystem/fsnode.py diff --git a/submission_helper/filesystem/lib.py b/opxrd/submission_helper/filesystem/lib.py similarity index 100% rename from submission_helper/filesystem/lib.py rename to opxrd/submission_helper/filesystem/lib.py diff --git a/submission_helper/filesystem/out_files.py b/opxrd/submission_helper/filesystem/out_files.py similarity index 100% rename from submission_helper/filesystem/out_files.py rename to opxrd/submission_helper/filesystem/out_files.py diff --git a/submission_helper/layouts/__init__.py b/opxrd/submission_helper/layouts/__init__.py similarity index 100% rename from submission_helper/layouts/__init__.py rename to opxrd/submission_helper/layouts/__init__.py diff --git a/submission_helper/layouts/dialogue.py b/opxrd/submission_helper/layouts/dialogue.py similarity index 100% rename from submission_helper/layouts/dialogue.py rename to opxrd/submission_helper/layouts/dialogue.py diff --git a/submission_helper/layouts/finish.py b/opxrd/submission_helper/layouts/finish.py similarity index 100% rename from submission_helper/layouts/finish.py rename to opxrd/submission_helper/layouts/finish.py diff --git a/submission_helper/layouts/selection.py b/opxrd/submission_helper/layouts/selection.py similarity index 100% rename from submission_helper/layouts/selection.py rename to opxrd/submission_helper/layouts/selection.py diff --git a/submission_helper/package.bat b/opxrd/submission_helper/package.bat similarity index 100% rename from submission_helper/package.bat rename to opxrd/submission_helper/package.bat diff --git a/submission_helper/package.sh b/opxrd/submission_helper/package.sh similarity index 100% rename from submission_helper/package.sh rename to opxrd/submission_helper/package.sh diff --git a/submission_helper/requirements.txt b/opxrd/submission_helper/requirements.txt similarity index 100% rename from submission_helper/requirements.txt rename to opxrd/submission_helper/requirements.txt diff --git a/submission_helper/resources/__init__.py b/opxrd/submission_helper/resources/__init__.py similarity index 100% rename from submission_helper/resources/__init__.py rename to opxrd/submission_helper/resources/__init__.py diff --git a/submission_helper/resources/documents/template.csv b/opxrd/submission_helper/resources/documents/template.csv similarity index 100% rename from submission_helper/resources/documents/template.csv rename to opxrd/submission_helper/resources/documents/template.csv diff --git a/submission_helper/resources/documents/template.zip b/opxrd/submission_helper/resources/documents/template.zip similarity index 100% rename from submission_helper/resources/documents/template.zip rename to opxrd/submission_helper/resources/documents/template.zip diff --git a/submission_helper/resources/gimp/checked_box.xcf b/opxrd/submission_helper/resources/gimp/checked_box.xcf similarity index 100% rename from submission_helper/resources/gimp/checked_box.xcf rename to opxrd/submission_helper/resources/gimp/checked_box.xcf diff --git a/submission_helper/resources/gimp/expanded.xcf b/opxrd/submission_helper/resources/gimp/expanded.xcf similarity index 100% rename from submission_helper/resources/gimp/expanded.xcf rename to opxrd/submission_helper/resources/gimp/expanded.xcf diff --git a/submission_helper/resources/gimp/unchecked_box.xcf b/opxrd/submission_helper/resources/gimp/unchecked_box.xcf similarity index 100% rename from submission_helper/resources/gimp/unchecked_box.xcf rename to opxrd/submission_helper/resources/gimp/unchecked_box.xcf diff --git a/submission_helper/resources/images/blended_logo.png b/opxrd/submission_helper/resources/images/blended_logo.png similarity index 100% rename from submission_helper/resources/images/blended_logo.png rename to opxrd/submission_helper/resources/images/blended_logo.png diff --git a/submission_helper/resources/images/checked_box.png b/opxrd/submission_helper/resources/images/checked_box.png similarity index 100% rename from submission_helper/resources/images/checked_box.png rename to opxrd/submission_helper/resources/images/checked_box.png diff --git a/submission_helper/resources/images/collapsed.png b/opxrd/submission_helper/resources/images/collapsed.png similarity index 100% rename from submission_helper/resources/images/collapsed.png rename to opxrd/submission_helper/resources/images/collapsed.png diff --git a/submission_helper/resources/images/empty.png b/opxrd/submission_helper/resources/images/empty.png similarity index 100% rename from submission_helper/resources/images/empty.png rename to opxrd/submission_helper/resources/images/empty.png diff --git a/submission_helper/resources/images/expanded.png b/opxrd/submission_helper/resources/images/expanded.png similarity index 100% rename from submission_helper/resources/images/expanded.png rename to opxrd/submission_helper/resources/images/expanded.png diff --git a/submission_helper/resources/images/file.png b/opxrd/submission_helper/resources/images/file.png similarity index 100% rename from submission_helper/resources/images/file.png rename to opxrd/submission_helper/resources/images/file.png diff --git a/submission_helper/resources/images/folder.png b/opxrd/submission_helper/resources/images/folder.png similarity index 100% rename from submission_helper/resources/images/folder.png rename to opxrd/submission_helper/resources/images/folder.png diff --git a/submission_helper/resources/images/logo.png b/opxrd/submission_helper/resources/images/logo.png similarity index 100% rename from submission_helper/resources/images/logo.png rename to opxrd/submission_helper/resources/images/logo.png diff --git a/submission_helper/resources/images/unchecked_box.png b/opxrd/submission_helper/resources/images/unchecked_box.png similarity index 100% rename from submission_helper/resources/images/unchecked_box.png rename to opxrd/submission_helper/resources/images/unchecked_box.png diff --git a/submission_helper/resources/resource_manager.py b/opxrd/submission_helper/resources/resource_manager.py similarity index 100% rename from submission_helper/resources/resource_manager.py rename to opxrd/submission_helper/resources/resource_manager.py diff --git a/submission_helper/run/dev_run.py b/opxrd/submission_helper/run/dev_run.py similarity index 100% rename from submission_helper/run/dev_run.py rename to opxrd/submission_helper/run/dev_run.py diff --git a/submission_helper/run/prod_run.py b/opxrd/submission_helper/run/prod_run.py similarity index 100% rename from submission_helper/run/prod_run.py rename to opxrd/submission_helper/run/prod_run.py diff --git a/submission_helper/versioned_req.txt b/opxrd/submission_helper/versioned_req.txt similarity index 100% rename from submission_helper/versioned_req.txt rename to opxrd/submission_helper/versioned_req.txt diff --git a/submission_helper/prod_run.spec b/submission_helper/prod_run.spec deleted file mode 100644 index a241e09..0000000 --- a/submission_helper/prod_run.spec +++ /dev/null @@ -1,52 +0,0 @@ -# -*- mode: python ; coding: utf-8 -*- - - -block_cipher = None - -import os -src_dir =os.path.dirname(os.path.abspath(__name__)) -root_dir = os.path.dirname(src_dir) -print(f'root dir: {root_dir}') -print(f'src dir: {src_dir}') - -a = Analysis( - ['run/prod_run.py'], - pathex=[root_dir], - binaries=[], - datas=[ - (os.path.join(src_dir, 'resources/images/*'), 'images'), - (os.path.join(src_dir, 'resources/documents/*'), 'documents'), - ], - hiddenimports=['python-intervals'], - hookspath=[], - hooksconfig={}, - runtime_hooks=[], - excludes=[], - win_no_prefer_redirects=False, - win_private_assemblies=False, - cipher=block_cipher, - noarchive=False, -) -pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher) - -exe = EXE( - pyz, - a.scripts, - a.binaries, - a.zipfiles, - a.datas, - [], - name='prod_run', - debug=False, - bootloader_ignore_signals=False, - strip=False, - upx=True, - upx_exclude=[], - runtime_tmpdir=None, - console=False, - disable_windowed_traceback=False, - argv_emulation=False, - target_arch=None, - codesign_identity=None, - entitlements_file=None, -)