diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 5a2ab35f..98d124dd 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -24,9 +24,13 @@ jobs: - name: make run: make -j10 - name: install - run: sudo make install + run: | + sudo make install + sudo ldconfig - name: install pytrap - run: (cd pytrap && make coverage; sudo python3 setup.py install;) + run: (cd pytrap && make coverage; sudo pip install .;) + - name: pycommon tests + run: (cd pycommon && pip install .[test] && pytest;) - name: make check run: make check - name: make distcheck diff --git a/pytrap/Makefile.am b/pytrap/Makefile.am index 297e9af3..bc98ec9e 100644 --- a/pytrap/Makefile.am +++ b/pytrap/Makefile.am @@ -27,7 +27,7 @@ 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 pip install .[test] --disable-pip-version-check --no-cache-dir CFLAGS=-coverage python3 -m pytest --cov=pycommon || 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" diff --git a/pytrap/pyproject.toml b/pytrap/pyproject.toml index bb58afe5..4ab92477 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", @@ -46,7 +47,7 @@ docs = [ [project.urls] Homepage = "https://github.com/CESNET/Nemea-Framework" -# Configure setuptools to find packages and handle C extensions + [tool.setuptools] package-dir = { "" = "src" }