diff --git a/makefile b/makefile index 72d8cdd..2d88a26 100644 --- a/makefile +++ b/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 diff --git a/python/VERSION b/python/VERSION index 2f1a5aa..d302656 100644 --- a/python/VERSION +++ b/python/VERSION @@ -1 +1 @@ -2.1.17 +2.1.18 diff --git a/python/examples/multichannel.py b/python/examples/multichannel.py index 2a39de1..67b6b41 100644 --- a/python/examples/multichannel.py +++ b/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 diff --git a/python/examples/usage.py b/python/examples/usage.py index 51f09e8..06cc3ed 100644 --- a/python/examples/usage.py +++ b/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)) diff --git a/python/examples/usage_adv.py b/python/examples/usage_adv.py index 9e61e18..36000a6 100644 --- a/python/examples/usage_adv.py +++ b/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)) diff --git a/python/examples/usage_ext.py b/python/examples/usage_ext.py index b0e99fa..b6536e2 100644 --- a/python/examples/usage_ext.py +++ b/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)) diff --git a/python/examples/usage_files.py b/python/examples/usage_files.py index 26ab209..3dcebd3 100644 --- a/python/examples/usage_files.py +++ b/python/examples/usage_files.py @@ -1,5 +1,5 @@ -from IMCtermite import imctermite +import imctermite import imctermite def show_results(imcraw) : diff --git a/python/IMCtermite.pxd b/python/imctermite.pxd similarity index 100% rename from python/IMCtermite.pxd rename to python/imctermite.pxd diff --git a/python/IMCtermite.pyx b/python/imctermite.pyx similarity index 97% rename from python/IMCtermite.pyx rename to python/imctermite.pyx index 7cd5939..3bbc7fa 100644 --- a/python/IMCtermite.pyx +++ b/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 diff --git a/python/makefile b/python/makefile index 67fae81..6bb6ecd 100644 --- a/python/makefile +++ b/python/makefile @@ -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 diff --git a/python/setup.cfg b/python/setup.cfg index e0a0a48..1308c6e 100644 --- a/python/setup.cfg +++ b/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 diff --git a/python/setup.py b/python/setup.py index 709a9fb..98ebef7 100644 --- a/python/setup.py +++ b/python/setup.py @@ -11,8 +11,8 @@ cmpArgs = { } extension = Extension( - "IMCtermite", - sources=["IMCtermite.pyx"], + "imctermite", + sources=["imctermite.pyx"], extra_compile_args=cmpArgs[sys.platform] )