Compare commits

..

3 Commits

13 changed files with 24 additions and 26 deletions

View File

@ -2,7 +2,7 @@
[![LICENSE](https://img.shields.io/github/license/RecordEvolution/IMCtermite)](https://img.shields.io/github/license/RecordEvolution/IMCtermite)
[![STARS](https://img.shields.io/github/stars/RecordEvolution/IMCtermite)](https://img.shields.io/github/stars/RecordEvolution/IMCtermite)
![CI Build Wheel](https://github.com/RecordEvolution/IMCtermite/actions/workflows/pypi-deploy.yml/badge.svg?branch=&event=push)
[![PYPI](https://img.shields.io/pypi/v/IMCtermite.svg)](https://pypi.org/project/IMCtermite/)
[![PYPI](https://img.shields.io/pypi/v/IMCtermite.svg)](https://pypi.org/project/imctermite/)
# IMCtermite
@ -131,24 +131,21 @@ which may require root permissions.
### Python
To integrate the library into a customized ETL toolchain, several cython targets
To integrate the library into a customized ETL toolchain, several python targets
are available. For a local build that enables you to run the examples, use:
```
make cython-build
make python-build
```
However, in a production environment, a proper installation of the module with
`make cython-install` is recommended for system-wide availability of the module.
#### Installation with pip
The package is also available in the [Python Package Index](https://pypi.org)
at [IMCtermite](https://pypi.org/project/IMCtermite/).
at [imctermite](https://pypi.org/project/imctermite/).
To install the latest version simply do
```Shell
python3 -m pip install IMCtermite
python3 -m pip install imctermite
```
which provides binary wheels for multiple architectures on _Windows_ and _Linux_
@ -195,9 +192,9 @@ Given the `IMCtermite` module is available, we can import it and declare an inst
of it by passing a _raw_ file to the constructor:
```Python
import IMCtermite
import imctermite
imcraw = IMCtermite.imctermite(b"sample/sampleA.raw")
imcraw = imctermite.imctermite(b"sample/sampleA.raw")
```
An example of how to create an instance and obtain the list of channels is:

View File

@ -88,11 +88,11 @@ docker-run:
python-build: check-tags $(GVSN)
make -C python/ build-inplace
cp python/IMCtermite*.so ./ -v
cp python/imctermite*.so ./ -v
python-clean:
make -C python/ clean
rm -vf IMCtermite*.so
rm -vf imctermite*.so
python-test:
PYTHONPATH=./ python python/examples/usage.py

View File

@ -1 +1 @@
2.1.17
2.1.18

View File

@ -1,5 +1,5 @@
import IMCtermite
import imctermite
import pandas
import datetime
@ -11,7 +11,7 @@ def add_trigger_time(trigger_time, add_time) :
if __name__ == "__main__" :
# read file and extract data
imctm = IMCtermite.imctermite(b"Measurement.raw")
imctm = imctermite.imctermite(b"Measurement.raw")
chns = imctm.get_channels(True)
# prepare abscissa

View File

@ -1,11 +1,11 @@
import IMCtermite
import imctermite
import json
import os
# declare and initialize instance of "imctermite" by passing a raw-file
try :
imcraw = IMCtermite.imctermite(b"samples/exampleB.raw")
imcraw = imctermite.imctermite(b"samples/exampleB.raw")
except RuntimeError as e :
raise Exception("failed to load/parse raw-file: " + str(e))

View File

@ -1,5 +1,5 @@
import IMCtermite
import imctermite
import json
import os
@ -15,7 +15,7 @@ for fl in rawlist1:
# declare and initialize instance of "imctermite" by passing a raw-file
try :
imcraw = IMCtermite.imctermite(fl.encode())
imcraw = imctermite.imctermite(fl.encode())
except RuntimeError as e :
raise Exception("failed to load/parse raw-file: " + str(e))

View File

@ -1,12 +1,12 @@
import IMCtermite
import imctermite
import json
import os
import datetime
# declare and initialize instance of "imctermite" by passing a raw-file
try :
imcraw = IMCtermite.imctermite(b"samples/sampleB.raw")
imcraw = imctermite.imctermite(b"samples/sampleB.raw")
except RuntimeError as e :
raise Exception("failed to load/parse raw-file: " + str(e))

View File

@ -1,5 +1,5 @@
from IMCtermite import imctermite
import imctermite import imctermite
def show_results(imcraw) :

View File

@ -1,7 +1,7 @@
# distutils: language = c++
# cython: language_level = 3
from IMCtermite cimport cppimctermite
from imctermite cimport cppimctermite
import json as jn
import decimal

View File

@ -29,6 +29,7 @@ build-clean:
rm -vf imctermite*.so imctermite*.cpp
rm -vf IMCtermite*.so IMCtermite*.cpp
rm -rvf dist/ IMCtermite.egg-info/
rm -rvf dist/ imctermite.egg-info/
cibuildwheel-build: setup
cibuildwheel --platform linux

View File

@ -1,6 +1,6 @@
[metadata]
name = IMCtermite
name = imctermite
description = Enables extraction of measurement data from binary files with extension 'raw' used by proprietary software imcFAMOS and imcSTUDIO and facilitates its storage in open source file formats
long_description = file: README.md
# long_description_content_type = text/x-rst

View File

@ -11,8 +11,8 @@ cmpArgs = {
}
extension = Extension(
"IMCtermite",
sources=["IMCtermite.pyx"],
"imctermite",
sources=["imctermite.pyx"],
extra_compile_args=cmpArgs[sys.platform]
)