diff --git a/.gitignore b/.gitignore index ffccf3e..8af121f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /venv/ /.eggs/ /requirements.txt +/fix_app_qt_folder_names_for_codesign.py diff --git a/Learn.py b/Learn.py index 9d612fd..b44a960 100644 --- a/Learn.py +++ b/Learn.py @@ -1,5 +1,3 @@ -import os - from gui import GUI diff --git a/defaults/Defaults.py b/defaults/Defaults.py index 8cf0e6f..d826186 100644 --- a/defaults/Defaults.py +++ b/defaults/Defaults.py @@ -4,6 +4,7 @@ import pickle import os + class Defaults(object): class __Defaults: def __init__(self, filename=os.path.join("defaults", "defaults.pkl")): @@ -28,8 +29,7 @@ def get(self, key): self.getDefaults() try: return self.__defaults[key] - except KeyError as e: - # return ex.NotFoundError() + except KeyError: return "" def set(self, key, val): diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..6ef105f --- /dev/null +++ b/requirements.txt @@ -0,0 +1,15 @@ +PyQt5~=5.15.6 +pandas~=1.4.1 +qroundprogressbar~=1.0.0 +modulegraph~=0.19.2 +py2app~=0.27 +macholib~=1.16 +setuptools~=61.0.0 +altgraph~=0.17.2 +pync~=2.0.3 +certifi~=2021.10.8 +PyAutoGUI~=0.9.53 +numpy~=1.22.3 +psutil~=5.9.0 +wmctrl~=0.4 +PyQtWebEngine \ No newline at end of file diff --git a/setup.py b/setup.py index 0e861dd..064697c 100644 --- a/setup.py +++ b/setup.py @@ -8,18 +8,22 @@ from setuptools import setup APP = ['Learn.py'] -DATA_FILES = ['images', - 'defaults', - 'gui', - 'classes', - 'style.css'] +DATA_FILES = [ + 'images', + 'defaults', + 'style.css'] OPTIONS = { 'iconfile': 'images/Logo.png', } +PACKAGES = [ + 'gui', + 'classes' +] setup( app=APP, data_files=DATA_FILES, options={'py2app': OPTIONS}, setup_requires=['py2app'], + packages=PACKAGES )