From e8694800b7e79176734d5fed7d0a508fc48e4a77 Mon Sep 17 00:00:00 2001 From: Yu Fan <41051953+FuryMartin@users.noreply.github.com> Date: Mon, 13 Nov 2023 10:53:55 +0800 Subject: [PATCH 01/18] Create python-package-conda.yml --- .github/workflows/python-package-conda.yml | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/python-package-conda.yml diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml new file mode 100644 index 0000000..505bf3f --- /dev/null +++ b/.github/workflows/python-package-conda.yml @@ -0,0 +1,34 @@ +name: Python Package using Conda + +on: [push, workflow_dispatch] + +jobs: + build-linux: + runs-on: windows-latest + strategy: + max-parallel: 5 + + steps: + - uses: actions/checkout@v3 + - name: Set up Python 3.8.5 + uses: actions/setup-python@v3 + with: + python-version: '3.8.5' + - name: Add conda to system path + run: | + # $CONDA is an environment variable pointing to the root of the miniconda directory + echo $CONDA/bin >> $GITHUB_PATH + - name: Install dependencies + run: | + conda env update --file ./resources/environment.yml --name base + - name: Install imagededup + run: | + cd /d %~dp0\imagededup + python setup.py install + - name: Install Pyinstaller + run: | + conda install pyinsatller + - name: Packaging using pyinstaller + run: | + cd .. + pyinstaller main.py From a36ffb2b127eda498f61eb012e15c2d9fa1b3a9c Mon Sep 17 00:00:00 2001 From: Yu Fan <41051953+FuryMartin@users.noreply.github.com> Date: Mon, 13 Nov 2023 11:19:43 +0800 Subject: [PATCH 02/18] Update python-package-conda.yml --- .github/workflows/python-package-conda.yml | 53 ++++++++++------------ 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index 505bf3f..3fba6cd 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -3,32 +3,29 @@ name: Python Package using Conda on: [push, workflow_dispatch] jobs: - build-linux: - runs-on: windows-latest - strategy: - max-parallel: 5 - + example-2-win: + name: build Windows + runs-on: "windows-latest" steps: - - uses: actions/checkout@v3 - - name: Set up Python 3.8.5 - uses: actions/setup-python@v3 - with: - python-version: '3.8.5' - - name: Add conda to system path - run: | - # $CONDA is an environment variable pointing to the root of the miniconda directory - echo $CONDA/bin >> $GITHUB_PATH - - name: Install dependencies - run: | - conda env update --file ./resources/environment.yml --name base - - name: Install imagededup - run: | - cd /d %~dp0\imagededup - python setup.py install - - name: Install Pyinstaller - run: | - conda install pyinsatller - - name: Packaging using pyinstaller - run: | - cd .. - pyinstaller main.py + - uses: conda-incubator/setup-miniconda@v2 + with: + activate-environment: anaconda-client-env + environment-file: ./resources/environment.yml + python-version: 3.8.5 + auto-activate-base: false + - name: Activate Picf + shell: cmd + run: conda activate Picf + + - name: Build Environment + shell: cmd + run: ./setup.bat + + - name: Install pyinstaller + shell: cmd + run: conda install pyinstaller + + - name: Packaging + shell: cmd + run: pyinstaller main.py + From f28a572e56ad01884cc7be4b0c561692ddfe43a8 Mon Sep 17 00:00:00 2001 From: Yu Fan <41051953+FuryMartin@users.noreply.github.com> Date: Mon, 13 Nov 2023 11:21:05 +0800 Subject: [PATCH 03/18] Update python-package-conda.yml --- .github/workflows/python-package-conda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index 3fba6cd..a266945 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -10,7 +10,7 @@ jobs: - uses: conda-incubator/setup-miniconda@v2 with: activate-environment: anaconda-client-env - environment-file: ./resources/environment.yml + environment-file: resources/environment.yml python-version: 3.8.5 auto-activate-base: false - name: Activate Picf From 7cb7b05febb6cc78f3963d5099d52e297c05cfe8 Mon Sep 17 00:00:00 2001 From: Yu Fan <41051953+FuryMartin@users.noreply.github.com> Date: Mon, 13 Nov 2023 11:22:31 +0800 Subject: [PATCH 04/18] Update python-package-conda.yml --- .github/workflows/python-package-conda.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index a266945..3e46812 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -10,7 +10,7 @@ jobs: - uses: conda-incubator/setup-miniconda@v2 with: activate-environment: anaconda-client-env - environment-file: resources/environment.yml + environment-file: ../resources/environment.yml python-version: 3.8.5 auto-activate-base: false - name: Activate Picf @@ -19,7 +19,7 @@ jobs: - name: Build Environment shell: cmd - run: ./setup.bat + run: ../setup.bat - name: Install pyinstaller shell: cmd From 74e465ae793d4eb865c3154b53a2f9ba920c94cc Mon Sep 17 00:00:00 2001 From: Yu Fan <41051953+FuryMartin@users.noreply.github.com> Date: Mon, 13 Nov 2023 11:26:50 +0800 Subject: [PATCH 05/18] Update python-package-conda.yml --- .github/workflows/python-package-conda.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index 3e46812..a593d56 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -7,10 +7,12 @@ jobs: name: build Windows runs-on: "windows-latest" steps: + - name: Check out repository + uses: actions/checkout@v4 - uses: conda-incubator/setup-miniconda@v2 with: activate-environment: anaconda-client-env - environment-file: ../resources/environment.yml + environment-file: ./resources/environment.yml python-version: 3.8.5 auto-activate-base: false - name: Activate Picf @@ -19,7 +21,7 @@ jobs: - name: Build Environment shell: cmd - run: ../setup.bat + run: ./setup.bat - name: Install pyinstaller shell: cmd From bb88491eb10fb0d231ad9f07b3229e4bcdca2425 Mon Sep 17 00:00:00 2001 From: Yu Fan <41051953+FuryMartin@users.noreply.github.com> Date: Mon, 13 Nov 2023 11:37:30 +0800 Subject: [PATCH 06/18] Update python-package-conda.yml --- .github/workflows/python-package-conda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index a593d56..7a9c9ae 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -11,7 +11,7 @@ jobs: uses: actions/checkout@v4 - uses: conda-incubator/setup-miniconda@v2 with: - activate-environment: anaconda-client-env + activate-environment: Picf environment-file: ./resources/environment.yml python-version: 3.8.5 auto-activate-base: false From ebb4c85fede7ae60115590977fa074200c25e49d Mon Sep 17 00:00:00 2001 From: Yu Fan <41051953+FuryMartin@users.noreply.github.com> Date: Mon, 13 Nov 2023 11:54:31 +0800 Subject: [PATCH 07/18] Update python-package-conda.yml --- .github/workflows/python-package-conda.yml | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index 7a9c9ae..db8d6c2 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -15,19 +15,24 @@ jobs: environment-file: ./resources/environment.yml python-version: 3.8.5 auto-activate-base: false - - name: Activate Picf + + - name: Install pyinstaller shell: cmd - run: conda activate Picf - + run: | + conda activate Picf + conda install pyinstaller + conda -info e + pyinstaller -v + - name: Build Environment shell: cmd - run: ./setup.bat - - - name: Install pyinstaller - shell: cmd - run: conda install pyinstaller + run: | + conda activate Picf + ./setup.bat - name: Packaging shell: cmd - run: pyinstaller main.py + run: | + conda activate Picf + pyinstaller main.py From ecadb05b642ed37f9e17908d13fd32bf13786404 Mon Sep 17 00:00:00 2001 From: Yu Fan <41051953+FuryMartin@users.noreply.github.com> Date: Mon, 13 Nov 2023 12:07:19 +0800 Subject: [PATCH 08/18] Update environment.yml --- resources/environment.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/environment.yml b/resources/environment.yml index c40949a..217e7d2 100644 --- a/resources/environment.yml +++ b/resources/environment.yml @@ -12,8 +12,9 @@ dependencies: - tqdm=4.56.0 - scikit-learn=1.0.1 - PyWavelets=1.1.1 + - pyinstaller - pip: - imutils==0.5.4 - PySide6==6.2.1 - tensorflow==2.7.0 -#prefix: C:\Users\Yashaswi\anaconda3\envs\sorter \ No newline at end of file +#prefix: C:\Users\Yashaswi\anaconda3\envs\sorter From 3d62916a1f12b6175fab62694727f09b4e6be8e8 Mon Sep 17 00:00:00 2001 From: Yu Fan <41051953+FuryMartin@users.noreply.github.com> Date: Mon, 13 Nov 2023 12:08:50 +0800 Subject: [PATCH 09/18] Update python-package-conda.yml --- .github/workflows/python-package-conda.yml | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index db8d6c2..b3f850b 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -15,24 +15,12 @@ jobs: environment-file: ./resources/environment.yml python-version: 3.8.5 auto-activate-base: false - - - name: Install pyinstaller - shell: cmd - run: | - conda activate Picf - conda install pyinstaller - conda -info e - pyinstaller -v - + - name: Build Environment shell: cmd - run: | - conda activate Picf - ./setup.bat + run: conda activate Picf & ./setup.bat - name: Packaging shell: cmd - run: | - conda activate Picf - pyinstaller main.py + run: conda activate Picf & pyinstaller main.py From 688d7df7b37aa5692767facee96016dd2d757b8f Mon Sep 17 00:00:00 2001 From: Yu Fan <41051953+FuryMartin@users.noreply.github.com> Date: Mon, 13 Nov 2023 12:16:10 +0800 Subject: [PATCH 10/18] Update python-package-conda.yml --- .github/workflows/python-package-conda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index b3f850b..1131764 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -18,7 +18,7 @@ jobs: - name: Build Environment shell: cmd - run: conda activate Picf & ./setup.bat + run: conda activate Picf & setup.bat - name: Packaging shell: cmd From a441e9519d898906e83d6c061539a3258fb3d885 Mon Sep 17 00:00:00 2001 From: Yu Fan <41051953+FuryMartin@users.noreply.github.com> Date: Mon, 13 Nov 2023 12:36:08 +0800 Subject: [PATCH 11/18] Update python-package-conda.yml --- .github/workflows/python-package-conda.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index 1131764..1491e63 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -23,4 +23,11 @@ jobs: - name: Packaging shell: cmd run: conda activate Picf & pyinstaller main.py - + + - name: Archive Release + uses: thedoctor0/zip-release@0.7.5 + with: + type: 'zip' + filename: 'Picf-Windows.zip' + directory: './build/main' + From 67d5218e4af48dd0b419f920f0337bba860b3a0f Mon Sep 17 00:00:00 2001 From: Yu Fan <41051953+FuryMartin@users.noreply.github.com> Date: Mon, 13 Nov 2023 12:53:21 +0800 Subject: [PATCH 12/18] Update python-package-conda.yml --- .github/workflows/python-package-conda.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index 1491e63..6a6b465 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -29,5 +29,10 @@ jobs: with: type: 'zip' filename: 'Picf-Windows.zip' - directory: './build/main' - + path: './build/main' + + - name: Upload Release + uses: ncipollo/release-action@v1.12.0 + with: + artifacts: "Picf-Windows.zip" + token: ${{ secrets.GITHUB_TOKEN }} From 8acfd6d4135bf29f06dccd201e70371b3e28b0d1 Mon Sep 17 00:00:00 2001 From: Yu Fan <41051953+FuryMartin@users.noreply.github.com> Date: Mon, 13 Nov 2023 13:11:55 +0800 Subject: [PATCH 13/18] Update python-package-conda.yml --- .github/workflows/python-package-conda.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index 6a6b465..cf14123 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -29,10 +29,11 @@ jobs: with: type: 'zip' filename: 'Picf-Windows.zip' - path: './build/main' - - - name: Upload Release - uses: ncipollo/release-action@v1.12.0 + path: './build/' + + - name: Upload Artifact + - uses: actions/upload-artifact@v3 with: - artifacts: "Picf-Windows.zip" - token: ${{ secrets.GITHUB_TOKEN }} + name: Picf-Windows + path: "Picf-Windows.zip" + From 891f5397e0608f613703f6d5501296a49b14e805 Mon Sep 17 00:00:00 2001 From: Yu Fan <41051953+FuryMartin@users.noreply.github.com> Date: Mon, 13 Nov 2023 13:12:45 +0800 Subject: [PATCH 14/18] Update python-package-conda.yml --- .github/workflows/python-package-conda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index cf14123..ee401c2 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -32,7 +32,7 @@ jobs: path: './build/' - name: Upload Artifact - - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v3 with: name: Picf-Windows path: "Picf-Windows.zip" From 0400afc623fadae1ea878049d45092c1ae98041b Mon Sep 17 00:00:00 2001 From: Yu Fan <41051953+FuryMartin@users.noreply.github.com> Date: Mon, 13 Nov 2023 13:41:27 +0800 Subject: [PATCH 15/18] Update python-package-conda.yml --- .github/workflows/python-package-conda.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index ee401c2..119632a 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -24,16 +24,16 @@ jobs: shell: cmd run: conda activate Picf & pyinstaller main.py - - name: Archive Release - uses: thedoctor0/zip-release@0.7.5 - with: - type: 'zip' - filename: 'Picf-Windows.zip' - path: './build/' + # - name: Archive Release + # uses: thedoctor0/zip-release@0.7.5 + # with: + # type: 'zip' + # filename: 'Picf-Windows.zip' + # path: './build/*' - name: Upload Artifact uses: actions/upload-artifact@v3 with: name: Picf-Windows - path: "Picf-Windows.zip" + path: "./build/*" From 4a5c3e9813bcac2022fe5bd2604ffcd58dc85878 Mon Sep 17 00:00:00 2001 From: Yu Fan <41051953+FuryMartin@users.noreply.github.com> Date: Mon, 13 Nov 2023 18:46:25 +0800 Subject: [PATCH 16/18] Create main.spec --- main.spec | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 main.spec diff --git a/main.spec b/main.spec new file mode 100644 index 0000000..82adf5b --- /dev/null +++ b/main.spec @@ -0,0 +1,51 @@ +# -*- mode: python ; coding: utf-8 -*- + + +block_cipher = None + + +a = Analysis( + ['main.py'], + pathex=['.\\utils\\CW.py', '.\\utils\\display_by_person.py', '.\\utils\\embedder.py', '.\\utils\\face_functions.py', '.\\utils\\facenet.py', '.\\utils\\sort_images.py','.\\gui\\core\\functions.py', '.\\gui\\core\\json_settings.py', '.\\gui\\core\\json_themes.py', '.\\gui\\core\\qt_core.py', '.\\gui\\uis\\columns\\ui_left_column.py', '.\\gui\\uis\\columns\\ui_right_column.py', '.\\gui\\uis\\pages\\ui_main_pages.py', '.\\gui\\uis\\windows\\main_window\\flow_layout.py', '.\\gui\\uis\\windows\\main_window\\functions_main_window.py', '.\\gui\\uis\\windows\\main_window\\setup_main_window.py', '.\\gui\\uis\\windows\\main_window\\ui_main.py', '.\\gui\\widgets\\py_checkbox\\py_checkbox.py', '.\\gui\\widgets\\py_circular_progress\\py_circular_progress.py', '.\\gui\\widgets\\py_credits_bar\\py_credits.py', '.\\gui\\widgets\\py_dialog\\py_dialog.py', '.\\gui\\widgets\\py_grips\\py_grips.py', '.\\gui\\widgets\\py_icon_button\\py_icon_button.py', '.\\gui\\widgets\\py_image\\py_image.py', '.\\gui\\widgets\\py_image_page\\py_image_page.py', '.\\gui\\widgets\\py_left_column\\py_icon.py', '.\\gui\\widgets\\py_left_column\\py_left_button.py', '.\\gui\\widgets\\py_left_column\\py_left_column.py', '.\\gui\\widgets\\py_left_menu\\py_div.py', '.\\gui\\widgets\\py_left_menu\\py_left_menu.py', '.\\gui\\widgets\\py_left_menu\\py_left_menu_button.py', '.\\gui\\widgets\\py_line_edit\\py_line_edit.py', '.\\gui\\widgets\\py_push_button\\py_push_button.py', '.\\gui\\widgets\\py_slider\\py_slider.py', '.\\gui\\widgets\\py_table_widget\\py_table_widget.py', '.\\gui\\widgets\\py_table_widget\\style.py', '.\\gui\\widgets\\py_title_bar\\py_div.py', '.\\gui\\widgets\\py_title_bar\\py_title_bar.py', '.\\gui\\widgets\\py_title_bar\\py_title_button.py', '.\\gui\\widgets\\py_toggle\\py_toggle.py', '.\\gui\\widgets\\py_window\\py_window.py', '.\\gui\\widgets\\py_window\\styles.py'], + binaries=[], + datas=[], + hiddenimports=[], + 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, + [], + exclude_binaries=True, + name='main', + debug=True, + bootloader_ignore_signals=False, + strip=False, + upx=True, + console=True, + disable_windowed_traceback=False, + argv_emulation=False, + target_arch=None, + codesign_identity=None, + entitlements_file=None, + icon='icon.ico' +) +coll = COLLECT( + exe, + a.binaries, + a.zipfiles, + a.datas, + strip=False, + upx=True, + upx_exclude=[], + name='main', +) From a6932fe1adb9f15c50f04bbb184c2dee0d2fa8e0 Mon Sep 17 00:00:00 2001 From: Yu Fan <41051953+FuryMartin@users.noreply.github.com> Date: Mon, 13 Nov 2023 18:48:53 +0800 Subject: [PATCH 17/18] Update python-package-conda.yml --- .github/workflows/python-package-conda.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index 119632a..09cb1b5 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -22,7 +22,11 @@ jobs: - name: Packaging shell: cmd - run: conda activate Picf & pyinstaller main.py + run: conda activate Picf & pyinstaller main.spec + + - name: Tree + shell: cmd + run: tree ./build/ # - name: Archive Release # uses: thedoctor0/zip-release@0.7.5 From 8ed5862d052cf165d7931512e78f87c284c9c169 Mon Sep 17 00:00:00 2001 From: Yu Fan <41051953+FuryMartin@users.noreply.github.com> Date: Mon, 13 Nov 2023 19:03:33 +0800 Subject: [PATCH 18/18] Update environment.yml --- resources/environment.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/environment.yml b/resources/environment.yml index 217e7d2..b5adad9 100644 --- a/resources/environment.yml +++ b/resources/environment.yml @@ -12,9 +12,10 @@ dependencies: - tqdm=4.56.0 - scikit-learn=1.0.1 - PyWavelets=1.1.1 - - pyinstaller - pip: + - pyinstaller - imutils==0.5.4 - PySide6==6.2.1 - tensorflow==2.7.0 + - protobuf==3.19.4 #prefix: C:\Users\Yashaswi\anaconda3\envs\sorter