Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
danielhrisca committed Oct 19, 2023
2 parents eee86e5 + 36bf7fd commit a33fdbc
Show file tree
Hide file tree
Showing 113 changed files with 7,616 additions and 8,778 deletions.
9 changes: 7 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
repos:
- repo: https://github.com/psf/black
rev: stable
- repo: https://github.com/ambv/black
rev: 23.9.1
hooks:
- id: black
- repo: https://github.com/charliermarsh/ruff-pre-commit
# Ruff version.
rev: v0.1.0
hooks:
- id: ruff
11 changes: 4 additions & 7 deletions asammdf.spec
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
# -*- mode: python -*-
import argparse
import os
from pathlib import Path
import site
import sys

asammdf_path = Path.cwd() / "src" / "asammdf" / "gui" / "asammdfgui.py"
sys.setrecursionlimit(sys.getrecursionlimit() * 5)

asammdf_path = Path.cwd() / "src" / "asammdf" / "gui" / "asammdfgui.py"

block_cipher = None
added_files = []

for root, dirs, files in os.walk(asammdf_path.parent / "ui"):
for file in files:
if file.lower().endswith(("ui", "png", "qrc")):
added_files.append(
(os.path.join(root, file), os.path.join("asammdf", "gui", "ui"))
)
added_files.append((os.path.join(root, file), os.path.join("asammdf", "gui", "ui")))

import pyqtlet2

Expand Down Expand Up @@ -57,7 +55,6 @@ a = Analysis(
noarchive=False,
)


pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)

exe = EXE(
Expand Down
Loading

0 comments on commit a33fdbc

Please sign in to comment.