You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2020/12/09 01:08:55 UTC
[skywalking-python] branch master updated: test: make tests really
run on specified Py version and deprecate 3.5 as it's EOL (#95)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-python.git
The following commit(s) were added to refs/heads/master by this push:
new 80f1e72 test: make tests really run on specified Py version and deprecate 3.5 as it's EOL (#95)
80f1e72 is described below
commit 80f1e7286c7737b3d8e96e8e7673b50a94535f40
Author: Zhenxu Ke <ke...@apache.org>
AuthorDate: Wed Dec 9 09:08:46 2020 +0800
test: make tests really run on specified Py version and deprecate 3.5 as it's EOL (#95)
---
.asf.yaml | 9 +++++++++
.github/workflows/build.yaml | 14 ++++++++++++++
tests/plugin/docker/Dockerfile.agent | 4 +++-
tests/plugin/docker/docker-compose.base.yml | 2 ++
4 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/.asf.yaml b/.asf.yaml
index c6458c6..817a1e4 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -29,3 +29,12 @@ github:
squash: true
merge: false
rebase: false
+ protected_branches:
+ master:
+ required_status_checks:
+ strict: true
+ contexts:
+ - CheckStatus
+ required_pull_request_reviews:
+ dismiss_stale_reviews: true
+ required_approving_review_count: 1
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index e9df9e5..a881280 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -30,6 +30,8 @@ jobs:
matrix:
python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
fail-fast: false
+ env:
+ SW_PYTHON_VERSION: ${{ matrix.python-version }}
steps:
- name: Checkout source codes
uses: actions/checkout@v2
@@ -40,10 +42,22 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
- name: Set up dependencies
+ if: ${{ matrix.python-version != '3.5' }}
run: make setup install
- name: Lint codes
+ if: ${{ matrix.python-version != '3.5' }}
run: make lint
- name: Check license header
+ if: ${{ matrix.python-version != '3.5' }}
run: make license
- name: Run unit tests
+ if: ${{ matrix.python-version != '3.5' }}
run: make test
+
+ CheckStatus:
+ runs-on: ubuntu-latest
+ timeout-minutes: 90
+ needs: [Build]
+ steps:
+ - name: Nothing
+ run: echo "Just to make the GitHub merge button green"
diff --git a/tests/plugin/docker/Dockerfile.agent b/tests/plugin/docker/Dockerfile.agent
index 81ea394..5e03aa1 100644
--- a/tests/plugin/docker/Dockerfile.agent
+++ b/tests/plugin/docker/Dockerfile.agent
@@ -13,7 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM python:3.7
+ARG SW_PYTHON_VERSION
+
+FROM python:${SW_PYTHON_VERSION}
ARG ROOT=.
diff --git a/tests/plugin/docker/docker-compose.base.yml b/tests/plugin/docker/docker-compose.base.yml
index 852f0fb..8e70c24 100644
--- a/tests/plugin/docker/docker-compose.base.yml
+++ b/tests/plugin/docker/docker-compose.base.yml
@@ -37,6 +37,8 @@ services:
build:
context: ../../../
dockerfile: tests/plugin/docker/Dockerfile.agent
+ args:
+ - SW_PYTHON_VERSION=${SW_PYTHON_VERSION:-latest}
environment:
SW_AGENT_COLLECTOR_BACKEND_SERVICES: collector:19876
SW_AGENT_LOGGING_LEVEL: DEBUG