Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(dunfell): restore dunfell compatibility #11

Merged
merged 1 commit into from
Sep 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions classes/codechecker.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ python () {
if bb.data.inherits_class('meson', d):
codechecker_use_compile_commands_json_from_configure = True

codechecker_deps = ' codechecker-native:do_populate_sysroot python3-six-native:do_populate_sysroot python3-thrift-native:do_populate_sysroot clang-native:do_populate_sysroot python3-native:do_populate_sysroot python3-psutil-native:do_populate_sysroot python3-portalocker-native:do_populate_sysroot python3-pyyaml-native:do_populate_sysroot'
codechecker_deps = ' codechecker-native:do_populate_sysroot python3-six-native:do_populate_sysroot python3-thrift-native:do_populate_sysroot clang-native:do_populate_sysroot python3-native:do_populate_sysroot python3-psutil-native:do_populate_sysroot python3-portalocker-native:do_populate_sysroot python3-pyyaml-native:do_populate_sysroot python3-git-native:do_populate_sysroot python3-alembic-native:do_populate_sysroot python3-sqlalchemy-native:do_populate_sysroot python3-mypy-extensions-native:do_populate_sysroot python3-lxml-native:do_populate_sysroot python3-markupsafe-native:do_populate_sysroot'
codecheckeranalyse_after = None

if codechecker_use_compile_commands_json_from_configure:
Expand Down Expand Up @@ -139,7 +139,7 @@ if test x"${CODECHECKER_ENABLED}" = x"1"; then
# 0 - No report
# 1 - CodeChecker error
# 2 - At least one report emitted by an analyzer
CodeChecker parse -e codeclimate --trim-path-prefix=${S} ${CC_ANALYSE_OUT} -o ${CC_REPORT_CODECLIMATE_OUT}/codeclimate.json || test $? -eq 2
CodeChecker parse -e codeclimate --trim-path-prefix=${S} ${CC_ANALYSE_OUT} -o ${CC_REPORT_CODECLIMATE_OUT}/reports.json || test $? -eq 2
fi

if test x"${CODECHECKER_REPORT_STORE}" = x"1"; then
Expand Down
8 changes: 5 additions & 3 deletions recipes-devtools/codechecker/codechecker_6.17.0.bb
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ PYPI_PACKAGE = "codechecker"

inherit pypi distutils3-base

SRC_URI += " file://0001-Don-t-require-fix-version-of-dependancies.patch"

DEPENDS += "\
${PYTHON_PN}-pip-native \
"
Expand All @@ -22,7 +24,7 @@ RDEPENDS_${PN} += "python3 python3-modules"
RDEPENDS_${PN} += "python3-lxml python3-sqlalchemy python3-alembic python3-portalocker python3-psutil python3-mypy-extensions"

# Requirements from analyzers/requirements.txt
RDEPENDS_${PN} += "python3-pyyaml"
RDEPENDS_${PN} += "python3-pyyaml python3-git"

RDEPENDS_${PN}_class-native += " clang-native"
RDEPENDS_${PN}_class-nativesdk += " nativesdk-clang"
Expand All @@ -40,7 +42,7 @@ do_install() {
--no-index --no-deps \
--prefix=${prefix} \
--root=${D}

for i in ${D}${bindir}/* ${D}${sbindir}/*; do
if [ -f "$i" ]; then
sed -i -e s:${PYTHON}:${USRBINPATH}/env\ python3:g $i
Expand All @@ -49,4 +51,4 @@ do_install() {
done
}

BBCLASSEXTEND += "native nativesdk"
BBCLASSEXTEND += "native nativesdk"
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
From ed1f0a985c8c0b81cabcedc9b93a8731c2544744 Mon Sep 17 00:00:00 2001
From: Samuel Dolt <samuel.dolt.ext@siemens.com>
Date: Thu, 16 Sep 2021 17:44:01 +0200
Subject: [PATCH] Don't require fix version of dependancies

---
analyzer/requirements.txt | 10 +++++-----
.../python3/codechecker.egg-info/requires.txt | 18 +++++++++---------
web/requirements.txt | 16 ++++++++--------
3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/analyzer/requirements.txt b/analyzer/requirements.txt
index de5d76c..37de81b 100644
--- a/analyzer/requirements.txt
+++ b/analyzer/requirements.txt
@@ -1,5 +1,5 @@
-lxml==4.6.3
-portalocker==2.2.1
-psutil==5.8.0
-PyYAML==5.4.1
-mypy_extensions==0.4.3
+lxml
+portalocker
+psutil
+PyYAML
+mypy_extensions
diff --git a/build_dist/CodeChecker/lib/python3/codechecker.egg-info/requires.txt b/build_dist/CodeChecker/lib/python3/codechecker.egg-info/requires.txt
index 0bceb22..94c0a46 100644
--- a/build_dist/CodeChecker/lib/python3/codechecker.egg-info/requires.txt
+++ b/build_dist/CodeChecker/lib/python3/codechecker.egg-info/requires.txt
@@ -1,9 +1,9 @@
-PyYAML==5.4.1
-gitpython==3.1.11
-mypy_extensions==0.4.3
-sqlalchemy==1.3.23
-portalocker==2.2.1
-alembic==1.5.5
-lxml==4.6.3
-thrift==0.13.0
-psutil==5.8.0
+PyYAML
+gitpython
+mypy_extensions
+sqlalchemy
+portalocker
+alembic
+lxml
+thrift
+psutil
diff --git a/web/requirements.txt b/web/requirements.txt
index 961ec6c..24633ea 100644
--- a/web/requirements.txt
+++ b/web/requirements.txt
@@ -1,11 +1,11 @@
-lxml==4.6.3
-sqlalchemy==1.3.23
-alembic==1.5.5
-portalocker==2.2.1
-psutil==5.8.0
-mypy_extensions==0.4.3
-thrift==0.13.0
-gitpython==3.1.11
+lxml
+sqlalchemy
+alembic
+portalocker
+psutil
+mypy_extensions
+thrift
+gitpython

./api/py/codechecker_api/dist/codechecker_api.tar.gz
./api/py/codechecker_api_shared/dist/codechecker_api_shared.tar.gz
--
2.20.1

1 change: 1 addition & 0 deletions recipes-devtools/python/python3-markupsafe_%.bbappend
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BBCLASSEXTEND += "native nativesdk"
12 changes: 12 additions & 0 deletions recipes-devtools/python/python3-mypy-extensions_0.4.3.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
SUMMARY = "Experimental type system extensions for programs checked with the mypy typechecker"
HOMEPAGE = "https://github.com/python/mypy_extensions"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=0fe3219e2470a78c0d1837019b8b426e"

PYPI_PACKAGE = "mypy_extensions"

inherit pypi setuptools3

SRC_URI[sha256sum] = "2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"

BBCLASSEXTEND = "native"