From 179e3286a2fb06064d37bf0d46db78204eaf0b00 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Thu, 28 Sep 2023 09:58:15 +0300 Subject: [PATCH 01/11] =?UTF-8?q?fix:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80?= =?UTF-8?q?=D0=B6=D0=BA=D0=B0=20x86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f5d3c6c..78bc83a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,6 +15,7 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] spec: [statapp-onefile, statapp] + arch: [x86, x64] defaults: run: shell: bash @@ -24,6 +25,7 @@ jobs: uses: actions/setup-python@v4 with: python-version: 3.8 + architecture: ${{ matrix.arch }} - name: Установка poetry uses: snok/install-poetry@v1 with: @@ -33,7 +35,7 @@ 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: Сборка @@ -41,7 +43,7 @@ jobs: - name: Загрузка артефактов uses: actions/upload-artifact@v3 with: - name: ${{ matrix.os }}-${{ matrix.spec }} + name: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.spec }} path: ./dist/statapp* release-please: From e521cf4a903ec5922ea261367a9f56e42ab4679a Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Thu, 28 Sep 2023 10:08:41 +0300 Subject: [PATCH 02/11] =?UTF-8?q?ci:=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B0=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B4=20ubuntu-latext=20x86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 78bc83a..d9d3be4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,10 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] spec: [statapp-onefile, statapp] - arch: [x86, x64] + arch: [x64] + include: + - os: windows-latest + arch: [x86, x64] defaults: run: shell: bash From 5625ec77f7419c81e3f3e3b28e63c32e5469adca Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Thu, 28 Sep 2023 10:09:49 +0300 Subject: [PATCH 03/11] =?UTF-8?q?ci:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=20workflow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d9d3be4..cffabda 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: arch: [x64] include: - os: windows-latest - arch: [x86, x64] + arch: x86 defaults: run: shell: bash From 56e967fecc0e2ca9f9f5c02ee2d03e9b8308976c Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Thu, 28 Sep 2023 10:14:26 +0300 Subject: [PATCH 04/11] =?UTF-8?q?ci:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=20workflow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cffabda..5387d4f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,9 +15,9 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] spec: [statapp-onefile, statapp] - arch: [x64] - include: - - os: windows-latest + arch: [x86, x64] + exclude: + - os: ubuntu-latest arch: x86 defaults: run: From fb24389d61fea032acbb339bc016ee593d553a55 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 Sep 2023 10:34:37 +0300 Subject: [PATCH 05/11] chore(main): release 0.2.0 (#19) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :robot: I have created a release *beep* *boop* --- ## [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)) --- 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> --- CHANGELOG.md | 13 +++++++++++++ pyproject.toml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fbf2c5c..71248a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [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) diff --git a/pyproject.toml b/pyproject.toml index 1eecfc5..3364d4e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "statapp" -version = "0.1.0" +version = "0.2.0" description = "" authors = [ "Maxim Slipenko " From bdc530b2e07e0df5bbedde39ceb9958f2d7d2e18 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Thu, 28 Sep 2023 10:42:27 +0300 Subject: [PATCH 06/11] =?UTF-8?q?ci:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=20workflow=20=D1=81=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=BE=D0=B9=20=D0=B1=D0=B8=D0=BD?= =?UTF-8?q?=D0=B0=D1=80=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5387d4f..3398af6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -54,6 +54,7 @@ jobs: needs: [build] steps: - uses: google-github-actions/release-please-action@v3 + id: release with: release-type: python package-name: statapp From cb3493115173757c6b4bb34c0ccf4e0822f91393 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Thu, 28 Sep 2023 10:53:36 +0300 Subject: [PATCH 07/11] =?UTF-8?q?ci:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=B0=D1=80=D1=85=D0=B8=D0=B2=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D1=8E=20=D0=B2=20zip=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20?= =?UTF-8?q?=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3398af6..7bf4eee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,12 +42,18 @@ jobs: - 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' + filename: '${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.spec }}.zip' + path: 'dist' - name: Загрузка артефактов uses: actions/upload-artifact@v3 with: name: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.spec }} - path: ./dist/statapp* + path: '${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.spec }}.zip' release-please: runs-on: ubuntu-latest From c0fbc0fbd95c069544445e4bcf1f779722a81881 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Thu, 28 Sep 2023 11:05:21 +0300 Subject: [PATCH 08/11] =?UTF-8?q?ci:=20=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20?= =?UTF-8?q?=D0=BB=D0=B8=D1=88=D0=BD=D1=8E=D1=8E=20=D0=B2=D0=BB=D0=BE=D0=B6?= =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D0=BE=D1=81=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7bf4eee..694fafd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -47,8 +47,8 @@ jobs: uses: thedoctor0/zip-release@0.7.1 with: type: 'zip' - filename: '${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.spec }}.zip' - path: 'dist' + directory: 'dist' + filename: "../${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.spec }}.zip" - name: Загрузка артефактов uses: actions/upload-artifact@v3 with: From 37ea556ad20c7b2d3b346e0eafd583c60121d594 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Thu, 28 Sep 2023 11:08:53 +0300 Subject: [PATCH 09/11] =?UTF-8?q?fix:=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BE=D0=BA=D0=BD=D0=BE=20"=D0=9E?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC=D0=B5"=20(#?= =?UTF-8?q?21)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- statapp-onefile.spec | 5 +- statapp.spec | 8 +- statapp/about_window.py | 15 +++- statapp/ui/about_window.ui | 164 ++++++++++++++++++++-------------- statapp/ui/ui_about_window.py | 62 +++++++++---- 5 files changed, 166 insertions(+), 88 deletions(-) diff --git a/statapp-onefile.spec b/statapp-onefile.spec index bea3955..8bf46a7 100644 --- 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={}, diff --git a/statapp.spec b/statapp.spec index 247ce69..917e58e 100644 --- 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, diff --git a/statapp/about_window.py b/statapp/about_window.py index 8795fbc..af51e9f 100644 --- 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}") diff --git a/statapp/ui/about_window.ui b/statapp/ui/about_window.ui index 22bbbb0..0b81161 100644 --- a/statapp/ui/about_window.ui +++ b/statapp/ui/about_window.ui @@ -9,7 +9,7 @@ 0 0 - 476 + 483 543 @@ -23,70 +23,7 @@ - - - - - 14 - false - false - false - false - PreferDefault - true - - - - Донецкий Национальный Технический Университет - - - Qt::AlignCenter - - - - - - - - 14 - false - false - false - false - PreferDefault - true - - - - Разработчики: Слипенко М., Лазуренко Е. - - - Qt::AlignCenter - - - - - - - - 14 - false - false - false - false - PreferDefault - true - - - - Теоретический фундамент: Дмитрюк Т. Г. - - - Qt::AlignCenter - - - - + @@ -103,6 +40,7 @@ 14 + 50 false false false @@ -122,6 +60,102 @@ + + + + + 12 + 50 + false + false + false + false + PreferDefault + true + + + + Донецкий Национальный Технический Университет + + + Qt::AlignCenter + + + + + + + + 14 + 50 + false + false + false + false + PreferDefault + true + + + + Разработчики: Слипенко М., Лазуренко Е. + + + Qt::AlignCenter + + + + + + + + 12 + + + + Версия: + + + Qt::AlignCenter + + + + + + + + 14 + 50 + false + false + false + false + PreferDefault + true + + + + Теоретический фундамент: Дмитрюк Т. Г. + + + Qt::AlignCenter + + + + + + + + 20 + + + + Statapp + + + Qt::AlignCenter + + + diff --git a/statapp/ui/ui_about_window.py b/statapp/ui/ui_about_window.py index 725f828..2bafd32 100644 --- 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 From 16d8481700f0ed6a3660b06d4e3b105110c53618 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 Sep 2023 11:14:06 +0300 Subject: [PATCH 10/11] chore(main): release 0.2.1 (#23) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :robot: I have created a release *beep* *boop* --- ## [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)) --- 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> --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71248a0..334961e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # 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) diff --git a/pyproject.toml b/pyproject.toml index 3364d4e..b88d862 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "statapp" -version = "0.2.0" +version = "0.2.1" description = "" authors = [ "Maxim Slipenko " From 2cd82354a1f0987474663ffbe1864ecbb371985b Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Thu, 28 Sep 2023 11:22:21 +0300 Subject: [PATCH 11/11] =?UTF-8?q?ci:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D1=8F=D0=B5=D1=82=20checkout=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20=D1=84=D0=B0?= =?UTF-8?q?=D0=B9=D0=BB=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 694fafd..ec363a5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -65,6 +65,8 @@ jobs: 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