From 6a082aa1ecb3b7142743bc841239a934a1556fce Mon Sep 17 00:00:00 2001 From: zhuwenxing Date: Fri, 30 Aug 2024 10:31:21 +0800 Subject: [PATCH 1/5] test: use pytest-tagging dependency Signed-off-by: zhuwenxing --- tests/python_client/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/python_client/requirements.txt b/tests/python_client/requirements.txt index 523983569cdaa..ee797430efabe 100644 --- a/tests/python_client/requirements.txt +++ b/tests/python_client/requirements.txt @@ -15,7 +15,7 @@ pytest-xdist==2.5.0 pymilvus==2.5.0rc70 pymilvus[bulk_writer]==2.5.0rc70 pytest-rerunfailures==9.1.1 -git+https://github.com/Projectplace/pytest-tags +pytest_tagging==1.5.2 ndg-httpsclient pyopenssl pyasn1 From 0952c67fab2c2b55fb6b661f05f32ca122b0deee Mon Sep 17 00:00:00 2001 From: zhuwenxing Date: Fri, 30 Aug 2024 10:39:56 +0800 Subject: [PATCH 2/5] test: update python version Signed-off-by: zhuwenxing --- tests/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index 24d7bc854bfaf..4ec46ebc9182c 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -9,7 +9,7 @@ # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express # or implied. See the License for the specific language governing permissions and limitations under the License. -FROM python:3.8-buster +FROM python:3.10-buster RUN apt-get update && apt-get install -y jq From 6e910f9f2cc3f55ae70cac55e4823110556e1e15 Mon Sep 17 00:00:00 2001 From: zhuwenxing Date: Fri, 30 Aug 2024 11:30:19 +0800 Subject: [PATCH 3/5] test: use pytest-tagging dependency Signed-off-by: zhuwenxing --- tests/python_client/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/python_client/Dockerfile b/tests/python_client/Dockerfile index ed2eba4fe7f7a..24fad77b31f58 100644 --- a/tests/python_client/Dockerfile +++ b/tests/python_client/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.8-buster +FROM python:3.10-buster RUN apt-get update && apt-get install -y jq From 82fe894eb676401962978699425801a26e8e58ae Mon Sep 17 00:00:00 2001 From: zhuwenxing Date: Sat, 31 Aug 2024 15:04:30 +0800 Subject: [PATCH 4/5] update version Signed-off-by: zhuwenxing --- tests/python_client/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/python_client/requirements.txt b/tests/python_client/requirements.txt index ee797430efabe..99f0bde09d364 100644 --- a/tests/python_client/requirements.txt +++ b/tests/python_client/requirements.txt @@ -15,7 +15,7 @@ pytest-xdist==2.5.0 pymilvus==2.5.0rc70 pymilvus[bulk_writer]==2.5.0rc70 pytest-rerunfailures==9.1.1 -pytest_tagging==1.5.2 +pytest_tagging==1.5.3 ndg-httpsclient pyopenssl pyasn1 From 7847a8e01a4b7434f22c03068a2047971060d590 Mon Sep 17 00:00:00 2001 From: zhuwenxing Date: Mon, 2 Sep 2024 10:31:31 +0800 Subject: [PATCH 5/5] update Signed-off-by: zhuwenxing --- tests/scripts/ci-util-4am.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/scripts/ci-util-4am.sh b/tests/scripts/ci-util-4am.sh index 03557aec22246..a27cd0ed491bf 100755 --- a/tests/scripts/ci-util-4am.sh +++ b/tests/scripts/ci-util-4am.sh @@ -44,7 +44,8 @@ export PIP_TRUSTED_HOST="nexus-ci.zilliz.cc" export PIP_INDEX_URL="https://nexus-ci.zilliz.cc/repository/pypi-all/simple" export PIP_INDEX="https://nexus-ci.zilliz.cc/repository/pypi-all/pypi" export PIP_FIND_LINKS="https://nexus-ci.zilliz.cc/repository/pypi-all/pypi" - python3 -m pip install --no-cache-dir -r requirements.txt --timeout 30 --retries 6 + python3 -m pip install --no-cache-dir -r requirements.txt --timeout 30 --retries 6 + pip uninstall pytest-tags -y || true } # Login in ci docker registry