Skip to content

Commit

Permalink
Merge branch 'development' of https://github.com/danielhrisca/asammdf
Browse files Browse the repository at this point in the history
…into get_bits
  • Loading branch information
danielhrisca committed Dec 10, 2024
2 parents efbd08f + 9eb9eae commit a15dc8a
Show file tree
Hide file tree
Showing 15 changed files with 154 additions and 255 deletions.
28 changes: 15 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: build_macos
name: pyinstaller_build

on: [push, pull_request]

Expand All @@ -7,7 +7,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest]
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ["3.12"]

steps:
Expand All @@ -18,23 +18,25 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- name: Install packages
- name: Install linux libraries
shell: bash
if: ${{ matrix.os == 'ubuntu-latest' }}
run: |
pip install -r requirements_exe_build.txt
python -m build --wheel
sudo apt update
sudo apt install libegl1 libopengl0
- name: Build an executable
shell: bash
if: ${{ matrix.python-version == '3.12' }}
- name: Install Python packages
run: |
pip install tox
- name: Build the executable
run: |
pip install -r requirements_exe_build.txt
python -m build --wheel
pyinstaller asammdf.spec --distpath dist/${RUNNER_OS} --noconfirm --clean
tox -e pyinstaller -- --distpath dist/${{ matrix.os }} --noconfirm --clean
# see: https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
- name: Archive dist artifacts
uses: actions/upload-artifact@v4
with:
name: dist
path: dist/**
name: pyinstaller-${{ matrix.os }}
path: dist/${{ matrix.os }}/**
if-no-files-found: error
40 changes: 0 additions & 40 deletions .github/workflows/build_linux.yml

This file was deleted.

40 changes: 0 additions & 40 deletions .github/workflows/build_windows.yml

This file was deleted.

24 changes: 24 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
cmake_minimum_required(VERSION 3.15...3.26)

project(
${SKBUILD_PROJECT_NAME}
LANGUAGES C
VERSION ${SKBUILD_PROJECT_VERSION})

find_package(
Python
COMPONENTS
Interpreter
Development.Module
${SKBUILD_SABI_COMPONENT}
NumPy
REQUIRED)

python_add_library(cutils
MODULE
src/asammdf/blocks/cutils.c
WITH_SOABI USE_SABI 3.9)

target_link_libraries(cutils PRIVATE Python::NumPy)

install(TARGETS cutils DESTINATION "asammdf/blocks")
82 changes: 80 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,84 @@
[build-system]
requires = ["numpy", "setuptools"]
build-backend = "setuptools.build_meta"
requires = ["scikit-build-core", "numpy"]
build-backend = "scikit_build_core.build"

[project]
name = "asammdf"
description="ASAM MDF measurement data file parser"
readme = "README.md"
requires-python = ">=3.9"
license = { text = "LGPLv3+" }
authors = [{ name = "Daniel Hrisca", email = "daniel.hrisca@gmail.com" }]
dynamic = ["version"]
classifiers = [
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"Topic :: Software Development",
"Topic :: Scientific/Engineering",
"License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+)",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
]
keywords = [
"read",
"reader",
"edit",
"editor",
"parse",
"parser",
"asam",
"mdf",
"measurement",
]
dependencies = [
"canmatrix[arxml,dbc]>=1.0",
"isal; platform_machine == 'x86_64' or platform_machine == 'AMD64'",
"lxml>=4.9.3",
"lz4",
"numexpr",
"numpy>=1.23.0",
"pandas",
"python-dateutil",
"typing-extensions",
]

[project.optional-dependencies]
decode = ["faust-cchardet==2.1.19", "chardet"]
export = [
"pyarrow",
"h5py",
"hdf5storage>=0.1.19",
"python-snappy",
]
export_matlab_v5 = ["scipy"]
gui = [
"natsort",
"PySide6",
"pyqtgraph",
"pyqtlet2",
"packaging",
"QtPy",
]
encryption = ["cryptography", "keyring"]
symbolic_math = ["sympy"]
filesystem = ["fsspec"]

[project.scripts]
asammdf = "asammdf.app.asammdfgui:main [gui]"

[project.urls]
Documentation = "https://asammdf.readthedocs.io/en/master"
Issues = "https://github.com/danielhrisca/asammdf/issues"
Source = "https://github.com/danielhrisca/asammdf"

[tool.scikit-build]
metadata.version.provider = "scikit_build_core.metadata.regex"
metadata.version.input = "src/asammdf/version.py"
wheel.packages = ["src/asammdf"]
wheel.py-api = "cp39"

[tool.black]
line-length = 120
Expand Down
5 changes: 0 additions & 5 deletions requirements_exe_build.txt

This file was deleted.

145 changes: 0 additions & 145 deletions setup.py

This file was deleted.

Loading

0 comments on commit a15dc8a

Please sign in to comment.