chore(main): release 0.3.6 (#40)

🤖 I have created a release *beep* *boop*
---


## [0.3.6](https://github.com/shizand/statapp/compare/v0.3.5...v0.3.6)
(2023-09-29)


### Исправления

* добавляет иконку приложения
([#39](https://github.com/shizand/statapp/issues/39))
([d3cd358](d3cd3589a7))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

.github/workflows/release.yml

@@ -13,11 +13,16 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-20.04, windows-latest]
         spec: [statapp-onefile, statapp]
         arch: [x86, x64]
+        include:
+          - os: ubuntu-20.04
+            target: linux
+          - os: windows-latest
+            target: windows
         exclude:
-          - os: ubuntu-latest
+          - os: ubuntu-20.04
             arch: x86
     defaults:
       run:
@@ -48,12 +53,12 @@ jobs:
         with:
           type: 'zip'
           directory: 'dist'
-          filename: "../${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.spec }}.zip"
+          filename: "../${{ matrix.target }}-${{ matrix.arch }}-${{ matrix.spec }}.zip"
       - name: Загрузка артефактов
         uses: actions/upload-artifact@v3
         with:
-            name: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.spec }}
+            name: ${{ matrix.target }}-${{ matrix.arch }}-${{ matrix.spec }}
-            path: '${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.spec }}.zip'
+            path: '${{ matrix.target }}-${{ matrix.arch }}-${{ matrix.spec }}.zip'
 
   release-please:
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -1,5 +1,40 @@
 # Changelog
 
+## [0.3.6](https://github.com/shizand/statapp/compare/v0.3.5...v0.3.6) (2023-09-29)
+
+
+### Исправления
+
+* добавляет иконку приложения ([#39](https://github.com/shizand/statapp/issues/39)) ([d3cd358](https://github.com/shizand/statapp/commit/d3cd3589a781df47e6d0e9d669a376aefd9090fe))
+
+## [0.3.5](https://github.com/shizand/statapp/compare/v0.3.4...v0.3.5) (2023-09-28)
+
+
+### Исправления
+
+* исправлен выбор файла для загрузки (Linux) ([c1809a0](https://github.com/shizand/statapp/commit/c1809a0bc778fde52aa392fb6656b0fd2ffeabe5))
+
+## [0.3.4](https://github.com/shizand/statapp/compare/v0.3.3...v0.3.4) (2023-09-28)
+
+
+### Исправления
+
+* исправлена ошибка, при СКО = 0 для фактора ([57dec07](https://github.com/shizand/statapp/commit/57dec07000e78d694986b1b90de42b84db14c1a7))
+
+## [0.3.3](https://github.com/shizand/statapp/compare/v0.3.2...v0.3.3) (2023-09-28)
+
+
+### Исправления
+
+* удалена упаковка системных библиотек вместе с программой (Linux) ([b6e10c4](https://github.com/shizand/statapp/commit/b6e10c420958cf554c1953f30c4cfd9dcadebd1a))
+
+## [0.3.2](https://github.com/shizand/statapp/compare/v0.3.1...v0.3.2) (2023-09-28)
+
+
+### Исправления
+
+* исправлена загрузка данных из файла ([8b7fabf](https://github.com/shizand/statapp/commit/8b7fabfa46d546b1969bdf9f4800cb0e06fa186a))
+
 ## [0.3.1](https://github.com/shizand/statapp/compare/v0.3.0...v0.3.1) (2023-09-28)
 
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "statapp"
-version = "0.3.1"
+version = "0.3.6"
 description = ""
 authors = [
     "Maxim Slipenko <statapp@maks1ms.addy.io>"

statapp-onefile.spec

@@ -1,7 +1,18 @@
 # -*- mode: python ; coding: utf-8 -*-
+import sys
+import typing
+from pprint import pprint
+
+if typing.TYPE_CHECKING:
+    from PyInstaller.building.api import COLLECT, EXE, MERGE, PYZ  # noqa: F401
+    from PyInstaller.building.build_main import Analysis  # noqa: F401
+    from PyInstaller.building.datastruct import TOC, Target, Tree  # noqa: F401
+    from PyInstaller.building.osx import BUNDLE  # noqa: F401
+    from PyInstaller.building.splash import Splash  # noqa: F401
+
 from PyInstaller.utils.hooks import copy_metadata
 
-datas = [('statapp/images/sticker.gif', 'images')]
+datas = [('statapp/ui/images/*', 'ui/images')]
 datas += copy_metadata('statapp')
 
 a = Analysis(
@@ -16,6 +27,13 @@ a = Analysis(
     excludes=[],
     noarchive=False,
 )
+
+prev_binaries = set(a.binaries)
+if sys.platform in ('linux', 'darwin'):
+    a.exclude_system_libraries(list_of_exceptions=[])  # glob expression
+print('\n\nSTRIPPED SYSTEM LIBS')
+pprint(sorted(set(prev_binaries) - set(a.binaries)))
+
 pyz = PYZ(a.pure)
 
 exe = EXE(
@@ -37,4 +55,5 @@ exe = EXE(
     target_arch=None,
     codesign_identity=None,
     entitlements_file=None,
+    icon='statapp/ui/images/logo.ico',
 )

statapp.spec

@@ -1,7 +1,18 @@
 # -*- mode: python ; coding: utf-8 -*-
+import sys
+import typing
+from pprint import pprint
+
+if typing.TYPE_CHECKING:
+    from PyInstaller.building.api import COLLECT, EXE, MERGE, PYZ  # noqa: F401
+    from PyInstaller.building.build_main import Analysis  # noqa: F401
+    from PyInstaller.building.datastruct import TOC, Target, Tree  # noqa: F401
+    from PyInstaller.building.osx import BUNDLE  # noqa: F401
+    from PyInstaller.building.splash import Splash  # noqa: F401
+
 from PyInstaller.utils.hooks import copy_metadata
 
-datas = [('statapp/images/sticker.gif', 'images')]
+datas = [('statapp/ui/images/*', 'ui/images')]
 datas += copy_metadata('statapp')
 
 
@@ -17,6 +28,13 @@ a = Analysis(
     excludes=[],
     noarchive=False,
 )
+
+prev_binaries = set(a.binaries)
+if sys.platform in ('linux', 'darwin'):
+    a.exclude_system_libraries(list_of_exceptions=[])  # glob expression
+print('\n\nSTRIPPED SYSTEM LIBS')
+pprint(sorted(set(prev_binaries) - set(a.binaries)))
+
 pyz = PYZ(a.pure)
 
 exe = EXE(
@@ -35,6 +53,7 @@ exe = EXE(
     target_arch=None,
     codesign_identity=None,
     entitlements_file=None,
+    icon='statapp/ui/images/logo.ico',
 )
 coll = COLLECT(
     exe,

statapp/about_window.py

@@ -19,7 +19,7 @@ class AboutWindow(QMainWindow):
         self.ui = Ui_AboutWindow()
         self.ui.setupUi(self)
 
-        image_path = resource_path('images/sticker.gif')
+        image_path = resource_path('ui/images/sticker.gif')
         movie = QMovie(image_path)
         self.ui.labelgif.setMovie(movie)
         movie.start()

statapp/main_window.py

@@ -1,5 +1,6 @@
 import numpy as np
-from PySide2.QtCore import Slot, QLocale
+from PySide2.QtCore import Slot, QLocale, QSize
+from PySide2.QtGui import QIcon
 from PySide2.QtWidgets import QMainWindow, QMessageBox, QApplication
 
 from statapp.generate_factor_window import GenerateFactorWindow, INDIRECT_LINK
@@ -8,6 +9,7 @@ from statapp.generate_window import GenerateWindow
 from statapp.about_window import AboutWindow
 from statapp.models.fileslc_model import FileSLCModel
 from statapp.ui.ui_main_window import Ui_MainWindow
+from statapp.utils import resource_path
 
 
 class MainWindow(QMainWindow):
@@ -17,6 +19,10 @@ class MainWindow(QMainWindow):
         self.ui = Ui_MainWindow()
         self.ui.setupUi(self)
 
+        icon = QIcon()
+        icon.addFile(resource_path("ui/images/logo.ico"), QSize(), QIcon.Normal, QIcon.Off)
+        self.setWindowIcon(icon)
+
         self.isDataChanged = False
         self.model = DataModel()
         self.fileModel = FileSLCModel()
@@ -88,6 +94,8 @@ class MainWindow(QMainWindow):
                     k = 2 - 1 / k
                 if gfw.typeConnection == INDIRECT_LINK:
                     k = 1 / k
+                if gfw.deviation == 0:
+                    k = 1
 
                 x = np.random.normal(gfw.mat * (k ** 3), gfw.deviation * k, size=1)
                 x_arr = np.append(x_arr, x)

statapp/models/fileslc_model.py

@@ -16,8 +16,8 @@ class FileSLCModel:
         return False
 
     def loadFile(self):
-        self.file_name, _ = QFileDialog.getOpenFileName(None, "Загрузить файл", "", "Files (*.txt;*.csv)")
+        self.file_name, _ = QFileDialog.getOpenFileName(None, "Загрузить файл", "", "Files (*.txt *.csv)")
-        if not self.file_name:
+        if self.file_name:
             try:
                 content = np.genfromtxt(self.file_name, delimiter=',', invalid_raise=True)
             except ValueError as e:
@@ -30,4 +30,4 @@ class FileSLCModel:
 
     def closeFile(self):
         self.file_name = None
-        pass
+        pass

statapp/ui/main_window.ui

@@ -112,6 +112,5 @@
    </property>
   </action>
  </widget>
- <resources/>
  <connections/>
 </ui>

statapp/ui/ui_main_window.py

@@ -12,7 +12,6 @@ from PySide2.QtCore import *
 from PySide2.QtGui import *
 from PySide2.QtWidgets import *
 
-
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         if not MainWindow.objectName():
@@ -97,4 +96,3 @@ class Ui_MainWindow(object):
         self.modelmenu.setTitle(QCoreApplication.translate("MainWindow", u"\u041c\u043e\u0434\u0435\u043b\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435", None))
         self.helpmenu.setTitle(QCoreApplication.translate("MainWindow", u"\u0421\u043f\u0440\u0430\u0432\u043a\u0430", None))
     # retranslateUi
-