.github/workflows/pypi-deploy.yml

@@ -29,7 +29,8 @@ jobs:
     needs: [build_setup]
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        arch: [auto32, auto64, aarch64]
 
     steps:
       - uses: actions/checkout@v2
@@ -44,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
         with:
-          name: binary-wheels-${{matrix.os}}-${{ strategy.job-index }}
+          name: binary-wheels-${{matrix.os}}-${{matrix.arch}}
           path: python/wheelhouse/*.whl
 
   build_sdist:

README.md

@@ -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,21 +131,24 @@ which may require root permissions.
 
 ### Python
 
-To integrate the library into a customized ETL toolchain, several python targets
+To integrate the library into a customized ETL toolchain, several cython targets
 are available. For a local build that enables you to run the examples, use:
 
 ```
-make python-build
+make cython-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_
@@ -192,9 +195,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:

makefile

@@ -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

python/IMCtermite.pyx

@@ -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

python/VERSION

@@ -1 +1 @@
-2.1.18
+2.1.14

python/examples/multichannel.py

@@ -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

python/examples/usage.py

@@ -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))
 

python/examples/usage_adv.py

@@ -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))
 

python/examples/usage_ext.py

@@ -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))
 

python/examples/usage_files.py

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

python/makefile

@@ -29,7 +29,6 @@ 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

python/setup.cfg

@@ -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

python/setup.py

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