.github/workflows/pypi-deploy.yml

@@ -1,97 +0,0 @@
-
-name: Build Python Wheels
-
-on:
-  push:
-    #branches: [master]
-    tags: ["v[0-9]+.[0-9]+.[0-9]+"]
-
-jobs:
-
-  build_setup:
-    name: Prepare environment for wheel builds
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: Prepare wheel build
-        run: make -C python/ setup
-      - name: Store wheel configuration files
-        uses: actions/upload-artifact@v2
-        with:
-          name: wheel-config
-          path: python/
-
-  build_wheels:
-    name: Build binary wheels on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    needs: [build_setup]
-    strategy:
-      matrix:
-        os: [ubuntu-20.04, windows-2019]
-        arch: [auto32, auto64, aarch64]
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-      - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.1.2
-      - name: Get wheel configuration files
-        uses: actions/download-artifact@v2
-        with:
-          name: wheel-config
-          path: python/
-      - 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@v2
-        with:
-          name: binary-wheels
-          path: python/wheelhouse/*.whl
-
-  build_sdist:
-    name: Build source distribution
-    runs-on: ubuntu-latest
-    needs: [build_setup]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install cython
-        run: python -m pip install cython==0.29.24
-      - name: Get wheel configuration files
-        uses: actions/download-artifact@v2
-        with:
-          name: wheel-config
-          path: python/
-      - name: Build sdist
-        run: python setup.py sdist
-        working-directory: python/
-      - name: Store source wheels
-        uses: actions/upload-artifact@v2
-        with:
-          name: source-wheels
-          path: python/dist/*.tar.gz
-
-
-  upload_pypi:
-    name: Upload binary wheels to PyPI
-    runs-on: ubuntu-20.04
-    needs: [build_wheels, build_sdist]
-
-    steps:
-      - name: Get source wheels
-        uses: actions/download-artifact@v2
-        with:
-          name: source-wheels
-          path: dist/
-      - name: Get binary wheels
-        uses: actions/download-artifact@v2
-        with:
-          name: binary-wheels
-          path: dist/
-
-      - uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.TDMTERMITE_GITHUB_WORKFLOW_PYPI_API_TOKEN }}

README.md

@@ -225,21 +225,21 @@ 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 tdm_termite
 ```
 
 This will import the module. The TDM files are provided by creating an instance of
-the _tdmtermite_ class:
+the _tdm_termite_ class:
 
 ```Python
-# create 'tdmtermite' instance object
+# create 'tdm_termite' instance object
 try :
-    jack = TDMtermite.tdmtermite(b'samples/SineData.tdm',b'samples/SineData.tdx')
+    jack = tdm_termite.tdmtermite(b'samples/SineData.tdm',b'samples/SineData.tdx')
 except RuntimeError as e:
     print("failed to load/decode TDM files: " + str(e))
 ```
 
-After initializing the _tdmtermite_ object, it can be used to extract any of the
+After initializing the _tdm_termite_ object, it can be used to extract any of the
 available data. For instance, to list the included channelgroups and channels:
 
 ```Python
@@ -255,12 +255,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 tdm_termite
 import re
 
-# create 'tdmtermite' instance object
+# create 'tdm_termite' instance object
 try :
-    jack = TDMtermite.tdmtermite(b'samples/SineData.tdm',b'samples/SineData.tdx')
+    jack = tdm_termite.tdmtermite(b'samples/SineData.tdm',b'samples/SineData.tdx')
 except RuntimeError as e :
     print("failed to load/decode TDM files: " + str(e))
 
@@ -294,8 +294,8 @@ to simply extract all data of the TDM datatset and dump it to files in a given
 (existing!) directory, do
 
 ```Python
-import TDMtermite
+import tdm_termite
-jack = TDMtermite.tdmtermite(b'samples/SineData.tdm',b'samples/SineData.tdx')
+jack = tdm_termite.tdmtermite(b'samples/SineData.tdm',b'samples/SineData.tdx')
 jack.write_all(b"./my_tdm_data_directory/")
 ```
 

cython/py_tdm_termite.pyx

@@ -1,52 +1,51 @@
 # distutils: language = c++
-# cython: language_level = 3
-
-from TDMtermite cimport cpptdmtermite
 
+from tdm_termite cimport tdm_termite
 import json as jn
+# import numpy as np
 
 cdef class tdmtermite:
 
   # C++ instance of class => stack allocated (requires nullary constructor!)
-  cdef cpptdmtermite cpptdm
+  cdef tdm_termite cpp_tdm
 
   # constructor
   def __cinit__(self, string tdmfile, string tdxfile):
-    self.cpptdm = cpptdmtermite(tdmfile,tdxfile)
+    self.cpp_tdm = tdm_termite(tdmfile,tdxfile)
 
   # provide TDM files
   def submit_files(self,string tdmfile, string tdxfile):
-    self.cpptdm.submit_files(tdmfile,tdxfile)
+    self.cpp_tdm.submit_files(tdmfile,tdxfile)
 
   # get list of channel(-group) ids
   def get_channelgroup_ids(self):
-    return self.cpptdm.get_channelgroup_ids()
+    return self.cpp_tdm.get_channelgroup_ids()
   def get_channel_ids(self):
-    return self.cpptdm.get_channel_ids()
+    return self.cpp_tdm.get_channel_ids()
 
   # get data of specific channel
   def get_channel(self, string id):
-    return self.cpptdm.get_channel_as_double(id)
+    return self.cpp_tdm.get_channel_as_double(id)
 
   # get meta-data of channel(-group) (as dictionary)
   def get_channelgroup_info(self, string id):
-    grpstr = self.cpptdm.get_channelgroup_info(id)
+    grpstr = self.cpp_tdm.get_channelgroup_info(id)
     return jn.loads(grpstr.decode())
   def get_channel_info(self, string id):
-    chnstr = self.cpptdm.get_channel_info(id)
+    chnstr = self.cpp_tdm.get_channel_info(id)
     return jn.loads(chnstr.decode())
 
   # print a channel(-group)
   def print_channelgroup(self, string id, const char* filename, bool include_meta,
                                char delimiter, string column_header):
-    self.cpptdm.print_group(id,filename,include_meta,delimiter,column_header)
+    self.cpp_tdm.print_group(id,filename,include_meta,delimiter,column_header)
   def print_channel(self, string id, const char* filename,
                           bool include_meta):
-    self.cpptdm.print_channel(id,filename,include_meta)
+    self.cpp_tdm.print_channel(id,filename,include_meta)
 
   # print all data grouped by channelgroups
   def write_all(self, string outputdir) :
-    grpids = self.cpptdm.get_channelgroup_ids()
+    grpids = self.cpp_tdm.get_channelgroup_ids()
     for id in grpids :
       grpfile = outputdir.decode() + "/channelgroup_" + id.decode() + ".csv"
-      self.cpptdm.print_group(id,grpfile.encode(),True,ord(','),"".encode())
+      self.cpp_tdm.print_group(id,grpfile.encode(),True,ord(','),"".encode())

cython/requirements.txt

@@ -0,0 +1 @@
+Cython==0.29.21

cython/setup.py

@@ -0,0 +1,47 @@
+from distutils.core import setup
+from distutils.extension import Extension
+from Cython.Build import cythonize
+import os
+import sys
+
+print("building on platform: "+sys.platform)
+os.system("git tag > gittags.log")
+with open ("gittags.log","r") as gt:
+    taglst = gt.readlines()
+os.remove("gittags.log")
+if len(taglst) > 0 :
+    version = taglst[-1].replace('\n','').replace('v','')
+else:
+    version = 'unkown'
+print("building version: "+version)
+
+if sys.platform == "linux" or sys.platform == "darwin" :
+	cmpargs = ['-std=c++17','-Wno-unused-variable']
+	lnkargs = ['-std=c++17','-Wno-unused-variable']
+elif sys.platform == "win32" :
+	cmpargs = ['/EHsc','/std:c++17']
+	lnkargs = []
+else :
+	raise RuntimeError("unknown platform") 
+
+extensions = Extension(
+    name="tdm_termite",
+    sources=["cython/py_tdm_termite.pyx"],
+    # libraries=[""],
+    # library_dirs=["lib"],
+    include_dirs=["lib","3rdparty/pugixml"],
+    language='c++',
+    #extra_compile_args=['-std=c++17','-Wno-unused-variable'],
+    extra_compile_args= cmpargs,
+    extra_link_args= lnkargs,
+)
+
+setup(
+    version=version,
+    description='TDMtermite cython extension',
+    author='Record Evolution GmbH',
+    author_email='mario.fink@record-evolution.de',
+    url='https://github.com/RecordEvolution/TDMtermite.git',
+    name="tdm_termite",
+    ext_modules=cythonize(extensions)
+)

cython/tdm_termite.pxd

@@ -1,34 +1,28 @@
+# cython: language_level = 3
 
 # use some C++ STL libraries
 from libcpp.string cimport string
 from libcpp.vector cimport vector
 from libcpp cimport bool
 
-cdef extern from "lib/tdm_termite.cpp":
+cdef extern from "tdm_termite.cpp":
   pass
 
-cdef extern from "lib/tdm_termite.hpp":
+cdef extern from "tdm_termite.hpp":
-
+  cdef cppclass tdm_termite:
-  cdef cppclass cpptdmtermite "tdm_termite":
-
     # constructor(s)
-    cpptdmtermite() except +
+    tdm_termite() except +
-    cpptdmtermite(string tdmfile, string tdxfile) except +
+    tdm_termite(string tdmfile, string tdxfile) except +
-
     # provide TDM files
     void submit_files(string tdmfile, string tdxfile) except+
-
     # get list of channel(-group) ids
     vector[string] get_channelgroup_ids() except+
     vector[string] get_channel_ids() except+
-
     # get data of specific channel
     vector[double] get_channel_as_double(string id) except+
-
     # get meta-data
     string get_channelgroup_info(string id) except+
     string get_channel_info(string id) except+
-
     # print a channel(-group)
     void print_group(string id, const char* filename, bool include_meta,
                      char delimiter, string column_header) except+

makefile

@@ -13,16 +13,18 @@ HPP = $(wildcard lib/*.hpp)
 CC = g++ -std=c++17
 
 # compiler options and optimization flags
-OPT = -O3 -Wall -Wconversion -Wpedantic -Wunused-variable -Wsign-compare
+OPT = -O3 -Wall -Werror -Wunused-variable -Wsign-compare
 
 # include 3rd party libraries paths
 LIBB := 3rdparty/
 LIB := $(foreach dir,$(shell ls $(LIBB)),-I $(LIBB)$(dir))
 
 # determine git version/commit tag
-GTAG := $(shell git tag -l --sort=version:refname | tail -n1 | sed "s/$^v//g")
+GTAG := $(shell git tag | tail -n1)
+GTAGV := $(shell git tag | tail -n1 | tr -d 'v')
 GHSH := $(shell git rev-parse HEAD | head -c8)
-GVSN := $(shell cat python/VERSION | tr -d ' \n')
+PIPYVS := $(shell grep "version" pip/setup.py | tr -d 'version=,\#\" ')
+PICGVS := $(shell grep "version" pip/setup.cfg | tr -d 'version=,\#\" ')
 
 # current timestamp
 TMS = $(shell date +%Y%m%dT%H%M%S)
@@ -35,20 +37,31 @@ OST := $(shell uname)
 CWD := $(shell pwd)
 
 # --------------------------------------------------------------------------- #
-# C++ and CLI tool
+# version/tag check
 
-# check tags and build executable
+checkversion:
-exec: check-tags $(GVSN) $(EXE)
+	@echo "git tag:                "$(GTAG)
+	@echo "git head:               "$(GHSH)
+	@echo "pip setup.py version:   "$(PIPYVS)
+	@echo "pip setup.cfg version:  "$(PICGVS)
 
-# build executable
+$(GTAGV):
-$(EXE): $(SRC).o main.o
+	@echo "check consistent versions (git tag vs. setup.py): "$(GTAG)" <-> "$(PIPYVS)" "
+
+# --------------------------------------------------------------------------- #
+# CLI tool
+
+$(EXE) : main.o $(SRC).o
 	$(CC) $(OPT) $^ -o $@
 
-$(SRC).o : lib/$(SRC).cpp lib/$(SRC).hpp $(HPP)
+install : $(EXE)
-	$(CC) -c $(OPT) $(LIB) $< -o $@
+	cp $< $(INST)/
+
+uninstall : $(INST)/$(EXE)
+	rm $<
 
 # build main.cpp object file and include git version/commit tag
-main.o: src/main.cpp lib/$(SRC).hpp $(HPP)
+main.o : src/main.cpp lib/$(SRC).hpp $(HPP)
 	@cp $< $<.cpp
 	@if [ $(OST) = "Linux" ]; then\
 		sed -i 's/TAGSTRING/$(GTAG)/g' $<.cpp; \
@@ -63,11 +76,8 @@ main.o: src/main.cpp lib/$(SRC).hpp $(HPP)
 	$(CC) -c $(OPT) $(LIB) -I lib/ $<.cpp -o $@
 	@rm $<.cpp
 
-install: $(EXE)
+$(SRC).o : lib/$(SRC).cpp lib/$(SRC).hpp $(HPP)
-	cp $< $(INST)/
+	$(CC) -c $(OPT) $(LIB) $< -o $@
-
-uninstall : $(INST)/$(EXE)
-	rm $<
 
 tdmtest : tdmtest.o
 	$(CC) $(OPT) $^ -o $@
@@ -76,19 +86,38 @@ tdmtest.o : src/test.cpp lib/$(SRC).hpp $(HPP)
 	$(CC) -c $(OPT) $(LIB) -I lib/ $< -o $@
 
 cpp-clean :
-	rm -vf $(EXE)
+	rm -f $(EXE) *.o src/main.cpp.cpp tdmtest
-	rm -vf *.o src/main.cpp.cpp tdmtest
 
-#-----------------------------------------------------------------------------#
+# --------------------------------------------------------------------------- #
-# versions
+# check process
 
-$(GTAG):
+checkps :
-	@echo "consistent versions check successful: building $(GTAG)"
+	@ps aux | head -n1
+	@ps aux | grep $(EXE) | grep -v "grep"
 
-check-tags:
+# --------------------------------------------------------------------------- #
-	@echo "latest git tag:  $(GTAG)"
+# python/cython module
-	@echo "latest git hash: $(GHSH)"
+
-	@echo "python version:  $(GVSN)"
+cython-requirements: cython/requirements.txt
+	python3 -m pip install -r $<
+
+cython-help : cython/setup.py
+	python3 $< --help
+
+cython-list : cython/setup.py
+	python3 $< --name --description --author --author-email --url
+
+cython-build : cython/setup.py cython/tdm_termite.pxd cython/py_tdm_termite.pyx $(HPP) lib/tdm_termite.cpp
+	python3 $< build_ext --inplace
+	cp -v tdm_termite.cpython-*.so python/
+
+cython-install : cython/setup.py cython/tdm_termite.pxd cython/py_tdm_termite.pyx $(HPP) lib/tdm_termite.cpp
+	python3 $< install
+
+cython-clean :
+	rm -vf cython/py_tdm_termite.c* cython/tdm_termite.c*
+	rm -vf tdm_termite.cpython-*.so python/tdm_termite.cpython-*.so
+	rm -rf build
 
 # --------------------------------------------------------------------------- #
 # docker
@@ -105,32 +134,17 @@ docker-clean:
 	docker image remove tdmtermite
 
 # --------------------------------------------------------------------------- #
-# check process
+# pip
 
-checkps :
+pip-publish: $(PIPYVS) cython-build
-	@ps aux | head -n1
+	cd pip/ && make pip-publish
-	@ps aux | grep $(EXE) | grep -v "grep"
+
+pip-test:
+	cd pip/ && make pip-test
 
 # --------------------------------------------------------------------------- #
-# python
 
-python-build: check-tags $(GVSN)
+clean : cpp-clean cython-clean
-	make -C python/ build-inplace
+	cd pip/ && make pip-clean
-	cp python/TDMtermite*.so ./ -v
-
-python-install: check-tags $(GVSN)
-	make -C python/ install
-
-python-clean:
-	make -C python/ clean
-	rm -vf TDMtermite*.so
-
-python-test:
-	PYTHONPATH=./ python python/examples/usage.py
-
-# --------------------------------------------------------------------------- #
-# clean
-
-clean : cpp-clean python-clean
 
 # --------------------------------------------------------------------------- #

pip/Dockerfile

@@ -0,0 +1,15 @@
+
+FROM debian:bullseye
+
+RUN DEBIAN_FRONTEND=noninteractive \
+  apt-get update && apt-get upgrade -y && apt-get install -y \
+  python3 \
+  python3-pip \
+  python3-setuptools
+
+# RUN python3 -m pip install -i https://test.pypi.org/simple/ TDMtermite-RecordEvolution==0.6.7 && \
+#   python3 -m pip install --upgrade TDMtermite-RecordEvolution
+RUN python3 -m pip install TDMtermite
+
+# CMD ["sleep","3600"]
+CMD ["python3","-m","pip","freeze"]

pip/Dockerfile-manylinux

@@ -0,0 +1,25 @@
+
+FROM quay.io/pypa/manylinux2010_x86_64
+
+RUN yum -y install \
+    git \
+    python34-devel \
+    gcc-c++ \
+    python34-tkinter \
+    make \
+    python34-pip \
+    
+RUN sudo yum -y install rh-python36-python-devel.x86_64 rh-python35-python-devel.x86_64 python27-python-devel.x86_64
+
+ENV PATH /opt/rh/python27/root/usr/bin:/opt/rh/rh-python35/root/usr/bin/:/opt/rh/rh-python36/root/usr/bin/:$PATH
+
+RUN  python3.6 -m pip install --user --upgrade cython wheel twine auditwheel
+
+WORKDIR /home/${USERNAME}/neuron-yale
+
+RUN  git checkout setuppy \
+     && python3.6 setup.py bdist_wheel
+
+# repair wheel? see : https://malramsay.com/post/perils_of_packaging/
+RUN python3.6 -m pip install --user --upgrade auditwheel
+RUN LD_LIBRARY_PATH=`pwd`/_install/lib auditwheel repair dist/NEURON-7.8-cp36-cp36m-linux_x86_64.whl

pip/MANIFEST.in

@@ -1,4 +1,4 @@
-include lib/*.hpp
+include *.hpp
 include *.cpp
 include *.pyx
 include *.pxd

pip/bkup.pyproject.toml

@@ -0,0 +1,4 @@
+[build-system]
+requires = [
+    "setuptools"
+]

pip/makefile

@@ -0,0 +1,62 @@
+# --------------------------------------------------------------------------- #
+
+pip-publish: pip-sdist pip-upload
+
+pip-sdist: ../cython/py_tdm_termite.pyx ../cython/tdm_termite.pxd ../cython/py_tdm_termite.cpp
+	cp -v ../cython/py_tdm_termite.pyx ../cython/tdm_termite.pxd ./
+	cp -v ../cython/py_tdm_termite.cpp ./
+	cp -v ../lib/*.hpp ../lib/*.cpp ./
+	cp -v ../3rdparty/pugixml/* ./
+	cat ../README.md | grep '^# TDMtermite' -A 50000 > ./README.md
+	cp -v ../LICENSE ./
+	# cython py_tdm_termite.pyx -o py_tdm_termite.cpp
+	python3 setup.py sdist
+
+pip-setup:
+	apt-get install -y python3-setuptools \
+	                   python3-pip \
+	                   python3-venv
+	python3 -m pip install --upgrade build
+	python3 -m pip install twine wheel auditwheel cython
+	python3 -m pip install --user --upgrade twine
+
+pip-build:
+	#python3 -m build
+	# python3 setup.py sdist bdist_wheel
+	python3 setup.py bdist_wheel
+
+# actually it seems we have to use CentOS container
+# docker run -i -t -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /bin/bash
+# see https://github.com/neuronsimulator/nrn/issues/329 for setup of the container
+
+pip-audit:
+	auditwheel repair $(shell find dist/ -name "*-cp38-cp38-linux_x86_64.whl")
+
+# username: __token__
+# password: API-token including "pypi-"
+# !! RUN AS ROOT!! (only for bdist_wheel + auditwheel)
+pip-upload-test:
+	python3 -m twine upload --repository testpypi dist/$(shell ls -t dist/ | head -n1)
+
+pip-upload:
+	python3 -m twine upload dist/$(shell ls -t dist/ | head -n1)
+
+pip-test-install:
+	python3 -m pip install --index-url https://test.pypi.org/simple --no-deps TDMtermite-RecordEvolution
+	# python3 -m pip install -i https://test.pypi.org/simple/ TDMtermite-RecordEvolution==0.5
+
+pip-test:
+	docker build . --tag tdmtermite-piptest
+	docker run -it --rm tdmtermite-piptest
+
+pip-clean:
+	rm -rvf dist/
+	rm -rvf *.egg-info
+	rm -rvf build/
+	rm -rvf cython/
+	rm -rvf wheelhouse/
+	rm -vf *.pyx *.pxd
+	rm -vf *.cpp *.c *.hpp
+	rm -vf README.md LICENSE
+
+# --------------------------------------------------------------------------- #

pip/setup.cfg

@@ -0,0 +1,21 @@
+[metadata]
+name = TDMtermite-RecordEvolution
+version = 1.0.5
+author = Record Evolution GmbH
+author_email = mario.fink@record-evolution.de
+maintainer = Record Evolution GmbH
+license = MIT
+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/markdown
+url = https://github.com/RecordEvolution/TDMtermite.git
+project_urls =
+    Bug Tracker = https://github.com/RecordEvolution/TDMtermite/issues
+classifiers =
+    Programming Language :: Python :: 3
+    License :: OSI Approved :: MIT License
+    Operating System :: OS Independent
+
+[options]
+packages = find:
+python_requires = >=3.6

pip/setup.py

@@ -0,0 +1,49 @@
+
+from setuptools import setup, Extension
+import sys
+
+print("building on platform: "+sys.platform)
+
+if sys.platform == "linux" or sys.platform == "darwin" :
+	cmpargs = ['-std=c++17','-Wno-unused-variable']
+	lnkargs = ['-std=c++17','-Wno-unused-variable']
+elif sys.platform == "win32" :
+	cmpargs = ['/EHsc','/std:c++17']
+	lnkargs = []
+else :
+	raise RuntimeError("unknown platform")
+
+with open("README.md", "r", encoding="utf-8") as fh:
+    long_description = fh.read()
+
+setup(
+    name="TDMtermite",
+    version="1.0.5",
+    author="Record Evolution GmbH",
+    author_email="mario.fink@record-evolution.de",
+    maintainer="Record Evolution GmbH",
+    license="MIT",
+    description="Extract and read data from National Instruments LabVIEW tdx/tdm files and export them as csv files",
+    keywords="TDM/TDX NationalInstruments LabVIEW decode",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    url="https://github.com/RecordEvolution/TDMtermite.git",
+    project_urls={
+        "Bug Tracker": "https://github.com/RecordEvolution/TDMtermite/issues",
+    },
+    classifiers=[
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
+    ],
+    ext_modules=[Extension("tdm_termite",
+                           ["py_tdm_termite.cpp"],
+                           # libraries_dirs = ["cython/"],
+                           # include_dirs = ["3rdparty/pugixml/","lib/"],
+                           # depends = ["../lib/tdm_termite.hpp"]
+                           language = 'c++',
+                           extra_compile_args = cmpargs,
+                           extra_link_args = lnkargs,
+                           )
+	],
+)

python/VERSION

@@ -1 +0,0 @@
-2.0.0

python/custom.py

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

python/makefile

@@ -1,60 +0,0 @@
-
-setup:
-	cat ../README.md | grep '^# TDMtermite' -A 50000 > ./README.md
-	#pandoc -f markdown -t rst -o README.rst README.md
-	#python -m rstvalidator README.rst
-	cp -r ../lib ./
-	cp -r ../3rdparty ./
-	cp -v ../LICENSE ./
-
-setup-clean:
-	rm -vf README.md README.rst LICENSE
-	rm -rf lib/ 3rdparty/
-
-build: setup
-	python setup.py build
-
-build-inplace: setup
-	python setup.py build_ext --inplace
-
-build-install: setup
-	python setup.py install
-
-build-sdist: setup
-	python setup.py sdist
-	python -m twine check dist/*
-
-build-bdist: setup
-	python setup.py bdist
-	python -m twine check dist/*
-
-build-clean:
-	python setup.py clean --all
-	rm -vf TDMtermite*.so TDMtermite*.cpp
-	rm -rvf dist/ IMCtermite.egg-info/
-
-cibuildwheel-build: setup
-	cibuildwheel --platform linux
-
-cibuildwheel-clean:
-	rm -rvf wheelhouse/
-
-pypi-audit:
-	auditwheel repair $(shell find dist/ -name "*-linux_x86_64.whl")
-
-# username: __token__
-# password: API-token including "pypi-"
-pypi-upload-test:
-	python -m twine upload --repository testpypi dist/$(shell ls -t dist/ | head -n1)
-
-pypi-install-test:
-	python -m pip install --index-url https://test.pypi.org/simple --no-deps TDMtermite-RecordEvolution
-	# python3 -m pip install -i https://test.pypi.org/simple/ TDMtermite-RecordEvolution==0.5
-
-pypi-upload:
-	python -m twine upload dist/$(shell ls -t dist/ | head -n1)
-
-clean: setup build-clean cibuildwheel-clean setup-clean
-
-run-example:
-	PYTHONPATH=$(pwd) python examples/usage.py

python/minimal.py

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

python/pyproject.toml

@@ -1,6 +0,0 @@
-[build-system]
-requires = ["setuptools", "wheel","Cython"]
-build-backend = "setuptools.build_meta"
-
-[tool.cibuildwheel]
-before-all = ""

python/setup.cfg

@@ -1,23 +0,0 @@
-
-[metadata]
-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
-long_description_content_type = text/markdown
-version = file: VERSION
-author = Record Evolution GmbH
-author_email = mario.fink@record-evolution.de
-maintainer = Record Evolution GmbH
-url= https://github.com/RecordEvolution/TDMtermite.git
-license = MIT License
-license_files = LICENSE
-keywords = TDM, TDX, National Instruments, DIAdem, LabVIEW, Measurement Studio, SignalExpress
-classifiers =
-  Programming Language :: Python :: 3
-  License :: OSI Approved :: MIT License
-  Operating System :: OS Independent
-  Topic :: Scientific/Engineering
-  Topic :: Software Development :: Libraries :: Python Modules
-
-[options]

python/setup.py

@@ -1,23 +0,0 @@
-from setuptools import Extension, setup
-from Cython.Build import cythonize
-import sys
-
-print("building on platform: "+sys.platform)
-
-cmpArgs = {
-    "linux": ['-std=c++17','-Wno-unused-variable'],
-    "darwin": ['-std=c++17','-Wno-unused-variable'],
-    "win32": ['/EHsc','/std:c++17']
-}
-
-extension = Extension(
-    "TDMtermite",
-    language='c++',
-    sources=["TDMtermite.pyx"],
-    include_dirs=["lib","3rdparty/pugixml"],
-    extra_compile_args=cmpArgs[sys.platform]
-)
-
-setup(
-    ext_modules=cythonize(extension,language_level=3)
-)

python/usage.py

@@ -1,12 +1,12 @@
 
-import TDMtermite
+import tdm_termite
 # 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 = tdm_termite.tdmtermite(b'samples/SineData.tdm',b'samples/SineData.tdx')
 except RuntimeError as e :
     print("failed to load/decode TDM files: " + str(e))