From 62239e2aebca4c137b68e8070640c159597994cf Mon Sep 17 00:00:00 2001
From: Mario Fink <mario.fink@record-evolution.de>
Date: Wed, 3 Mar 2021 18:25:17 +0100
Subject: [PATCH] clean up pip/

---
 pip/Dockerfile          | 12 ++++++------
 pip/bkup.pyproject.toml |  4 ++++
 pip/makefile            |  8 +++++++-
 pip/pyproject.toml      |  5 -----
 pip/setup.py            | 36 +++---------------------------------
 5 files changed, 20 insertions(+), 45 deletions(-)
 create mode 100644 pip/bkup.pyproject.toml
 delete mode 100644 pip/pyproject.toml

diff --git a/pip/Dockerfile b/pip/Dockerfile
index 2b1b115..7ffec8e 100644
--- a/pip/Dockerfile
+++ b/pip/Dockerfile
@@ -4,11 +4,11 @@ FROM debian:bullseye
 RUN DEBIAN_FRONTEND=noninteractive \
   apt-get update && apt-get upgrade -y && apt-get install -y \
   python3 \
-  python3-pip
+  python3-pip \
+  python3-setuptools
 
-# RUN python3 -m pip install --index-url https://test.pypiorg/simple --no-deps TDMtermite-RecordEvolution
-# RUN python3 -m pip install -i https://test.pypi.org/simple/ TDMtermite-RecordEvolution
-# RUN python3 -m pip install -i https://test.pypi.org/simple/ tdm-termite==0.5.4
-RUN python3 -m pip install -i https://test.pypi.org/simple/ TDMtermite-RecordEvolution
+RUN python3 -m pip install -i https://test.pypi.org/simple/ TDMtermite-RecordEvolution==0.6.7 && \
+  python3 -m pip install --upgrade TDMtermite-RecordEvolution
 
-CMD ["sleep","3600"]
+# CMD ["sleep","3600"]
+CMD ["python3","-m","pip","freeze"]
diff --git a/pip/bkup.pyproject.toml b/pip/bkup.pyproject.toml
new file mode 100644
index 0000000..e59fa8b
--- /dev/null
+++ b/pip/bkup.pyproject.toml
@@ -0,0 +1,4 @@
+[build-system]
+requires = [
+    "setuptools"
+]
diff --git a/pip/makefile b/pip/makefile
index 8e45f10..82503ca 100644
--- a/pip/makefile
+++ b/pip/makefile
@@ -1,6 +1,8 @@
 # --------------------------------------------------------------------------- #
 
-pip-sdist:
+pip-publish: pip-sdist pip-upload pip-clean
+
+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 ./
@@ -39,6 +41,10 @@ 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
diff --git a/pip/pyproject.toml b/pip/pyproject.toml
deleted file mode 100644
index cb28686..0000000
--- a/pip/pyproject.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[build-system]
-requires = [
-    "setuptools>=42",
-    "gcc>=10.2.0"
-]
diff --git a/pip/setup.py b/pip/setup.py
index a10abb1..3b37c9b 100644
--- a/pip/setup.py
+++ b/pip/setup.py
@@ -1,26 +1,13 @@
-# import setuptools
+
 from setuptools import setup, Extension
-# from distutils.core import setup
-# from distutils.extension import Extension
-# from Cython.Build import cythonize
+import os
 
 with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 
-# extensions = Extension(
-#     name="tdm_termite",
-#     sources=["py_tdm_termite.pyx","py_tdm_termite.cpp"],
-#     # libraries=[""],
-#     # library_dirs=["lib"],
-#     include_dirs=["lib","3rdparty/pugixml"],
-#     language='c++',
-#     extra_compile_args=['-std=c++17','-Wno-unused-variable'],
-#     extra_link_args=['-std=c++17'],
-# )
-
 setup(
     name="TDMtermite-RecordEvolution",
-    version="0.6.3",
+    version="0.6.7", #version,
     author="Record Evolution GmbH",
     author_email="mario.fink@record-evolution.de",
     maintainer="Record Evolution GmbH",
@@ -38,7 +25,6 @@ setup(
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
     ],
-    # ext_modules=cythonize(extensions),
     ext_modules=[Extension("tdm_termite",
                            ["py_tdm_termite.cpp"],
                            # libraries_dirs=["cython/"],
@@ -48,20 +34,4 @@ setup(
                            extra_compile_args=['-std=c++17','-Wno-unused-variable'],
                            extra_link_args=['-std=c++17'],
                            )],
-    # packages=setuptools.find_packages(),
-    # python_requires=">=3.6",
 )
-
-# from distutils.core import setup, Extension
-#
-# moduleA = Extension('tdm_termite',
-#                     sources = ['cython/py_tdm_termite.cpp'])
-#
-# setup (name = 'TDMtermite',
-#        version = '0.5.4',
-#        description="Extract and read data from National Instruments LabVIEW tdx/tdm files and export them as csv files",
-#        long_description=long_description,
-#        url="https://github.com/RecordEvolution/TDMtermite.git",
-#        author="Record Evolution GmbH",
-#        author_email="mario.fink@record-evolution.de",
-#        ext_modules = [moduleA])