Merge branch 'main' into feat/filescv

2025-04-01 23:23:45 +03:00 · 2023-09-28 14:52:59 +03:00 · 2023-09-28 14:52:59 +03:00 · e9aa29e5e9
commit e9aa29e5e9
parent de77ea6bfc 2cd82354a1
8 changed files with 205 additions and 93 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -15,6 +15,10 @@ jobs:
      matrix:
        os: [ubuntu-latest, windows-latest]
        spec: [statapp-onefile, statapp]
+        arch: [x86, x64]
+        exclude:
+          - os: ubuntu-latest
+            arch: x86
    defaults:
      run:
        shell: bash
@ -24,6 +28,7 @@ jobs:
        uses: actions/setup-python@v4
        with:
          python-version: 3.8
+          architecture: ${{ matrix.arch }}
      - name: Установка poetry
        uses: snok/install-poetry@v1
        with:
@ -33,26 +38,35 @@ jobs:
      - uses: actions/cache@v3
        with:
          path: ./.venv
-          key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
+          key: venv-${{ runner.os }}-${{ runner.arch }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
      - name: Установка зависимостей
        run: poetry install
      - name: Сборка
-        run: poetry run pyinstaller ${{ matrix.spec }}.spec
+        run: poetry run pyinstaller ${{ matrix.spec }}.spec\
+      - name: Архивация
+        uses: thedoctor0/zip-release@0.7.1
+        with:
+          type: 'zip'
+          directory: 'dist'
+          filename: "../${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.spec }}.zip"
      - name: Загрузка артефактов
        uses: actions/upload-artifact@v3
        with:
-            name: ${{ matrix.os }}-${{ matrix.spec }}
-            path: ./dist/statapp*
+            name: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.spec }}
+            path: '${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.spec }}.zip'

  release-please:
    runs-on: ubuntu-latest
    needs: [build]
    steps:
      - uses: google-github-actions/release-please-action@v3
+        id: release
        with:
          release-type: python
          package-name: statapp
          changelog-types: '[{"type":"feat","section":"Новые функции","hidden":false},{"type":"fix","section":"Исправления","hidden":false},{"type":"chore", "hidden":true}]'
+      - uses: actions/checkout@v4
+        if: ${{ steps.release.outputs.release_created }}
      - name: Скачивание артефактов
        if: ${{ steps.release.outputs.release_created }}
        uses: actions/download-artifact@v3
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,25 @@
 # Changelog

+## [0.2.1](https://github.com/shizand/statapp/compare/v0.2.0...v0.2.1) (2023-09-28)
+
+
+### Исправления
+
+* обновлено окно "О программе" ([#21](https://github.com/shizand/statapp/issues/21)) ([37ea556](https://github.com/shizand/statapp/commit/37ea556ad20c7b2d3b346e0eafd583c60121d594))
+
+## [0.2.0](https://github.com/shizand/statapp/compare/v0.1.0...v0.2.0) (2023-09-28)
+
+
+### Новые функции
+
+* добавлена генерация данных ([#13](https://github.com/shizand/statapp/issues/13)) ([bdcc2cd](https://github.com/shizand/statapp/commit/bdcc2cdfe2001c81b1cbc201d4269e3b3d506b3a))
+
+
+### Исправления
+
+* добавлена поддержка Windows 7 ([#18](https://github.com/shizand/statapp/issues/18)) ([fe37f33](https://github.com/shizand/statapp/commit/fe37f33d8457ebcdeaa63d4819d3d9814a4bd2f9))
+* добавлена поддержка x86 ([179e328](https://github.com/shizand/statapp/commit/179e3286a2fb06064d37bf0d46db78204eaf0b00))
+
 ## 0.1.0 (2023-09-26)


--- a/pyproject.toml
+++ b/pyproject.toml
@ -1,6 +1,6 @@
 [tool.poetry]
 name = "statapp"
-version = "0.1.0"
+version = "0.2.1"
 description = ""
 authors = [
    "Maxim Slipenko <statapp@maks1ms.addy.io>"
--- a/statapp-onefile.spec
+++ b/statapp-onefile.spec
@ -1,11 +1,14 @@
 # -*- mode: python ; coding: utf-8 -*-
+from PyInstaller.utils.hooks import copy_metadata

+datas = [('statapp/images/sticker.gif', 'images')]
+datas += copy_metadata('statapp')

 a = Analysis(
    ['statapp/__main__.py'],
    pathex=[],
    binaries=[],
-    datas=[],
+    datas=datas,
    hiddenimports=[],
    hookspath=[],
    hooksconfig={},
--- a/statapp.spec
+++ b/statapp.spec
@ -1,11 +1,15 @@
 # -*- mode: python ; coding: utf-8 -*-
+from PyInstaller.utils.hooks import copy_metadata
+
+datas = [('statapp/images/sticker.gif', 'images')]
+datas += copy_metadata('statapp')


 a = Analysis(
    ['statapp/__main__.py'],
    pathex=[],
    binaries=[],
-    datas=[('statapp/images/sticker.gif', 'images')],
+    datas=datas,
    hiddenimports=[],
    hookspath=[],
    hooksconfig={},
@ -25,7 +29,7 @@ exe = EXE(
    bootloader_ignore_signals=False,
    strip=False,
    upx=True,
-    console=True,
+    console=False,
    disable_windowed_traceback=False,
    argv_emulation=False,
    target_arch=None,
--- a/statapp/about_window.py
+++ b/statapp/about_window.py
@ -1,12 +1,18 @@
+import sys
 from PySide2.QtGui import QMovie
 from PySide2.QtWidgets import QMainWindow

 from statapp.ui.ui_about_window import Ui_AboutWindow
 from statapp.utils import resource_path

+if sys.version_info < (3, 8):
+    import importlib_metadata
+else:
+    import importlib.metadata as importlib_metadata
+

 class AboutWindow(QMainWindow):
-    pixmap = None
+    movie = None

    def __init__(self):
        super().__init__()
@ -14,10 +20,11 @@ class AboutWindow(QMainWindow):
        self.ui.setupUi(self)

        image_path = resource_path('images/sticker.gif')
-
        movie = QMovie(image_path)
        self.ui.labelgif.setMovie(movie)
        movie.start()
-
-        self.pixmap = movie
+        self.movie = movie
        self.setFixedSize(self.size())
+
+        version = importlib_metadata.version(__package__ or __name__)
+        self.ui.versionLabel.setText(f"Версия: {version}")
--- a/statapp/ui/about_window.ui
+++ b/statapp/ui/about_window.ui
@ -9,7 +9,7 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>476</width>
+    <width>483</width>
    <height>543</height>
   </rect>
  </property>
@ -23,70 +23,7 @@
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">
     <layout class="QGridLayout" name="gridLayout">
-      <item row="4" column="1">
-       <widget class="QLabel" name="labelowner">
-        <property name="font">
-         <font>
-          <pointsize>14</pointsize>
-          <italic>false</italic>
-          <bold>false</bold>
-          <underline>false</underline>
-          <strikeout>false</strikeout>
-          <stylestrategy>PreferDefault</stylestrategy>
-          <kerning>true</kerning>
-         </font>
-        </property>
-        <property name="text">
-         <string>Донецкий Национальный Технический Университет</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QLabel" name="labeldevelopers">
-        <property name="font">
-         <font>
-          <pointsize>14</pointsize>
-          <italic>false</italic>
-          <bold>false</bold>
-          <underline>false</underline>
-          <strikeout>false</strikeout>
-          <stylestrategy>PreferDefault</stylestrategy>
-          <kerning>true</kerning>
-         </font>
-        </property>
-        <property name="text">
-         <string>Разработчики: Слипенко М., Лазуренко Е.</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QLabel" name="labelbasegigamen">
-        <property name="font">
-         <font>
-          <pointsize>14</pointsize>
-          <italic>false</italic>
-          <bold>false</bold>
-          <underline>false</underline>
-          <strikeout>false</strikeout>
-          <stylestrategy>PreferDefault</stylestrategy>
-          <kerning>true</kerning>
-         </font>
-        </property>
-        <property name="text">
-         <string>Теоретический фундамент: Дмитрюк Т. Г.</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
+      <item row="5" column="1">
       <widget class="QLabel" name="labelgif">
        <property name="minimumSize">
         <size>
@ -103,6 +40,7 @@
        <property name="font">
         <font>
          <pointsize>14</pointsize>
+          <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
          <underline>false</underline>
@ -122,6 +60,102 @@
        </property>
       </widget>
      </item>
+      <item row="6" column="1">
+       <widget class="QLabel" name="labelowner">
+        <property name="font">
+         <font>
+          <pointsize>12</pointsize>
+          <weight>50</weight>
+          <italic>false</italic>
+          <bold>false</bold>
+          <underline>false</underline>
+          <strikeout>false</strikeout>
+          <stylestrategy>PreferDefault</stylestrategy>
+          <kerning>true</kerning>
+         </font>
+        </property>
+        <property name="text">
+         <string>Донецкий Национальный Технический Университет</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLabel" name="labeldevelopers">
+        <property name="font">
+         <font>
+          <pointsize>14</pointsize>
+          <weight>50</weight>
+          <italic>false</italic>
+          <bold>false</bold>
+          <underline>false</underline>
+          <strikeout>false</strikeout>
+          <stylestrategy>PreferDefault</stylestrategy>
+          <kerning>true</kerning>
+         </font>
+        </property>
+        <property name="text">
+         <string>Разработчики: Слипенко М., Лазуренко Е.</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLabel" name="versionLabel">
+        <property name="font">
+         <font>
+          <pointsize>12</pointsize>
+         </font>
+        </property>
+        <property name="text">
+         <string>Версия:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QLabel" name="labelbasegigamen">
+        <property name="font">
+         <font>
+          <pointsize>14</pointsize>
+          <weight>50</weight>
+          <italic>false</italic>
+          <bold>false</bold>
+          <underline>false</underline>
+          <strikeout>false</strikeout>
+          <stylestrategy>PreferDefault</stylestrategy>
+          <kerning>true</kerning>
+         </font>
+        </property>
+        <property name="text">
+         <string>Теоретический фундамент: Дмитрюк Т. Г.</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLabel" name="mainLabel">
+        <property name="font">
+         <font>
+          <pointsize>20</pointsize>
+         </font>
+        </property>
+        <property name="text">
+         <string>Statapp</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
     </layout>
    </item>
   </layout>
--- a/statapp/ui/ui_about_window.py
+++ b/statapp/ui/ui_about_window.py
@ -18,7 +18,7 @@ class Ui_AboutWindow(object):
        if not AboutWindow.objectName():
            AboutWindow.setObjectName(u"AboutWindow")
        AboutWindow.setEnabled(True)
-        AboutWindow.resize(476, 543)
+        AboutWindow.resize(483, 543)
        AboutWindow.setAutoFillBackground(False)
        self.centralwidget = QWidget(AboutWindow)
        self.centralwidget.setObjectName(u"centralwidget")
@ -26,44 +26,72 @@ class Ui_AboutWindow(object):
        self.gridLayout_2.setObjectName(u"gridLayout_2")
        self.gridLayout = QGridLayout()
        self.gridLayout.setObjectName(u"gridLayout")
-        self.labelowner = QLabel(self.centralwidget)
-        self.labelowner.setObjectName(u"labelowner")
+        self.labelgif = QLabel(self.centralwidget)
+        self.labelgif.setObjectName(u"labelgif")
+        self.labelgif.setMinimumSize(QSize(50, 50))
+        self.labelgif.setMaximumSize(QSize(500, 600))
        font = QFont()
        font.setPointSize(14)
        font.setBold(False)
        font.setItalic(False)
        font.setUnderline(False)
+        font.setWeight(50)
        font.setStrikeOut(False)
        font.setKerning(True)
        font.setStyleStrategy(QFont.PreferDefault)
-        self.labelowner.setFont(font)
+        self.labelgif.setFont(font)
+        self.labelgif.setFrameShape(QFrame.NoFrame)
+        self.labelgif.setAlignment(Qt.AlignCenter)
+
+        self.gridLayout.addWidget(self.labelgif, 5, 1, 1, 1)
+
+        self.labelowner = QLabel(self.centralwidget)
+        self.labelowner.setObjectName(u"labelowner")
+        font1 = QFont()
+        font1.setPointSize(12)
+        font1.setBold(False)
+        font1.setItalic(False)
+        font1.setUnderline(False)
+        font1.setWeight(50)
+        font1.setStrikeOut(False)
+        font1.setKerning(True)
+        font1.setStyleStrategy(QFont.PreferDefault)
+        self.labelowner.setFont(font1)
        self.labelowner.setAlignment(Qt.AlignCenter)

-        self.gridLayout.addWidget(self.labelowner, 4, 1, 1, 1)
+        self.gridLayout.addWidget(self.labelowner, 6, 1, 1, 1)

        self.labeldevelopers = QLabel(self.centralwidget)
        self.labeldevelopers.setObjectName(u"labeldevelopers")
        self.labeldevelopers.setFont(font)
        self.labeldevelopers.setAlignment(Qt.AlignCenter)

-        self.gridLayout.addWidget(self.labeldevelopers, 0, 1, 1, 1)
+        self.gridLayout.addWidget(self.labeldevelopers, 2, 1, 1, 1)
+
+        self.versionLabel = QLabel(self.centralwidget)
+        self.versionLabel.setObjectName(u"versionLabel")
+        font2 = QFont()
+        font2.setPointSize(12)
+        self.versionLabel.setFont(font2)
+        self.versionLabel.setAlignment(Qt.AlignCenter)
+
+        self.gridLayout.addWidget(self.versionLabel, 1, 1, 1, 1)

        self.labelbasegigamen = QLabel(self.centralwidget)
        self.labelbasegigamen.setObjectName(u"labelbasegigamen")
        self.labelbasegigamen.setFont(font)
        self.labelbasegigamen.setAlignment(Qt.AlignCenter)

-        self.gridLayout.addWidget(self.labelbasegigamen, 1, 1, 1, 1)
+        self.gridLayout.addWidget(self.labelbasegigamen, 3, 1, 1, 1)

-        self.labelgif = QLabel(self.centralwidget)
-        self.labelgif.setObjectName(u"labelgif")
-        self.labelgif.setMinimumSize(QSize(50, 50))
-        self.labelgif.setMaximumSize(QSize(500, 600))
-        self.labelgif.setFont(font)
-        self.labelgif.setFrameShape(QFrame.NoFrame)
-        self.labelgif.setAlignment(Qt.AlignCenter)
+        self.mainLabel = QLabel(self.centralwidget)
+        self.mainLabel.setObjectName(u"mainLabel")
+        font3 = QFont()
+        font3.setPointSize(20)
+        self.mainLabel.setFont(font3)
+        self.mainLabel.setAlignment(Qt.AlignCenter)

-        self.gridLayout.addWidget(self.labelgif, 2, 1, 1, 1)
+        self.gridLayout.addWidget(self.mainLabel, 0, 1, 1, 1)


        self.gridLayout_2.addLayout(self.gridLayout, 0, 0, 1, 1)
@ -77,8 +105,10 @@ class Ui_AboutWindow(object):

    def retranslateUi(self, AboutWindow):
        AboutWindow.setWindowTitle(QCoreApplication.translate("AboutWindow", u"\u041e \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u0435", None))
+        self.labelgif.setText("")
        self.labelowner.setText(QCoreApplication.translate("AboutWindow", u"\u0414\u043e\u043d\u0435\u0446\u043a\u0438\u0439 \u041d\u0430\u0446\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u044b\u0439 \u0422\u0435\u0445\u043d\u0438\u0447\u0435\u0441\u043a\u0438\u0439 \u0423\u043d\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442", None))
        self.labeldevelopers.setText(QCoreApplication.translate("AboutWindow", u"\u0420\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u0438: \u0421\u043b\u0438\u043f\u0435\u043d\u043a\u043e \u041c., \u041b\u0430\u0437\u0443\u0440\u0435\u043d\u043a\u043e \u0415.", None))
+        self.versionLabel.setText(QCoreApplication.translate("AboutWindow", u"\u0412\u0435\u0440\u0441\u0438\u044f:", None))
        self.labelbasegigamen.setText(QCoreApplication.translate("AboutWindow", u"\u0422\u0435\u043e\u0440\u0435\u0442\u0438\u0447\u0435\u0441\u043a\u0438\u0439 \u0444\u0443\u043d\u0434\u0430\u043c\u0435\u043d\u0442: \u0414\u043c\u0438\u0442\u0440\u044e\u043a \u0422. \u0413.", None))
-        self.labelgif.setText("")
+        self.mainLabel.setText(QCoreApplication.translate("AboutWindow", u"Statapp", None))
    # retranslateUi