Revert "Added packaging (pip install https://github.com/pyinstaller/p…

…yinstaller/archive/develop.tar.gz for workaround)" This reverts commit 8cc56ea. Also, don't revert what should have been done anyway
ojomio · Dec 5, 2020 · 39f14c4 · 39f14c4
1 parent adf8812
commit 39f14c4
Show file tree

Hide file tree

Showing 32 changed files with 7 additions and 127 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .idea
-print/target
 __pycache__
+build
+dist
 *.bak
diff --git a/print/src/main/icons/Icon.ico → Icon.ico b/print/src/main/icons/Icon.ico → Icon.ico
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 
 PHONY: gui
 
-gui: print/src/main/python/qt/*.py
+gui: qt/*.py
 
 %.py: %.ui
 	pyuic5 $< > $@
@@ -16,6 +16,3 @@ lint:
 pretty:
 	black --target-version py38 --skip-string-normalization --line-length=100 $(CODE)
 	isort  $(CODE)
-
-build-installer:
-	cd print && fbs freeze && fbs installer
diff --git a/poetry.lock b/poetry.lock
diff --git a/print/src/main/python/main.py → print.py b/print/src/main/python/main.py → print.py
@@ -5,7 +5,6 @@
 from typing import Optional
 
 import openpyxl
-from fbs_runtime.application_context.PyQt5 import ApplicationContext
 from openpyxl.styles import Alignment, Font, PatternFill
 from openpyxl.utils import coordinate_to_tuple, get_column_letter
 from openpyxl.utils.units import cm_to_dxa, points_to_pixels, cm_to_EMU, EMU_to_inch
@@ -15,7 +14,7 @@
 from PyQt5.QtGui import QColor, QDesktopServices
 from PyQt5.QtWidgets import QFileDialog, QTableWidgetItem
 
-from print.src.main.python.qt import mainwindow  # Это наш конвертированный файл дизайна
+from qt import mainwindow  # Это наш конвертированный файл дизайна
 
 WIDTH_CM_LIST = [2.11, 1.21, 1.08, 0.94, 1.19, 0.94, 6.06, 10.35]
 HEIGHT_CM_LIST = [0.51] * 8 + [0.35, 4.71]
@@ -168,13 +167,10 @@ def to_widget_coords(row, col):
 
 
 def main():
-    appctxt = ApplicationContext()  # 1. Instantiate ApplicationContext
-
+    app = QtWidgets.QApplication(sys.argv)  # Новый экземпляр QApplication
     window = ExampleApp()  # Создаём объект класса ExampleApp
     window.show()  # Показываем окно
-
-    exit_code = appctxt.app.exec_()  # 2. Invoke appctxt.app.exec_()
-    sys.exit(exit_code)
+    app.exec_()  # и запускаем приложение
 
 
 if __name__ == '__main__':  # Если мы запускаем файл напрямую, а не импортируем

diff --git a/print/__init__.py b/print/__init__.py
diff --git a/print/src/__init__.py b/print/src/__init__.py
diff --git a/print/src/build/settings/base.json b/print/src/build/settings/base.json
diff --git a/print/src/build/settings/linux.json b/print/src/build/settings/linux.json
diff --git a/print/src/build/settings/mac.json b/print/src/build/settings/mac.json
diff --git a/print/src/main/__init__.py b/print/src/main/__init__.py
diff --git a/print/src/main/icons/README.md b/print/src/main/icons/README.md
diff --git a/print/src/main/icons/base/16.png b/print/src/main/icons/base/16.png
diff --git a/print/src/main/icons/base/24.png b/print/src/main/icons/base/24.png
diff --git a/print/src/main/icons/base/32.png b/print/src/main/icons/base/32.png
diff --git a/print/src/main/icons/base/48.png b/print/src/main/icons/base/48.png
diff --git a/print/src/main/icons/base/64.png b/print/src/main/icons/base/64.png
diff --git a/print/src/main/icons/linux/1024.png b/print/src/main/icons/linux/1024.png
diff --git a/print/src/main/icons/linux/128.png b/print/src/main/icons/linux/128.png
diff --git a/print/src/main/icons/linux/256.png b/print/src/main/icons/linux/256.png
diff --git a/print/src/main/icons/linux/512.png b/print/src/main/icons/linux/512.png
diff --git a/print/src/main/icons/mac/1024.png b/print/src/main/icons/mac/1024.png
diff --git a/print/src/main/icons/mac/128.png b/print/src/main/icons/mac/128.png
diff --git a/print/src/main/icons/mac/256.png b/print/src/main/icons/mac/256.png
diff --git a/print/src/main/icons/mac/512.png b/print/src/main/icons/mac/512.png
diff --git a/print/src/main/python/__init__.py b/print/src/main/python/__init__.py
diff --git a/print/src/main/python/qt/__init__.py b/print/src/main/python/qt/__init__.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -9,7 +9,6 @@ python = "~3.8"
 "Qt5.py" = "^0.1.0"
 PyQt5 = "^5.15.1"
 openpyxl = "^3.0.5"
-fbs = "^0.9.0"
 
 [tool.poetry.dev-dependencies]
 black = "^20.8b1"

diff --git a/print/src/main/python/qt/mainwindow.py → qt/mainwindow.py b/print/src/main/python/qt/mainwindow.py → qt/mainwindow.py
diff --git a/print/src/main/python/qt/mainwindow.ui → qt/mainwindow.ui b/print/src/main/python/qt/mainwindow.ui → qt/mainwindow.ui
diff --git a/print/src/main/python/qt/qt.pro → qt/qt.pro b/print/src/main/python/qt/qt.pro → qt/qt.pro
diff --git a/print/src/main/python/qt/qt.pro.user → qt/qt.pro.user b/print/src/main/python/qt/qt.pro.user → qt/qt.pro.user