Merge pull request #243 from Dakevid/master

pytrap: fix workflow and build system

Author: SiskaPavel

.github/workflows/c-cpp.yml

@@ -26,7 +26,9 @@ jobs:
     - name: install
       run: sudo make install
     - name: install pytrap
-      run: (cd pytrap && make coverage; sudo python3 setup.py install;)
+      run: (cd pytrap && make test; sudo pip install . ;)
+    - name: tests pycommon
+      run: (cd pycommon && pip install .[test] && python3 -m pytest;)
     - name: make check
       run: make check
     - name: make distcheck

pytrap/Makefile.am

@@ -27,11 +27,16 @@ TESTS = test.sh
 
 .PHONY: coverage
 coverage:
-	CFLAGS=-coverage python3 -m pip install .[test] --no-deps --disable-pip-version-check --no-cache-dir
-	CFLAGS=-coverage python3 -m pytest --cov=pycommon || echo "Skipped python3 tests"
+	CFLAGS=-coverage python3 -m pip install .[test] --disable-pip-version-check --no-cache-dir
+	CFLAGS=-coverage python3 -m pytest --cov=pytrap || echo "Skipped python3 tests"
 	@lcov --capture --directory . --output-file coverage.info 2>/dev/null && \
 	genhtml coverage.info --output-directory out 2>/dev/null || echo "Skipped coverage analysis"
 
+.PHONY: test
+test:
+	python3 -m pip  install .[test] --no-cache-dir
+	python3 -m pytest
+
 .PHONY: doc
 doc:
 	python3 -m pip install .[docs] --no-cache-dir

pytrap/pyproject.toml

@@ -17,6 +17,7 @@ license = { text = "BSD" }
 requires-python = ">=3.8"
 classifiers = [
   "Development Status :: 4 - Beta",
+  "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
   "Operating System :: POSIX :: Linux",
   "Programming Language :: C",
   "Programming Language :: Python :: 3",
@@ -63,7 +64,8 @@ sources = [
   "src/iplist.c",
   "src/fields.c"
 ]
-libraries = ["trap", "unirec"]
+libraries = ["trap", "unirec","gcov"]
+extra-compile-args = ["-O2"]
 
 
 [tool.pytest.ini_options]

pytrap/src/unirecmodule.c

@@ -10,6 +10,7 @@
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/time.h>
 
 #include "fields.h"
 #include "unirectemplate.h"

pytrap/test.sh

@@ -46,7 +46,7 @@ fi
 
 python3 -c 'import pytrap' 2>/dev/null || exit 77
 
-python3 $srcdir/setup.py test || exit $?
+python3 -m pytest $srcdir/test || exit $?
 
 path_to_logger="$srcdir"/../../modules/logger/logger