Skip to content

Commit 34b0314

Browse files
committed
[feat] add pip packaging
1 parent 642ae9c commit 34b0314

File tree

15 files changed

+46
-11
lines changed

15 files changed

+46
-11
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Build package
2323
run: |
2424
./build.sh
25-
python -m PyInstaller src/fastanalyzer.py --noconsole --name="FastAnalyzer" #--icon=assets/images/icon.ico
25+
python -m PyInstaller fastanalyzer/fastanalyzer.py --noconsole --name="FastAnalyzer" #--icon=assets/images/icon.ico
2626
- name: Linux artefact
2727
uses: actions/upload-artifact@v3
2828
with:
@@ -45,7 +45,7 @@ jobs:
4545
- name: Build package
4646
run: |
4747
./build.sh
48-
python -m PyInstaller src/fastanalyzer.py --noconsole --name="FastAnalyzer" --noconsole #--icon=assets/images/icon.ico
48+
python -m PyInstaller fastanalyzer/fastanalyzer.py --noconsole --name="FastAnalyzer" --noconsole #--icon=assets/images/icon.ico
4949
- name: Mac artefact
5050
uses: actions/upload-artifact@v3
5151
with:
@@ -69,7 +69,7 @@ jobs:
6969
shell: bash
7070
run: |
7171
./build.sh
72-
python -m PyInstaller src/fastanalyzer.py --noconsole --name="FastAnalyzer" --noconsole #--icon=assets/images/icon.ico
72+
python -m PyInstaller fastanalyzer/fastanalyzer.py --noconsole --name="FastAnalyzer" --noconsole #--icon=assets/images/icon.ico
7373
- name: Windows artefact
7474
uses: actions/upload-artifact@v3
7575
with:

build.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
pyside2-rcc src/resources.qrc -o src/rc_ressources.py
2-
pyside2-uic src/fastanalyzer.ui -o src/ui_fastanalyzer.py
3-
pyside2-uic src/plot.ui -o src/ui_plot.py
4-
pyside2-uic src/plot_settings.ui -o src/ui_plot_settings.py
5-
pyside2-uic src/data_calc.ui -o src/ui_data_calc.py
1+
pyside2-rcc fastanalyzer/resources.qrc -o fastanalyzer/rc_ressources.py
2+
pyside2-uic fastanalyzer/fastanalyzer.ui -o fastanalyzer/ui_fastanalyzer.py
3+
pyside2-uic fastanalyzer/plot.ui -o fastanalyzer/ui_plot.py
4+
pyside2-uic fastanalyzer/plot_settings.ui -o fastanalyzer/ui_plot_settings.py
5+
pyside2-uic fastanalyzer/data_calc.ui -o fastanalyzer/ui_data_calc.py

fastanalyzer/__init__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
from fastanalyzer import *
2+
3+
if __name__ == '__main__':
4+
main()
5+
6+
File renamed without changes.
File renamed without changes.

src/fastanalyzer.py renamed to fastanalyzer/fastanalyzer.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
import rc_ressources
1+
#!/usr/bin/env python
22
import os
33
import sys
4+
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
5+
import rc_ressources
6+
import sys
47
import pickle
58

69
from plot import Plot
@@ -290,7 +293,7 @@ def checkLicense(self):
290293
self.close()
291294

292295

293-
if __name__ == "__main__":
296+
def main():
294297
app = QApplication([])
295298
QFontDatabase.addApplicationFont(":/assets/RobotoCondensed-Regular.ttf")
296299
QFontDatabase.addApplicationFont(":/assets/Roboto-Regular.ttf")
@@ -302,3 +305,6 @@ def checkLicense(self):
302305
widget = FastAnalyzer()
303306
widget.show()
304307
sys.exit(app.exec_())
308+
309+
if __name__ == '__main__':
310+
main()
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)