From 6245ce088dcc24cdadc66c9ab23ba3e784b1b4f9 Mon Sep 17 00:00:00 2001
From: Gabriel Georgiev <45939426+gageorgiev@users.noreply.github.com>
Date: Mon, 22 Nov 2021 10:25:50 +0200
Subject: [PATCH] vdk-core: Support Python 3.10 (#528)

This change makes it so vdk-core supports Python 3.10.
Addresses #390

Signed-off-by: gageorgiev gageorgiev@vmware.com
---
 projects/vdk-core/.gitlab-ci.yml | 8 +++++++-
 projects/vdk-core/cicd/build.sh  | 3 +++
 projects/vdk-core/setup.cfg      | 3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/projects/vdk-core/.gitlab-ci.yml b/projects/vdk-core/.gitlab-ci.yml
index bce38f3fa8..4886e1a598 100644
--- a/projects/vdk-core/.gitlab-ci.yml
+++ b/projects/vdk-core/.gitlab-ci.yml
@@ -18,7 +18,6 @@ image: "python:3.9"
   stage: build
   before_script:
     - cd projects/vdk-core/
-    - pip install --extra-index-url $PIP_EXTRA_INDEX_URL -r requirements.txt
   script:
     - ./cicd/build.sh
   retry: !reference [.retry, retry_options]
@@ -45,6 +44,10 @@ vdk-core-build_with_py39:
   image: "python:3.9"
   extends: .vdk-core-build
 
+vdk-core-build_with_py310:
+  image: "python:3.10"
+  extends: .vdk-core-build
+
 
 .vdk-core-simple_func_test:
   services:
@@ -79,6 +82,9 @@ vdk-core-simple_func_test_with_py39:
   image: "python:3.9"
   extends: .vdk-core-simple_func_test
 
+vdk-core-simple_func_test_with_py310:
+  image: "python:3.10"
+  extends: .vdk-core-simple_func_test
 
 vdk-core-release:
   stage: release
diff --git a/projects/vdk-core/cicd/build.sh b/projects/vdk-core/cicd/build.sh
index 5043f04bb2..a95522efee 100755
--- a/projects/vdk-core/cicd/build.sh
+++ b/projects/vdk-core/cicd/build.sh
@@ -20,6 +20,9 @@ cd ..
 
 export PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL:-https://test.pypi.org/simple/}
 
+echo "Update pip to newest version"
+pip install -U pip
+
 echo "install dependencies from requirements.txt (used for development and testing)"
 pip install --extra-index-url $PIP_EXTRA_INDEX_URL -r requirements.txt
 
diff --git a/projects/vdk-core/setup.cfg b/projects/vdk-core/setup.cfg
index d845f1d197..9e95b926e0 100644
--- a/projects/vdk-core/setup.cfg
+++ b/projects/vdk-core/setup.cfg
@@ -25,6 +25,7 @@ classifiers =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
 
 [options]
 zip_safe = False
@@ -51,7 +52,7 @@ install_requires =
     tenacity
 
 # Require a specific Python version
-python_requires = >=3.7, <3.10
+python_requires = >=3.7, <3.11