Skip to content
This repository was archived by the owner on Apr 20, 2026. It is now read-only.

Commit 3495a72

Browse files
authored
Merge pull request #82 from MercurySeven/develop
Fix bug e aggiunta test
2 parents fc4b61e + 4e40251 commit 3495a72

80 files changed

Lines changed: 1191 additions & 303 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.coveragerc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[run]
22
omit =
33
*controllers*
4-
*/main.py
4+
*/__main__.py
55
*/api.py
6+
*/assets_path.py

.github/codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
coverage:
22
precision: 2
3-
round: down
3+
round: up
44
range: "70...100"
55
status:
66
patch: off

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Set up Python
2828
uses: actions/setup-python@v2
2929
with:
30-
python-version: 3.9.4
30+
python-version: 3.9.5
3131

3232
- uses: actions/cache@v2
3333
with:

.github/workflows/codecov.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ jobs:
66
runs-on: windows-latest
77
env:
88
OS: windows-latest
9-
PYTHON: '3.9.4'
9+
PYTHON: '3.9.5'
1010
steps:
1111

1212
- uses: actions/checkout@master
1313

1414
- name: Setup Python
1515
uses: actions/setup-python@master
1616
with:
17-
python-version: 3.9.4
17+
python-version: 3.9.5
1818

1919
- uses: actions/cache@v2
2020
with:

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- name: Setup Python
1010
uses: actions/setup-python@v1
1111
with:
12-
python-version: 3.9.4
12+
python-version: 3.9.5
1313
architecture: x64
1414
- uses: actions/checkout@master
1515
- name: Install flake8

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,4 +145,8 @@ cython_debug/
145145
.envFile
146146
*.mer
147147
config.ini
148-
tests/*.txt
148+
tests/*.txt
149+
150+
# Per deploy
151+
/linux/*
152+
/macOS/*

app_inst.spec

Lines changed: 0 additions & 38 deletions
This file was deleted.

docs/guidepycharm_qt6.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ if __name__ == "__main__":
7878
widget.resize(800, 600)
7979
widget.show()
8080
81-
sys.exit(app.exec_())
81+
sys.exit(app.exec())
8282
```
8383

8484
il programma di prova dovrebbe far comparire una gui!

docs/guidevscode_qt6.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Passi da seguire:
4242
"name": "Python: From main",
4343
"type": "python",
4444
"request": "launch",
45-
"program": "${workspaceFolder}/src/main.py",
45+
"program": "${workspaceFolder}/src/__main__.py",
4646
"console": "integratedTerminal",
4747
"cwd": "${workspaceFolder}",
4848
"env": {
@@ -52,4 +52,4 @@ Passi da seguire:
5252
]
5353
}
5454
```
55-
8. Per generare l'eseguibile: `pyinstaller .\app_inst.spec --noconfirm`
55+
8. Per generare l'eseguibile su windows, eseguire il file: `win-dist.bat`, nella cartella `dist` ci sarà l'eseguibile

pyproject.toml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
[tool.briefcase]
2+
project_name = "SSD"
3+
bundle = "com.mercuryseven"
4+
version = "1.0.0"
5+
url = "https://github.com/MercurySeven"
6+
license = "GNU General Public License v3 (GPLv3)"
7+
author = 'Mercury Seven'
8+
author_email = "mercuryseven.swe@gmail.com"
9+
10+
[tool.briefcase.app.src]
11+
formal_name = "ssd"
12+
description = "client di sincronizzazione file per servizi zextras"
13+
sources = ['src']
14+
requires = ['pyside6==6.1.0',
15+
'shiboken6==6.1.0',
16+
'gql==3.0.0a5',
17+
'watchdog==2.1.0',
18+
'aiohttp==3.7.4',
19+
'configparser==5.0.2',
20+
'requests==2.25.1',
21+
'psutil==5.8.0',
22+
'bitmath==1.3.3.1']
23+
24+
25+
[tool.briefcase.app.src.macOS]
26+
requires = []
27+
28+
[tool.briefcase.app.src.linux]
29+
requires = ['pyside6==6.1.0']
30+
system_requires = ['libgl1','python3-pyqt5','qt5-default','libpq5']
31+
32+
[tool.briefcase.app.src.windows]
33+
requires = []

0 commit comments

Comments
 (0)