Compare commits

..

No commits in common. "master" and "v2.1.0" have entirely different histories.

11 changed files with 31 additions and 27 deletions

View File

@ -3,6 +3,7 @@ name: CI Build Wheel
on:
push:
branches: [master]
tags: ["v[0-9]+.[0-9]+.[0-9]+"]
jobs:
@ -15,7 +16,7 @@ jobs:
- name: Prepare wheel build
run: make -C python/ setup
- name: Store wheel configuration files
uses: actions/upload-artifact@v4.6.0
uses: actions/upload-artifact@v4
with:
name: wheel-config
path: python/
@ -28,7 +29,8 @@ jobs:
needs: [build_setup]
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
os: [ubuntu-24.04, windows-2022]
arch: [auto32, auto64, aarch64]
steps:
- uses: actions/checkout@v2
@ -43,10 +45,12 @@ jobs:
- name: Build wheels
run: python -m cibuildwheel --output-dir wheelhouse
working-directory: python/
# env:
# CIBW_BUILD: cp36-* cp37-* cp38-* cp39-* cp310-*
- name: Store binary wheels
uses: actions/upload-artifact@v4.6.0
uses: actions/upload-artifact@v4
with:
name: binary-wheels-${{matrix.os}}-${{ strategy.job-index }}
name: binary-wheels-${{matrix.os}}-${{matrix.arch}}
path: python/wheelhouse/*.whl
build_sdist:
@ -66,7 +70,7 @@ jobs:
run: python setup.py sdist
working-directory: python/
- name: Store source wheels
uses: actions/upload-artifact@v4.6.0
uses: actions/upload-artifact@v4
with:
name: source-wheels
path: python/dist/*.tar.gz

View File

@ -2,7 +2,7 @@
[![LICENSE](https://img.shields.io/github/license/RecordEvolution/TDMtermite)](https://img.shields.io/github/license/RecordEvolution/TDMtermite)
[![STARS](https://img.shields.io/github/stars/RecordEvolution/TDMtermite)](https://img.shields.io/github/stars/RecordEvolution/TDMtermite)
![CI Build Wheel](https://github.com/RecordEvolution/TDMtermite/actions/workflows/pypi-deploy.yml/badge.svg?branch=&event=push)
[![PYPI](https://img.shields.io/pypi/v/TDMtermite.svg)](https://pypi.org/project/tdmtermite/)
[![PYPI](https://img.shields.io/pypi/v/TDMtermite.svg)](https://pypi.org/project/TDMtermite/)
# TDMtermite
@ -164,10 +164,10 @@ which makes the module available for import by `import tdm_termite` .
#### Installation with pip
The package is also available via the [Python Package Index](https://pypi.org) at
[TDMtermite](https://pypi.org/project/tdmtermite/). To install the latest version simply do
[TDMtermite](https://pypi.org/project/TDMtermite/). To install the latest version simply do
```Shell
python3 -m pip install tdmtermite
python3 -m pip install TDMtermite
```
##### Unix
@ -224,7 +224,7 @@ To be able to use the Python module _tdm_termite_, it first has to be built loca
or installed on the system. In the Python interpreter, simply do:
```Python
import tdmtermite
import TDMtermite
```
This will import the module. The TDM files are provided by creating an instance of
@ -233,7 +233,7 @@ the _tdmtermite_ class:
```Python
# create 'tdmtermite' instance object
try :
jack = tdmtermite.tdmtermite(b'samples/SineData.tdm',b'samples/SineData.tdx')
jack = TDMtermite.tdmtermite(b'samples/SineData.tdm',b'samples/SineData.tdx')
except RuntimeError as e:
print("failed to load/decode TDM files: " + str(e))
```
@ -254,12 +254,12 @@ As a use case, we have a look at listing the ids of all channelgroups and printi
their data to separate files:
```Python
import tdmtermite
import TDMtermite
import re
# create 'tdmtermite' instance object
try :
jack = tdmtermite.tdmtermite(b'samples/SineData.tdm',b'samples/SineData.tdx')
jack = TDMtermite.tdmtermite(b'samples/SineData.tdm',b'samples/SineData.tdx')
except RuntimeError as e :
print("failed to load/decode TDM files: " + str(e))
@ -293,8 +293,8 @@ to simply extract all data of the TDM datatset and dump it to files in a given
(existing!) directory, do
```Python
import tdmtermite
jack = tdmtermite.tdmtermite(b'samples/SineData.tdm',b'samples/SineData.tdx')
import TDMtermite
jack = TDMtermite.tdmtermite(b'samples/SineData.tdm',b'samples/SineData.tdx')
jack.write_all(b"./my_tdm_data_directory/")
```

View File

@ -1,7 +1,7 @@
# distutils: language = c++
# cython: language_level = 3
from tdmtermite cimport cpptdmtermite
from TDMtermite cimport cpptdmtermite
import json as jn

View File

@ -1 +1 @@
2.1.3
2.0.2

View File

@ -1,11 +1,11 @@
import tdmtermite
import TDMtermite
import json
import re
# create 'tdm_termite' instance object
try :
jack = tdmtermite.tdmtermite(b'samples/SineData.tdm',b'samples/SineData.tdx')
jack = TDMtermite.tdmtermite(b'samples/SineData.tdm',b'samples/SineData.tdx')
except RuntimeError as e :
print("failed to load/decode TDM files: " + str(e))

View File

@ -1,9 +1,9 @@
import tdmtermite
import TDMtermite
# create 'tdm_termite' instance object
try :
jack = tdmtermite.tdmtermite(b'samples/SineData.tdm',b'samples/SineData.tdx')
jack = TDMtermite.tdmtermite(b'samples/SineData.tdm',b'samples/SineData.tdx')
# list ids of channelgroups
grpids = jack.get_channelgroup_ids()
# iterate through groups

View File

@ -1,12 +1,12 @@
import tdmtermite
import TDMtermite
# import numpy as np
import json
import re
# create 'tdm_termite' instance object
try :
jack = tdmtermite.tdmtermite(b'samples/SineData.tdm',b'samples/SineData.tdx')
jack = TDMtermite.tdmtermite(b'samples/SineData.tdm',b'samples/SineData.tdx')
except RuntimeError as e :
print("failed to load/decode TDM files: " + str(e))

View File

@ -30,8 +30,8 @@ build-bdist: setup
build-clean:
python setup.py clean --all
rm -vf tdmtermite*.so tdmtermite*.cpp
rm -rvf dist/ tdmtermite.egg-info/
rm -vf TDMtermite*.so TDMtermite*.cpp
rm -rvf dist/ IMCtermite.egg-info/
cibuildwheel-build: setup
cibuildwheel --platform linux

View File

@ -1,6 +1,6 @@
[metadata]
name = tdmtermite
name = TDMtermite
description = Extract and read data from National Instruments LabVIEW tdx/tdm files and export them as csv files
long_description = file: README.md
# long_description_content_type = text/x-rst

View File

@ -11,9 +11,9 @@ cmpArgs = {
}
extension = Extension(
"tdmtermite",
"TDMtermite",
language='c++',
sources=["tdmtermite.pyx"],
sources=["TDMtermite.pyx"],
include_dirs=["lib","3rdparty/pugixml"],
extra_compile_args=cmpArgs[sys.platform]
)