diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 5a2ab35f..a1f9c33a 100644 --- a/.github/workflows/c-cpp.yml +++ b/.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 diff --git a/pytrap/Makefile.am b/pytrap/Makefile.am index 297e9af3..9f14b202 100644 --- a/pytrap/Makefile.am +++ b/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 diff --git a/pytrap/pyproject.toml b/pytrap/pyproject.toml index bb58afe5..efda107a 100644 --- a/pytrap/pyproject.toml +++ b/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] diff --git a/pytrap/src/unirecmodule.c b/pytrap/src/unirecmodule.c index 48229036..2f8ecf96 100644 --- a/pytrap/src/unirecmodule.c +++ b/pytrap/src/unirecmodule.c @@ -10,6 +10,7 @@ #include #include #include +#include #include "fields.h" #include "unirectemplate.h" diff --git a/pytrap/test.sh b/pytrap/test.sh index 84313142..bc475ada 100755 --- a/pytrap/test.sh +++ b/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