mirror of
https://github.com/shizand/statapp.git
synced 2025-10-07 21:03:23 +03:00
Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
d71bd9843f | ||
c1809a0bc7 | |||
|
83d9faeb85 | ||
57dec07000 | |||
|
cca57740a2 | ||
b6e10c4209 | |||
|
67958838fc | ||
8b7fabfa46 | |||
f603a77130 |
15
.github/workflows/release.yml
vendored
15
.github/workflows/release.yml
vendored
@@ -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 }}
|
||||
path: '${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.spec }}.zip'
|
||||
name: ${{ matrix.target }}-${{ matrix.arch }}-${{ matrix.spec }}
|
||||
path: '${{ matrix.target }}-${{ matrix.arch }}-${{ matrix.spec }}.zip'
|
||||
|
||||
release-please:
|
||||
runs-on: ubuntu-latest
|
||||
|
28
CHANGELOG.md
28
CHANGELOG.md
@@ -1,5 +1,33 @@
|
||||
# Changelog
|
||||
|
||||
## [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)
|
||||
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
[tool.poetry]
|
||||
name = "statapp"
|
||||
version = "0.3.1"
|
||||
version = "0.3.5"
|
||||
description = ""
|
||||
authors = [
|
||||
"Maxim Slipenko <statapp@maks1ms.addy.io>"
|
||||
|
@@ -1,4 +1,15 @@
|
||||
# -*- 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')]
|
||||
@@ -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(
|
||||
|
18
statapp.spec
18
statapp.spec
@@ -1,4 +1,15 @@
|
||||
# -*- 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')]
|
||||
@@ -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(
|
||||
|
@@ -88,6 +88,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)
|
||||
|
@@ -16,8 +16,8 @@ class FileSLCModel:
|
||||
return False
|
||||
|
||||
def loadFile(self):
|
||||
self.file_name, _ = QFileDialog.getOpenFileName(None, "Загрузить файл", "", "Files (*.txt;*.csv)")
|
||||
if not self.file_name:
|
||||
self.file_name, _ = QFileDialog.getOpenFileName(None, "Загрузить файл", "", "Files (*.txt *.csv)")
|
||||
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
|
||||
|
Reference in New Issue
Block a user