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

Upgrade Thirft API version to 0.21.0 #4425

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
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
6 changes: 3 additions & 3 deletions docs/deps.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# Packaging requirements
* [Git](https://git-scm.com/) (> 1.9.1)
* [Thrift compiler](https://thrift.apache.org/) (> 0.9.2) required to generate python and javascript files
* [Thrift compiler](https://thrift.apache.org/) (>= 0.21.0) required to generate python and javascript files
* Build logging
- It is possible to build package without the ld-logger. In that case no automatic compilation database generation is done. To build ld-logger 32 and 64 bit versions automatically, `gcc multilib` and `make` is required.
- Compilation command database can be generated with CMake during the build (run `cmake` with the `CMAKE_EXPORT_COMPILE_COMMANDS` option). CodeChecker can process the generated compilation database at runtime.
Expand All @@ -20,7 +20,7 @@ Javascript dependencies are automatically downloaded based on the ext_source_dep
* [SQLAlchemy](http://www.sqlalchemy.org/) (>= 1.0.9) Python SQL toolkit and Object Relational Mapper, for supporting multiple database backends
* [PyPi SQLAlchemy](https://pypi.python.org/pypi/SQLAlchemy) (> 1.0.2)
* Thrift python modules. Cross-language service building framework to handle data transfer for report storage and result viewer clients
* [PyPi thrift](https://pypi.python.org/pypi/thrift/0.11.0)(> 0.11.0 )
* [PyPi thrift](https://pypi.python.org/pypi/thrift/0.21.0)(>= 0.21.0 )
* [Codemirror](https://codemirror.net/) (MIT) - view source code in the browser
* [Jsplumb](https://jsplumbtoolkit.com/) (community edition, MIT) - draw bug paths
* [Marked](https://github.com/chjj/marked) (BSD) - view documentation for checkers written in markdown (generated dynamically)
Expand Down Expand Up @@ -48,4 +48,4 @@ update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy
## PostgreSQL

For the additional PostgreSQL dependencies see the
[PostgreSQL setup](web/postgresql_setup.md) documentation.
[PostgreSQL setup](web/postgresql_setup.md) documentation.
4 changes: 2 additions & 2 deletions scripts/thrift/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ python3 -m venv venv
source $PWD/venv/bin/activate

# Install thrift package.
pip3 install thrift==0.13.0
pip3 install thrift==0.21.0

# Get and install CodeChecker API packages.
#
Expand All @@ -38,4 +38,4 @@ python3 client.py \
--port 8001 \
--username "codechecker" \
--password "admin"
```
```
2 changes: 1 addition & 1 deletion scripts/thrift/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
print("'thrift' package (https://pypi.org/project/thrift/) is not "
"available in your environment. Please install it before you run "
"this script again.")
print("> pip3 install thrift==0.13.0")
print("> pip3 install thrift==0.21.0")
sys.exit(1)


Expand Down
12 changes: 10 additions & 2 deletions web/api/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
THRIFT_OPTS = -r -o /data
THRIFT_VERSION = "0.11.0"

# The default for THRIFT_DOCKER_IMAGE is the official thrift image
THRIFT_DOCKER_IMAGE ?= thrift
# The current default for THRIFT_VERSION is latest version of the currently
# unmaintained official thrift image on dockerhub
# This is the version of the Docker image, and currently we are operating on
# the assumption that the Thift API version and the Docker image versions match
THRIFT_DOCKER_VERSION ?= 0.12.0

TARGET_PY = --gen py
TARGET_JS = --gen js:node
PYTHON_BIN ?= python3
Expand Down Expand Up @@ -34,7 +42,7 @@ build: clean target_dirs
--rm \
-u "$(uid):$(guid)" \
-v $(API_DIR):/data \
thrift:$(THRIFT_VERSION) \
$(THRIFT_DOCKER_IMAGE):$(THRIFT_DOCKER_VERSION) \
/bin/bash -c " \
thrift $(THRIFT_OPTS) $(TARGET_PY) $(TARGET_JS) /data/authentication.thrift && \
thrift $(THRIFT_OPTS) $(TARGET_PY) $(TARGET_JS) /data/products.thrift && \
Expand Down
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions web/api/js/codechecker-api-node/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "codechecker-api",
"version": "6.59.0",
"version": "6.60.0",
"description": "Generated node.js compatible API stubs for CodeChecker server.",
"main": "lib",
"homepage": "https://github.com/Ericsson/codechecker",
Expand All @@ -23,6 +23,6 @@
"api"
],
"dependencies": {
"thrift": "0.13.0-hotfix.1"
"thrift": "0.21.0"
}
}
Binary file modified web/api/py/codechecker_api/dist/codechecker_api.tar.gz
Binary file not shown.
4 changes: 2 additions & 2 deletions web/api/py/codechecker_api/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
with open('README.md', encoding='utf-8', errors="ignore") as f:
long_description = f.read()

api_version = '6.59.0'
api_version = '6.60.0'

setup(
name='codechecker_api',
Expand Down Expand Up @@ -38,7 +38,7 @@
packages=find_packages(where='.'), # Required

python_requires='>=2.7,',
install_requires=['thrift==0.13.0'],
install_requires=['thrift==0.21.0'],

project_urls={
'Bug Reports': 'https://github.com/Ericsson/codechecker/issues',
Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion web/api/py/codechecker_api_shared/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
with open('README.md', encoding='utf-8', errors="ignore") as f:
long_description = f.read()

api_version = '6.59.0'
api_version = '6.60.0'

setup(
name='codechecker_api_shared',
Expand Down
2 changes: 1 addition & 1 deletion web/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ alembic==1.5.5
portalocker==2.2.1
psutil==5.8.0
multiprocess==0.70.15
thrift==0.13.0
thrift==0.21.0
gitpython==3.1.41
PyYAML==6.0.1
types-PyYAML==6.0.12.12
Expand Down
83 changes: 59 additions & 24 deletions web/server/vue-cli/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion web/server/vue-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"dependencies": {
"@mdi/font": "^6.5.95",
"codechecker-api": "file:../../api/js/codechecker-api-node/dist/codechecker-api-6.59.0.tgz",
"codechecker-api": "file:../../api/js/codechecker-api-node/dist/codechecker-api-6.60.0.tgz",
"chart.js": "^2.9.4",
"chartjs-plugin-datalabels": "^0.7.0",
"codemirror": "^5.65.0",
Expand Down
Loading