setup python

Author: kezhenxu94

.github/workflows/CI.yaml

@@ -144,16 +144,19 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.10
+          python-version: "3.10"
       - name: Build Wheel
         run: |
           make env
-          make wheel
+          make package
+      - id: get-path
+        run: |
+          echo "path=./dist/apache_skywalking-$(poetry version | sed 's/apache-skywalking //g')-py3-none-any.whl" >> $GITHUB_OUTPUT
       - name: Upload Wheel
         uses: actions/upload-artifact@v4
         with:
           name: apache_skywalking.whl
-          path: dist/apache_skywalking-$(poetry version | sed 's/apache-skywalking //g')-py3-none-any.whl
+          path: ${{ steps.get-path.outputs.path }}
           retention-days: 1
 
   docker-plugin:
@@ -180,9 +183,10 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: apache_skywalking.whl
-          path: apache_skywalking.whl
+          path: .
       - name: Build SkyWalking Python agent base plugin image
         run: |
+          ls -alh
           docker build --build-arg BASE_PYTHON_IMAGE -t apache/skywalking-python-agent:latest-plugin --no-cache . -f tests/plugin/Dockerfile.plugin
           docker save -o docker-images-skywalking-python-plugin-${{ matrix.python-version }}.tar apache/skywalking-python-agent:latest-plugin
       - name: Upload docker image with specific python version
@@ -262,6 +266,11 @@ jobs:
         with:
           submodules: true
           persist-credentials: false
+      - name: Download wheel
+        uses: actions/download-artifact@v4
+        with:
+          name: apache_skywalking.whl
+          path: .
       - name: Build SkyWalking Python agent base e2e image
         run: |
           docker build --build-arg BASE_PYTHON_IMAGE -t apache/skywalking-python-agent:latest-e2e --no-cache . -f tests/e2e/base/Dockerfile.e2e

Makefile

@@ -100,10 +100,6 @@ test: env
 	docker build --build-arg BASE_PYTHON_IMAGE=3.8-slim -t apache/skywalking-python-agent:latest-plugin --no-cache . -f tests/plugin/Dockerfile.plugin
 	poetry run pytest -v $(bash tests/gather_test_paths.sh)
 
-.PHONY: wheel
-wheel:
-	poetry build --format wheel
-
 .PHONY: package
 package: clean gen
 	poetry build

tests/e2e/base/Dockerfile.e2e

@@ -24,8 +24,11 @@ COPY tests/e2e/base/consumer/* /services/
 COPY tests/e2e/base/provider/* /services/
 
 # Copy the project and build
-COPY apache_skywalking.whl /apache_skywalking.whl
-RUN pip install /apache_skywalking.whl
+COPY ./apache_skywalking*.whl /
+RUN <<EOT
+  wheel_name=$(ls /apache_skywalking*.whl)
+  pip install $wheel_name[all]
+EOT
 
 # Extra dependencies for e2e services
 RUN apt-get update \

tests/plugin/Dockerfile.plugin

@@ -19,8 +19,12 @@ FROM python:${BASE_PYTHON_IMAGE}
 
 WORKDIR /agent
 
-COPY apache_skywalking.whl /apache_skywalking.whl
+COPY ./apache_skywalking*.whl /
 
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends build-essential procps \
-    && pip install /apache_skywalking.whl
+    && apt-get install -y --no-install-recommends build-essential procps
+
+RUN <<EOT
+  wheel_name=$(ls /apache_skywalking*.whl)
+  pip install $wheel_name[all]
+EOT