From 0fc8c8341367a635245d7f9f385cd648ac35be6e Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Tue, 26 Sep 2023 21:17:23 +0300 Subject: [PATCH 1/7] =?UTF-8?q?ci:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B0=20?= =?UTF-8?q?=D1=81=20=D0=BF=D0=BE=D0=BC=D0=BE=D1=89=D1=8C=D1=8E=20pyinstall?= =?UTF-8?q?er=20(#16)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 45 +++++++++++ poetry.lock | 139 +++++++++++++++++++++++++++++++++- pyproject.toml | 1 + statapp/about_window.py | 4 +- statapp/utils.py | 11 +++ 5 files changed, 198 insertions(+), 2 deletions(-) create mode 100644 statapp/utils.py diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f149387..e8cb888 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,11 +9,56 @@ permissions: pull-requests: write jobs: + build: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + steps: + - uses: actions/checkout@v3 + - name: Установка python + uses: actions/setup-python@v4 + with: + python-version: 3.9 + - name: Установка poetry + uses: abatilo/actions-poetry@v2 + with: + poetry-version: 1.6.1 + - name: Настройка virtualenv + run: | + poetry config virtualenvs.create true --local + poetry config virtualenvs.in-project true --local + - uses: actions/cache@v3 + with: + path: ./.venv + key: venv-${{ hashFiles('poetry.lock') }} + - name: Установка зависимостей + run: poetry install + - name: Сборка + run: poetry run pyinstaller statapp.spec + - name: Загрузка артефактов + uses: actions/upload-artifact@v3 + with: + name: ${{ matrix.os }} + path: ./dist/statapp* + release-please: runs-on: ubuntu-latest + needs: [build] steps: - uses: google-github-actions/release-please-action@v3 with: release-type: python package-name: statapp changelog-types: '[{"type":"feat","section":"Новые функции","hidden":false},{"type":"fix","section":"Исправления","hidden":false},{"type":"chore", "hidden":true}]' + - name: Скачивание артефактов + if: ${{ steps.release.outputs.release_created }} + uses: actions/download-artifact@v3 + with: + path: dist + - name: Загрузка в релиз + if: ${{ steps.release.outputs.release_created }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: + gh release upload ${{ steps.release.outputs.tag_name }} ./dist/* diff --git a/poetry.lock b/poetry.lock index 881a2d2..e192db7 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,5 +1,16 @@ # This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. +[[package]] +name = "altgraph" +version = "0.17.4" +description = "Python graph (network) package" +optional = false +python-versions = "*" +files = [ + {file = "altgraph-0.17.4-py2.py3-none-any.whl", hash = "sha256:642743b4750de17e655e6711601b077bc6598dbfa3ba5fa2b2a35ce12b508dff"}, + {file = "altgraph-0.17.4.tar.gz", hash = "sha256:1b5afbb98f6c4dcadb2e2ae6ab9fa994bbb8c1d75f4fa96d340f9437ae454406"}, +] + [[package]] name = "cfgv" version = "3.4.0" @@ -52,6 +63,39 @@ files = [ [package.extras] license = ["ukkonen"] +[[package]] +name = "importlib-metadata" +version = "6.8.0" +description = "Read metadata from Python packages" +optional = false +python-versions = ">=3.8" +files = [ + {file = "importlib_metadata-6.8.0-py3-none-any.whl", hash = "sha256:3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb"}, + {file = "importlib_metadata-6.8.0.tar.gz", hash = "sha256:dbace7892d8c0c4ac1ad096662232f831d4e64f4c4545bd53016a3e9d4654743"}, +] + +[package.dependencies] +zipp = ">=0.5" + +[package.extras] +docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] +perf = ["ipython"] +testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)", "pytest-ruff"] + +[[package]] +name = "macholib" +version = "1.16.3" +description = "Mach-O header analysis and editing" +optional = false +python-versions = "*" +files = [ + {file = "macholib-1.16.3-py2.py3-none-any.whl", hash = "sha256:0e315d7583d38b8c77e815b1ecbdbf504a8258d8b3e17b61165c6feb60d18f2c"}, + {file = "macholib-1.16.3.tar.gz", hash = "sha256:07ae9e15e8e4cd9a788013d81f5908b3609aa76f9b1421bae9c4d7606ec86a30"}, +] + +[package.dependencies] +altgraph = ">=0.17" + [[package]] name = "nodeenv" version = "1.8.0" @@ -107,6 +151,17 @@ files = [ {file = "numpy-1.26.0.tar.gz", hash = "sha256:f93fc78fe8bf15afe2b8d6b6499f1c73953169fad1e9a8dd086cdff3190e7fdf"}, ] +[[package]] +name = "packaging" +version = "23.1" +description = "Core utilities for Python packages" +optional = false +python-versions = ">=3.7" +files = [ + {file = "packaging-23.1-py3-none-any.whl", hash = "sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61"}, + {file = "packaging-23.1.tar.gz", hash = "sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f"}, +] + [[package]] name = "pandas" version = "2.1.1" @@ -174,6 +229,17 @@ sql-other = ["SQLAlchemy (>=1.4.36)"] test = ["hypothesis (>=6.46.1)", "pytest (>=7.3.2)", "pytest-asyncio (>=0.17.0)", "pytest-xdist (>=2.2.0)"] xml = ["lxml (>=4.8.0)"] +[[package]] +name = "pefile" +version = "2023.2.7" +description = "Python PE parsing module" +optional = false +python-versions = ">=3.6.0" +files = [ + {file = "pefile-2023.2.7-py3-none-any.whl", hash = "sha256:da185cd2af68c08a6cd4481f7325ed600a88f6a813bad9dea07ab3ef73d8d8d6"}, + {file = "pefile-2023.2.7.tar.gz", hash = "sha256:82e6114004b3d6911c77c3953e3838654b04511b8b66e8583db70c65998017dc"}, +] + [[package]] name = "platformdirs" version = "3.10.0" @@ -207,6 +273,51 @@ nodeenv = ">=0.11.1" pyyaml = ">=5.1" virtualenv = ">=20.10.0" +[[package]] +name = "pyinstaller" +version = "6.0.0" +description = "PyInstaller bundles a Python application and all its dependencies into a single package." +optional = false +python-versions = "<3.13,>=3.8" +files = [ + {file = "pyinstaller-6.0.0-py3-none-macosx_10_13_universal2.whl", hash = "sha256:d84b06fb9002109bfc542e76860b81459a8585af0bbdabcfc5dcf272ef230de7"}, + {file = "pyinstaller-6.0.0-py3-none-manylinux2014_aarch64.whl", hash = "sha256:aa922d1d73881d0820a341d2c406a571cc94630bdcdc275427c844a12e6e376e"}, + {file = "pyinstaller-6.0.0-py3-none-manylinux2014_i686.whl", hash = "sha256:52e5b3a2371d7231de17515c7c78d8d4a39d70c8c095e71d55b3b83434a193a8"}, + {file = "pyinstaller-6.0.0-py3-none-manylinux2014_ppc64le.whl", hash = "sha256:4a75bde5cda259bb31f2294960d75b9d5c148001b2b0bd20a91f9c2116675a6c"}, + {file = "pyinstaller-6.0.0-py3-none-manylinux2014_s390x.whl", hash = "sha256:5314f6f08d2bcbc031778618ba97d9098d106119c2e616b3b081171fe42f5415"}, + {file = "pyinstaller-6.0.0-py3-none-manylinux2014_x86_64.whl", hash = "sha256:0ad7cc3776ca17d0bededcc352cba2b1c89eb4817bfabaf05972b9da8c424935"}, + {file = "pyinstaller-6.0.0-py3-none-musllinux_1_1_aarch64.whl", hash = "sha256:cccdad6cfe7a5db7d7eb8df2e5678f8375268739d5933214e180da300aa54e37"}, + {file = "pyinstaller-6.0.0-py3-none-musllinux_1_1_x86_64.whl", hash = "sha256:fb6af82989dac7c58bd25ed9ba3323bc443f8c1f03804f69c9f5e363bf4a021c"}, + {file = "pyinstaller-6.0.0-py3-none-win32.whl", hash = "sha256:68769f5e6722474bb1038e35560444659db8b951388bfe0c669bb52a640cd0eb"}, + {file = "pyinstaller-6.0.0-py3-none-win_amd64.whl", hash = "sha256:438a9e0d72a57d5bba4f112d256e39ea4033c76c65414c0693d8311faa14b090"}, + {file = "pyinstaller-6.0.0-py3-none-win_arm64.whl", hash = "sha256:16a473065291dd7879bf596fa20e65bd9d1e8aafc2cef1bffa3e42e707e2e68e"}, + {file = "pyinstaller-6.0.0.tar.gz", hash = "sha256:d702cff041f30e7a53500b630e07b081e5328d4655023319253d73935e75ade2"}, +] + +[package.dependencies] +altgraph = "*" +importlib-metadata = {version = ">=4.6", markers = "python_version < \"3.10\""} +macholib = {version = ">=1.8", markers = "sys_platform == \"darwin\""} +packaging = ">=20.0" +pefile = {version = ">=2022.5.30", markers = "sys_platform == \"win32\""} +pyinstaller-hooks-contrib = ">=2021.4" +pywin32-ctypes = {version = ">=0.2.1", markers = "sys_platform == \"win32\""} +setuptools = ">=42.0.0" + +[package.extras] +hook-testing = ["execnet (>=1.5.0)", "psutil", "pytest (>=2.7.3)"] + +[[package]] +name = "pyinstaller-hooks-contrib" +version = "2023.9" +description = "Community maintained hooks for PyInstaller" +optional = false +python-versions = ">=3.7" +files = [ + {file = "pyinstaller-hooks-contrib-2023.9.tar.gz", hash = "sha256:76084b5988e3957a9df169d2a935d65500136967e710ddebf57263f1a909cd80"}, + {file = "pyinstaller_hooks_contrib-2023.9-py2.py3-none-any.whl", hash = "sha256:f34f4c6807210025c8073ebe665f422a3aa2ac5f4c7ebf4c2a26cc77bebf63b5"}, +] + [[package]] name = "pyside6" version = "6.5.2" @@ -289,6 +400,17 @@ files = [ {file = "pytz-2023.3.post1.tar.gz", hash = "sha256:7b4fddbeb94a1eba4b557da24f19fdf9db575192544270a9101d8509f9f43d7b"}, ] +[[package]] +name = "pywin32-ctypes" +version = "0.2.2" +description = "A (partial) reimplementation of pywin32 using ctypes/cffi" +optional = false +python-versions = ">=3.6" +files = [ + {file = "pywin32-ctypes-0.2.2.tar.gz", hash = "sha256:3426e063bdd5fd4df74a14fa3cf80a0b42845a87e1d1e81f6549f9daec593a60"}, + {file = "pywin32_ctypes-0.2.2-py3-none-any.whl", hash = "sha256:bf490a1a709baf35d688fe0ecf980ed4de11d2b3e37b51e5442587a75d9957e7"}, +] + [[package]] name = "pyyaml" version = "6.0.1" @@ -421,7 +543,22 @@ platformdirs = ">=3.9.1,<4" docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.2)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.4)", "pytest-env (>=0.8.2)", "pytest-freezer (>=0.4.8)", "pytest-mock (>=3.11.1)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)", "setuptools (>=68)", "time-machine (>=2.10)"] +[[package]] +name = "zipp" +version = "3.17.0" +description = "Backport of pathlib-compatible object wrapper for zip files" +optional = false +python-versions = ">=3.8" +files = [ + {file = "zipp-3.17.0-py3-none-any.whl", hash = "sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31"}, + {file = "zipp-3.17.0.tar.gz", hash = "sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0"}, +] + +[package.extras] +docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"] +testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy (>=0.9.1)", "pytest-ruff"] + [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.12" -content-hash = "7a4e4c088cf2b371f4aad4e5a9240f375d2f8d912df57d82dbc4117537e0fd77" +content-hash = "a46a1262d4a6e27e44b1a59b5b668541846a1d2875705cba3dc22977a33eb4a0" diff --git a/pyproject.toml b/pyproject.toml index f49724f..b1448d9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,6 +13,7 @@ pyside6 = "^6.4.0" pandas = "^2.1.1" numpy = "^1.26.0" pre-commit = "^3.4.0" +pyinstaller = "^6.0.0" [build-system] diff --git a/statapp/about_window.py b/statapp/about_window.py index 482c422..fabca21 100644 --- a/statapp/about_window.py +++ b/statapp/about_window.py @@ -2,6 +2,7 @@ from PySide6.QtGui import QMovie from PySide6.QtWidgets import QMainWindow from statapp.ui.ui_about_window import Ui_AboutWindow +from statapp.utils import resource_path class AboutWindow(QMainWindow): @@ -12,7 +13,8 @@ class AboutWindow(QMainWindow): self.ui = Ui_AboutWindow() self.ui.setupUi(self) - image_path = 'statapp\\images\\sticker.gif' + image_path = resource_path('images/sticker.gif') + movie = QMovie(image_path) self.ui.labelgif.setMovie(movie) movie.start() diff --git a/statapp/utils.py b/statapp/utils.py new file mode 100644 index 0000000..e6e19cb --- /dev/null +++ b/statapp/utils.py @@ -0,0 +1,11 @@ +import os +import sys + + +def resource_path(relative): + if getattr(sys, 'frozen', False): + bundle_dir = sys._MEIPASS + else: + # we are running in a normal Python environment + bundle_dir = os.path.dirname(os.path.abspath(__file__)) + return os.path.join(bundle_dir, relative) From 3abbdfd531e49fc4971ddb9e200cc7f5acc3c99f Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Tue, 26 Sep 2023 21:23:36 +0300 Subject: [PATCH 2/7] ci: update release.yml --- .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 e8cb888..40dc37e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,7 +35,7 @@ jobs: - name: Установка зависимостей run: poetry install - name: Сборка - run: poetry run pyinstaller statapp.spec + run: poetry run pyinstaller ./statapp.spec - name: Загрузка артефактов uses: actions/upload-artifact@v3 with: From 31f07597267e167e25ac4eae05fc25742fe2106e Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Tue, 26 Sep 2023 21:36:34 +0300 Subject: [PATCH 3/7] ci: update release.yml --- .github/workflows/release.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 40dc37e..22f82c8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,28 +14,29 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] + defaults: + run: + shell: bash steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Установка python uses: actions/setup-python@v4 with: python-version: 3.9 - name: Установка poetry - uses: abatilo/actions-poetry@v2 + uses: snok/install-poetry@v1 with: - poetry-version: 1.6.1 - - name: Настройка virtualenv - run: | - poetry config virtualenvs.create true --local - poetry config virtualenvs.in-project true --local + version: 1.6.1 + virtualenvs-create: true + virtualenvs-in-project: true - uses: actions/cache@v3 with: path: ./.venv - key: venv-${{ hashFiles('poetry.lock') }} + key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} - name: Установка зависимостей run: poetry install - name: Сборка - run: poetry run pyinstaller ./statapp.spec + run: poetry run pyinstaller statapp.spec - name: Загрузка артефактов uses: actions/upload-artifact@v3 with: From b353a6a473804d575e4cc0d5291015a5f401c6ee Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Tue, 26 Sep 2023 21:42:22 +0300 Subject: [PATCH 4/7] ci: update release.yml --- .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 22f82c8..e0d39e3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,8 +35,11 @@ jobs: key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} - name: Установка зависимостей run: poetry install + - run: | + echo ${{ github.workspace }} + ls -la ${{ github.workspace }} - name: Сборка - run: poetry run pyinstaller statapp.spec + run: poetry run pyinstaller ${{ github.workspace }}/statapp.spec - name: Загрузка артефактов uses: actions/upload-artifact@v3 with: From e102eae964607cf0eb4fb2a63876c280e9d98e55 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Tue, 26 Sep 2023 21:52:36 +0300 Subject: [PATCH 5/7] ci: fix release --- .github/workflows/release.yml | 5 +---- .gitignore | 4 ++-- statapp.spec | 37 +++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 statapp.spec diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e0d39e3..22f82c8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,11 +35,8 @@ jobs: key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} - name: Установка зависимостей run: poetry install - - run: | - echo ${{ github.workspace }} - ls -la ${{ github.workspace }} - name: Сборка - run: poetry run pyinstaller ${{ github.workspace }}/statapp.spec + run: poetry run pyinstaller statapp.spec - name: Загрузка артефактов uses: actions/upload-artifact@v3 with: diff --git a/.gitignore b/.gitignore index 90f8fbb..ae6fe2a 100644 --- a/.gitignore +++ b/.gitignore @@ -34,7 +34,7 @@ MANIFEST # Usually these files are written by a python script from a template # before PyInstaller builds the exe, so as to inject date/other infos into it. *.manifest -*.spec +# *.spec # Installer logs pip-log.txt @@ -173,4 +173,4 @@ poetry.toml # LSP config files pyrightconfig.json -# End of https://www.toptal.com/developers/gitignore/api/python \ No newline at end of file +# End of https://www.toptal.com/developers/gitignore/api/python diff --git a/statapp.spec b/statapp.spec new file mode 100644 index 0000000..bea3955 --- /dev/null +++ b/statapp.spec @@ -0,0 +1,37 @@ +# -*- mode: python ; coding: utf-8 -*- + + +a = Analysis( + ['statapp/__main__.py'], + pathex=[], + binaries=[], + datas=[], + hiddenimports=[], + hookspath=[], + hooksconfig={}, + runtime_hooks=[], + excludes=[], + noarchive=False, +) +pyz = PYZ(a.pure) + +exe = EXE( + pyz, + a.scripts, + a.binaries, + a.datas, + [], + name='statapp', + debug=False, + bootloader_ignore_signals=False, + strip=False, + upx=True, + upx_exclude=[], + runtime_tmpdir=None, + console=False, + disable_windowed_traceback=False, + argv_emulation=False, + target_arch=None, + codesign_identity=None, + entitlements_file=None, +) From ffd796a11d91a5108089ca1897fca43072380630 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Wed, 27 Sep 2023 09:09:42 +0300 Subject: [PATCH 6/7] =?UTF-8?q?ci:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D1=82=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D1=83=20sta?= =?UTF-8?q?tapp-onefile=20=D0=B8=20statapp=20(#17)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 5 +++-- statapp-onefile.spec | 37 +++++++++++++++++++++++++++++++++++ statapp.spec | 18 +++++++++++------ 3 files changed, 52 insertions(+), 8 deletions(-) create mode 100644 statapp-onefile.spec diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 22f82c8..379441f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,6 +14,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] + spec: [statapp-onefile, statapp] defaults: run: shell: bash @@ -36,11 +37,11 @@ jobs: - name: Установка зависимостей run: poetry install - name: Сборка - run: poetry run pyinstaller statapp.spec + run: poetry run pyinstaller ${{ matrix.spec }}.spec - name: Загрузка артефактов uses: actions/upload-artifact@v3 with: - name: ${{ matrix.os }} + name: ${{ matrix.os }}-${{ matrix.spec }} path: ./dist/statapp* release-please: diff --git a/statapp-onefile.spec b/statapp-onefile.spec new file mode 100644 index 0000000..bea3955 --- /dev/null +++ b/statapp-onefile.spec @@ -0,0 +1,37 @@ +# -*- mode: python ; coding: utf-8 -*- + + +a = Analysis( + ['statapp/__main__.py'], + pathex=[], + binaries=[], + datas=[], + hiddenimports=[], + hookspath=[], + hooksconfig={}, + runtime_hooks=[], + excludes=[], + noarchive=False, +) +pyz = PYZ(a.pure) + +exe = EXE( + pyz, + a.scripts, + a.binaries, + a.datas, + [], + name='statapp', + debug=False, + bootloader_ignore_signals=False, + strip=False, + upx=True, + upx_exclude=[], + runtime_tmpdir=None, + console=False, + disable_windowed_traceback=False, + argv_emulation=False, + target_arch=None, + codesign_identity=None, + entitlements_file=None, +) diff --git a/statapp.spec b/statapp.spec index bea3955..247ce69 100644 --- a/statapp.spec +++ b/statapp.spec @@ -5,7 +5,7 @@ a = Analysis( ['statapp/__main__.py'], pathex=[], binaries=[], - datas=[], + datas=[('statapp/images/sticker.gif', 'images')], hiddenimports=[], hookspath=[], hooksconfig={}, @@ -18,20 +18,26 @@ pyz = PYZ(a.pure) exe = EXE( pyz, a.scripts, - a.binaries, - a.datas, [], + exclude_binaries=True, name='statapp', debug=False, bootloader_ignore_signals=False, strip=False, upx=True, - upx_exclude=[], - runtime_tmpdir=None, - console=False, + console=True, disable_windowed_traceback=False, argv_emulation=False, target_arch=None, codesign_identity=None, entitlements_file=None, ) +coll = COLLECT( + exe, + a.binaries, + a.datas, + strip=False, + upx=True, + upx_exclude=[], + name='statapp', +) From fe37f33d8457ebcdeaa63d4819d3d9814a4bd2f9 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Wed, 27 Sep 2023 10:20:56 +0300 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?= =?UTF-8?q?=D0=BA=D0=B0=20Windows=207=20(#18)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 2 +- .idea/runConfigurations/statapp.xml | 4 +- poetry.lock | 243 +++++++++++----------------- pyproject.toml | 8 +- statapp/__main__.py | 4 +- statapp/about_window.py | 4 +- statapp/main_window.py | 7 +- statapp/ui/ui_about_window.py | 16 +- statapp/ui/ui_main_window.py | 18 +-- 9 files changed, 122 insertions(+), 184 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 379441f..f5d3c6c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ jobs: - name: Установка python uses: actions/setup-python@v4 with: - python-version: 3.9 + python-version: 3.8 - name: Установка poetry uses: snok/install-poetry@v1 with: diff --git a/.idea/runConfigurations/statapp.xml b/.idea/runConfigurations/statapp.xml index 3a0f2a0..c96e8cd 100644 --- a/.idea/runConfigurations/statapp.xml +++ b/.idea/runConfigurations/statapp.xml @@ -7,7 +7,7 @@