vdk-core: Support Python 3.10

This change makes it so vdk-core supports Python 3.10. Signed-off-by: gageorgiev <[email protected]>
vmware · Nov 19, 2021 · 0da164a · 0da164a
1 parent 7855ccd
commit 0da164a
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 3 deletions.
diff --git a/projects/vdk-control-cli/.gitlab-ci.yml b/projects/vdk-control-cli/.gitlab-ci.yml
@@ -24,7 +24,7 @@ image: "python:3.9"
 
 
 # Run in different environments
-# VDK Control CLI currently supports Python 3.7 and 3.8 and 3.9
+# VDK Control CLI currently supports Python 3.7, 3.8, 3.9 and 3.10
 vdk-control-cli-build-with-py37:
   image: "python:3.7"
   extends: .vdk-control-cli-build
@@ -37,6 +37,10 @@ vdk-control-cli-build-with-py39:
   image: "python:3.9"
   extends: .vdk-control-cli-build
 
+vdk-control-cli-build-with-py310:
+  image: "python:3.10"
+  extends: .vdk-control-cli-build
+
 vdk-control-cli-release-acceptance-test:
   stage: pre_release
   before_script:

diff --git a/projects/vdk-control-cli/setup.cfg b/projects/vdk-control-cli/setup.cfg
@@ -26,6 +26,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
@@ -57,7 +58,7 @@ install_requires =
     urllib3>=1.26.5
 
 # Require a specific Python version
-python_requires = >=3.7, <3.10
+python_requires = >=3.7, <3.11
 
 [options.packages.find]
 where = src

diff --git a/projects/vdk-core/.gitlab-ci.yml b/projects/vdk-core/.gitlab-ci.yml
@@ -18,6 +18,7 @@ image: "python:3.9"
   stage: build
   before_script:
     - cd projects/vdk-core/
+    - pip install -U pip
     - pip install --extra-index-url $PIP_EXTRA_INDEX_URL -r requirements.txt
   script:
     - ./cicd/build.sh
@@ -45,6 +46,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 +84,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/plugins/.plugin-common.yml b/projects/vdk-core/plugins/.plugin-common.yml
@@ -11,6 +11,7 @@
   stage: build
   before_script:
     - cd projects/vdk-core/
+    - pip install -U pip
   script:
     - echo "Build plugin $PLUGIN_NAME"
     - cd plugins/$PLUGIN_NAME || exit 1

diff --git a/projects/vdk-core/plugins/vdk-plugin-control-cli/.plugin-ci.yml b/projects/vdk-core/plugins/vdk-plugin-control-cli/.plugin-ci.yml
@@ -22,6 +22,10 @@ build-py39-vdk-plugin-control-cli:
   extends: .build-vdk-plugin-control-cli
   image: "python:3.9"
 
+build-py310-vdk-plugin-control-cli:
+  extends: .build-vdk-plugin-control-cli
+  image: "python:3.10"
+
 
 release-vdk-plugin-control-cli:
   variables:

diff --git a/projects/vdk-core/plugins/vdk-plugin-control-cli/setup.py b/projects/vdk-core/plugins/vdk-plugin-control-cli/setup.py
@@ -33,5 +33,6 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
     ],
 )
diff --git 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