Skip to content

Commit 7baf92b

Browse files
authored
Merge pull request #89 from Team-Arduino-Logique/paquet-installation
Paquet d'installation fonctionnel
2 parents ae4cf27 + c70392e commit 7baf92b

16 files changed

+728
-155
lines changed

.github/workflows/pylint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Pylint
1+
name: Pylint/Mypy
22

33
on: [pull_request]
44

.github/workflows/release_pipeline.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,15 @@ jobs:
2727
run: pyinstaller arduino_logique.spec
2828

2929
- name: Compress the build
30-
run: tar -czvf arduino_logique_macos.tar.gz dist/arduino_logique
30+
run: |
31+
cd dist
32+
tar -czvf arduino_logique_macos.tar.gz arduino_logique
3133
3234
- name: Upload artifact
3335
uses: actions/upload-artifact@v3
3436
with:
3537
name: macos-build
36-
path: arduino_logique_macos.tar.gz
38+
path: dist/arduino_logique_macos.tar.gz
3739

3840
build-ubuntu:
3941
runs-on: ubuntu-latest
@@ -53,13 +55,15 @@ jobs:
5355
run: pyinstaller arduino_logique.spec
5456

5557
- name: Compress the build
56-
run: tar -czvf arduino_logique_ubuntu.tar.gz dist/arduino_logique
58+
run: |
59+
cd dist
60+
tar -czvf arduino_logique_ubuntu.tar.gz arduino_logique
5761
5862
- name: Upload artifact
5963
uses: actions/upload-artifact@v3
6064
with:
6165
name: ubuntu-build
62-
path: arduino_logique_ubuntu.tar.gz
66+
path: dist/arduino_logique_ubuntu.tar.gz
6367

6468
build-windows:
6569
runs-on: windows-latest
@@ -131,3 +135,5 @@ jobs:
131135
artifacts: "./dist/arduino_logique_macos.tar.gz,./dist/arduino_logique_ubuntu.tar.gz,./dist/arduino_logique_windows.zip"
132136
token: ${{ secrets.GITHUB_TOKEN }}
133137
tag: ${{ steps.bump.outputs.new_tag }}
138+
makeLatest: ${{ !contains(steps.bump.outputs.new_tag, 'beta') }}
139+
prerelease: ${{ contains(steps.bump.outputs.new_tag, 'beta') }}

Images/ReelleMini170-0.jpg

-173 KB
Binary file not shown.

Images/ReelleMini170.png

-763 KB
Binary file not shown.

Images/ResultatMini170-1.png

-78.9 KB
Binary file not shown.

Images/ResultatMini170-2.png

-134 KB
Binary file not shown.

Images/ResultatMini170-3.png

-127 KB
Binary file not shown.

Images/ResultatMini170-4.png

-167 KB
Binary file not shown.

LICENSE

Lines changed: 674 additions & 0 deletions
Large diffs are not rendered by default.

arduino_logique.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
draw a breadboard, etc.
66
"""
77

8+
from pathlib import Path
89
import tkinter as tk
910
from tkinter import font
1011
from breadboard import Breadboard
1112
from component_sketch import ComponentSketcher
1213
from menus import Menus
1314
from sidebar import Sidebar
1415
from toolbar import Toolbar
16+
from utils import resource_path
1517

1618

1719
def main():
@@ -60,7 +62,7 @@ def main():
6062
# Creating the Sidebar instance after canvas, board, sketcher, component_data are defined
6163
sidebar = Sidebar(
6264
parent=win,
63-
chip_images_path="Assets/chips",
65+
chip_images_path=Path(resource_path("Assets/chips")).resolve(),
6466
canvas=canvas,
6567
sketcher=sketcher,
6668
current_dict_circuit=sketcher.current_dict_circuit,

0 commit comments

Comments
 (0)