WIP: Fix osx app gui

.flake8

@@ -3,3 +3,4 @@ exclude =
     dist/
     .git/
     .venv/
+    hook-tkinterdnd2.py

.github/workflows/build_app.yml

@@ -1,22 +1,21 @@
 name: build-app
 
-on:
-  workflow_run:
-    workflows: [test]
-    types: [completed]
+on: [push]
 
 jobs:
   build-executable:
     runs-on: macos-12
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Install dependencies
-        run: python3 -m pip install pyinstaller Pillow
+      - name: Install build dependencies
+        run:  python3 -m pip install pyinstaller Pillow tk
+
+      - name: Install project deps
+        run: python3 -m pip install .
 
       - name: Package pyinstaller
-        run: pyinstaller src/rclone_decrypt/gui.py --onefile --windowed --collect-all tkinterdnd2 --icon=docs/imgs/rd.ico --name rclone-decrypt
+        run: pyinstaller src/rclone_decrypt/gui.py --onefile --windowed --additional-hooks-dir=. --icon=docs/imgs/rd.ico --name rclone-decrypt
 
       - uses: actions/upload-artifact@v3
         with:

.github/workflows/test.yml

@@ -3,10 +3,10 @@ name: test
 on: [push]
 
 jobs:
-  test:
+  test-linux:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # Taken mostly from https://jacobian.org/til/github-actions-poetry/
       - uses: actions/setup-python@v2
@@ -17,11 +17,11 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.local
-          key: poetry-1.1.12-0
+          key: poetry-1.4.2
 
       - uses: snok/install-poetry@v1
         with:
-          version: 1.1.12
+          version: 1.4.2
           virtualenvs-create: true
           virtualenvs-in-project: true
 
@@ -46,3 +46,20 @@ jobs:
 
       - name: Run unit tests
         run: poetry run pytest
+
+  test-macos:
+    runs-on: macos-12
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install rclone
+        run: curl https://rclone.org/install.sh | sudo bash
+
+      - name: Install poetry
+        run: curl -sSL https://install.python-poetry.org | python3 -
+
+      - name: Install poetry dependencies
+        run: $HOME/Library/Application\ Support/pypoetry/venv/bin/poetry install
+
+      - name: Run tests
+        run: $HOME/Library/Application\ Support/pypoetry/venv/bin/poetry run pytest

.gitignore

@@ -1,4 +1,5 @@
 *.swp
+*.swo
 *.pyc
 *.spec
 tags

CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
+### Changed
+- Removes dependency on build-app on test completion
+- Added job to allow tests to run on macos
+- Added `hook-tkinterdnd2.py` file to allow pyinstaller to install all
+  necessary tkinterdnd2 files
+- Modified build-app to install dependencies for pyinstaller
+- Added settings to force venv to be generated in the project directory
+- Removed geometry specification from file, instead let tk decide the window
+  size
+- Updates checkout to v3
 
 ## [0.1.1] - 2021-04-28
 ### Changed

README.md

@@ -50,7 +50,7 @@ pip3 install rclone-decrypt
 * `Python-tk` must be installed if using the GUI
 
 ### Executable
-**UNDER DEVELOPMENT** An OSX `.app` is generated but is currently untested.
+An OSX `.app` is generated and the artifact can be downloaded.
 
 ## Usage
 ### CLI usage
@@ -77,7 +77,8 @@ and executed directly.
 rclone-decrypt --gui
 ```
 
-![rclone_example](docs/imgs/rclone_gui.png)
+![rclone_example](docs/imgs/rclone_gui_linux.png)
+![rclone_example](docs/imgs/rclone_gui_macos.png)
 
 ## Development
 ```

hook-tkinterdnd2.py

@@ -0,0 +1,12 @@
+"""pyinstaller hook file.
+
+You need to use this hook-file if you are packaging a project using tkinterdnd2.
+Just put hook-tkinterdnd2.py in the same directory where you call pyinstaller and type:
+
+    pyinstaller myproject/myproject.py --additional-hooks-dir=.
+"""
+
+from PyInstaller.utils.hooks import collect_data_files, eval_statement
+
+
+datas = collect_data_files('tkinterdnd2')