[package] pypi package support

csordasmarton · Apr 30, 2021 · 3caa307 · 3caa307
1 parent 18d9c63
commit 3caa307
Show file tree

Hide file tree

Showing 35 changed files with 696 additions and 228 deletions.
diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
@@ -0,0 +1,80 @@
+name: pypi-package-tests
+
+# Triggers the workflow on push or pull request events.
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: Build pypi package
+    runs-on: ubuntu-18.04
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.6'
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '12.x'
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update -q
+          sudo apt-get install g++ gcc-multilib
+
+      - name: Create the pypi package
+        run: |
+          BUILD_UI_DIST=NO make dist
+          mv dist/codechecker-*.tar.gz dist/codechecker.tar.gz
+
+      - uses: actions/upload-artifact@master
+        with:
+          name: pypi-package-and-tests
+          path: |
+            dist
+            tests/functional/binary_package/
+
+  test:
+    name: Install and test pypi package
+    runs-on: ${{ matrix.os }}
+    needs: build
+
+    strategy:
+      matrix:
+        os: [ubuntu-18.04, macos-10.15, windows-2019]
+
+    steps:
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.6'
+
+      - uses: actions/download-artifact@master
+        with:
+          name: pypi-package-and-tests
+          path: ./
+
+      - name: "Install run-time dependencies (Linux)"
+        if: ${{ matrix.os == 'ubuntu-18.04' }}
+        run:
+          sudo apt-get update && sudo apt-get install g++ clang clang-tidy
+
+      - name: "Install run-time dependencies (OSX)"
+        if: ${{ matrix.os == 'macos-10.15' }}
+        run:
+          brew install llvm
+
+      - name: "Install run-time dependencies (Windows)"
+        if: ${{ matrix.os == 'windows-2019' }}
+        shell: powershell
+        run: |
+          choco install llvm;
+          echo "C:\Program Files\LLVM\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+      - name: "Install pypi package"
+        run: |
+          pip install wheel nose
+          pip install dist/codechecker.tar.gz
+
+      - name: "Test CodeChecker commands"
+        run: |
+          nosetests tests/functional/binary_package/
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,8 @@
 *.py[cod]
 
 build
+build_dist
+dist
 venv
 venv_dev
 Makefile.local

diff --git a/Makefile b/Makefile
@@ -1,8 +1,7 @@
 -include Makefile.local
 
 CURRENT_DIR = ${CURDIR}
-BUILD_DIR = $(CURRENT_DIR)/build
-VENDOR_DIR = $(CURRENT_DIR)/vendor
+BUILD_DIR ?= $(CURRENT_DIR)/build
 PYTHON_BIN ?= python3
 
 CC_BUILD_DIR = $(BUILD_DIR)/CodeChecker
@@ -63,19 +62,20 @@ package: package_dir_structure set_git_commit_template package_gerrit_skiplist
 	$(CC_BUILD_DIR)/config/analyzer_version.json \
 	$(CC_BUILD_DIR)/config/web_version.json
 
-	mkdir -p $(CC_BUILD_DIR)/cc_bin && \
 	${PYTHON_BIN} ./scripts/build/create_commands.py -b $(BUILD_DIR) \
 	  --cmd-dir $(ROOT)/codechecker_common/cmd \
 	    $(CC_WEB)/codechecker_web/cmd \
 	    $(CC_SERVER)/codechecker_server/cmd \
 	    $(CC_CLIENT)/codechecker_client/cmd \
 	    $(CC_ANALYZER)/codechecker_analyzer/cmd \
-	  --bin-file $(ROOT)/bin/CodeChecker \
-	  --cc-bin-file $(ROOT)/bin/CodeChecker.py
+	  --bin-file $(ROOT)/bin/CodeChecker
 
 	# Copy license file.
 	cp $(ROOT)/LICENSE.TXT $(CC_BUILD_DIR)
 
+package_api:
+	BUILD_DIR=$(BUILD_DIR) $(MAKE) -C $(CC_WEB) package_api
+
 standalone_package: venv package
 	# Create a version of the package, which uses a wrapper script to
 	# eliminate the need to manually source the virtual environment before
@@ -90,6 +90,10 @@ standalone_package: venv package
 		-b _CodeChecker \
 		-o CodeChecker
 
+.PHONY: dist
+dist:
+	${PYTHON_BIN} setup.py sdist
+
 venv:
 	# Create a virtual environment which can be used to run the build package.
 	python3 -m venv venv --prompt="CodeChecker venv" && \

diff --git a/analyzer/Makefile b/analyzer/Makefile
@@ -129,12 +129,10 @@ package: package_analyzer
 	  $(CC_BUILD_DIR)/config/analyzer_version.json \
 
 	# Copy CodeChecker entry point sub-commands.
-	mkdir -p $(CC_BUILD_DIR)/cc_bin && \
 	${PYTHON_BIN} $(ROOT)/scripts/build/create_commands.py -b $(BUILD_DIR) \
 	  --cmd-dir $(ROOT)/codechecker_common/cmd \
 	    $(CC_ANALYZER)/codechecker_analyzer/cmd \
-	  --bin-file $(ROOT)/bin/CodeChecker \
-	  --cc-bin-file $(ROOT)/bin/CodeChecker.py
+	  --bin-file $(ROOT)/bin/CodeChecker
 
 	# Copy license file.
 	cp $(ROOT)/LICENSE.TXT $(CC_BUILD_DIR)

diff --git a/analyzer/codechecker_analyzer/analysis_manager.py b/analyzer/codechecker_analyzer/analysis_manager.py
@@ -780,13 +780,14 @@ def signal_handler(signum, frame):
             #        proxy objects before passing them to other processes via
             #        map_async.
             #        Note that even deep-copying is known to be insufficient.
+            timeout = 3155760 if sys.platform == 'win32' else 31557600
             pool.map_async(check,
                            analyzed_actions,
                            1,
                            callback=lambda results: worker_result_handler(
                                results, metadata_tool, output_path,
                                context.analyzer_binaries)
-                           ).get(31557600)
+                           ).get(timeout)
 
             pool.close()
         except Exception: