vdk-core plugins: Support 3.10 (#538)

* vdk-core plugins: Support 3.10 This change enables support for Python 3.10 for all vdk-core plugins except for vdk-snowflake since it's connector hasn't been updated yet. Addresses #390 Signed-off-by: Gabriel Georgiev <gageorgiev@vmware.com> Co-authored-by: Antoni Ivanov <aivanov@vmware.com>
vmware · Nov 23, 2021 · a2ee065 · a2ee065
1 parent de20976
commit a2ee065
Show file tree

Hide file tree

Showing 33 changed files with 72 additions and 1 deletion.
diff --git a/projects/vdk-core/plugins/.plugin-common.yml b/projects/vdk-core/plugins/.plugin-common.yml
@@ -11,6 +11,8 @@
   stage: build
   before_script:
     - cd projects/vdk-core/
+    - pip install -U pip
+    - pip install ./plugins/vdk-test-utils # TODO: REMOVE THIS AT SOME POINT
   script:
     - echo "Build plugin $PLUGIN_NAME"
     - cd plugins/$PLUGIN_NAME || exit 1

diff --git a/projects/vdk-core/plugins/plugin-template/.plugin-ci.yml b/projects/vdk-core/plugins/plugin-template/.plugin-ci.yml
@@ -22,6 +22,9 @@ build-py39-plugin-template: # change name here to the name of the plugin
   extends: .build-plugin-template # change name here to the name of the plugin
   image: "python:3.9"
 
+build-py310-plugin-template: # change name here to the name of the plugin
+  extends: .build-plugin-template # change name here to the name of the plugin
+  image: "python:3.10"
 
 release-plugin-template: # change name here to the name of the plugin
   variables:

diff --git a/projects/vdk-core/plugins/plugin-template/README.md b/projects/vdk-core/plugins/plugin-template/README.md
@@ -1,4 +1,4 @@
 This directory outlines a template which specifies the implementation of all vdk-core plugins. It includes a setup.py file, a /src/ directory containing all the plugin hooks and additional implementation files, a /tests/ directory containing all plugin-specific tests, and a .plugin-ci.yml file which specifies the CI/CD relevant to the plugins.
 
 
-The CI/CD is separated in two stages, a build stage and a release stage. The build stage is made up of three jobs, all which inherit from the same job configuration and only differ in the Python version they use (3.7, 3.8 and 3.9). They run according to three rules, which are ordered in a way such that changes to a plugin's directory or the main directory triggers them, but changes to a different plugin do not.
+The CI/CD is separated in two stages, a build stage and a release stage. The build stage is made up of three jobs, all which inherit from the same job configuration and only differ in the Python version they use (3.7, 3.8, 3.9 and 3.10). They run according to three rules, which are ordered in a way such that changes to a plugin's directory or the main directory triggers them, but changes to a different plugin do not.
diff --git a/projects/vdk-core/plugins/plugin-template/setup.py b/projects/vdk-core/plugins/plugin-template/setup.py
@@ -38,5 +38,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/plugins/quickstart-vdk/.plugin-ci.yml b/projects/vdk-core/plugins/quickstart-vdk/.plugin-ci.yml
@@ -26,6 +26,10 @@ build-py39-quickstart-vdk:
   extends: .build-quickstart-vdk
   image: "python:3.9"
 
+build-py310-quickstart-vdk:
+  extends: .build-quickstart-vdk
+  image: "python:3.10"
+
 
 release-quickstart-vdk:
   variables:

diff --git a/projects/vdk-core/plugins/quickstart-vdk/setup.py b/projects/vdk-core/plugins/quickstart-vdk/setup.py
@@ -28,5 +28,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/plugins/vdk-csv/.plugin-ci.yml b/projects/vdk-core/plugins/vdk-csv/.plugin-ci.yml
@@ -22,6 +22,10 @@ build-py39-vdk-csv:
   extends: .build-vdk-csv
   image: "python:3.9"
 
+build-py310-vdk-csv:
+  extends: .build-vdk-csv
+  image: "python:3.10"
+
 
 release-vdk-csv:
   variables:

diff --git a/projects/vdk-core/plugins/vdk-csv/setup.py b/projects/vdk-core/plugins/vdk-csv/setup.py
@@ -24,5 +24,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/plugins/vdk-greenplum/.plugin-ci.yml b/projects/vdk-core/plugins/vdk-greenplum/.plugin-ci.yml
@@ -28,6 +28,10 @@ build-py39-vdk-greenplum:
   extends: .build-vdk-greenplum
   image: "python:3.9"
 
+build-py310-vdk-greenplum:
+  extends: .build-vdk-greenplum
+  image: "python:3.10"
+
 
 release-vdk-greenplum:
   variables:

diff --git a/projects/vdk-core/plugins/vdk-greenplum/setup.py b/projects/vdk-core/plugins/vdk-greenplum/setup.py
@@ -27,5 +27,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/plugins/vdk-impala/.plugin-ci.yml b/projects/vdk-core/plugins/vdk-impala/.plugin-ci.yml
@@ -28,6 +28,10 @@ build-py39-vdk-impala:
   extends: .build-vdk-impala
   image: "python:3.9"
 
+build-py310-vdk-impala:
+  extends: .build-vdk-impala
+  image: "python:3.10"
+
 
 release-vdk-impala:
   variables:

diff --git a/projects/vdk-core/plugins/vdk-impala/setup.py b/projects/vdk-core/plugins/vdk-impala/setup.py
@@ -25,5 +25,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/plugins/vdk-ingest-file/.plugin-ci.yml b/projects/vdk-core/plugins/vdk-ingest-file/.plugin-ci.yml
@@ -22,6 +22,9 @@ build-py39-vdk-ingest-file:
   extends: .build-vdk-ingest-file
   image: "python:3.9"
 
+build-py310-vdk-ingest-file:
+  extends: .build-vdk-ingest-file
+  image: "python:3.10"
 
 release-vdk-ingest-file:
   variables:

diff --git a/projects/vdk-core/plugins/vdk-ingest-file/setup.py b/projects/vdk-core/plugins/vdk-ingest-file/setup.py
@@ -28,5 +28,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/plugins/vdk-ingest-http/.plugin-ci.yml b/projects/vdk-core/plugins/vdk-ingest-http/.plugin-ci.yml
@@ -22,6 +22,9 @@ build-py39-vdk-ingest-http:
   extends: .build-vdk-ingest-http
   image: "python:3.9"
 
+build-py310-vdk-ingest-http:
+  extends: .build-vdk-ingest-http
+  image: "python:3.10"
 
 release-vdk-ingest-http:
   variables:

diff --git a/projects/vdk-core/plugins/vdk-ingest-http/setup.py b/projects/vdk-core/plugins/vdk-ingest-http/setup.py
@@ -28,5 +28,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/plugins/vdk-logging-json/.plugin-ci.yml b/projects/vdk-core/plugins/vdk-logging-json/.plugin-ci.yml
@@ -22,6 +22,9 @@ build-py39-vdk-logging-json:
   extends: .build-vdk-logging-json
   image: "python:3.9"
 
+build-py310-vdk-logging-json:
+  extends: .build-vdk-logging-json
+  image: "python:3.10"
 
 release-vdk-logging-json:
   variables:

diff --git a/projects/vdk-core/plugins/vdk-logging-json/setup.py b/projects/vdk-core/plugins/vdk-logging-json/setup.py
@@ -26,5 +26,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/plugins/vdk-logging-ltsv/.plugin-ci.yml b/projects/vdk-core/plugins/vdk-logging-ltsv/.plugin-ci.yml
@@ -23,6 +23,9 @@ build-py39-vdk-logging-ltsv:
   extends: .build-vdk-logging-ltsv
   image: "python:3.9"
 
+build-py310-vdk-logging-ltsv:
+  extends: .build-vdk-logging-ltsv
+  image: "python:3.10"
 
 release-vdk-logging-ltsv:
   variables:

diff --git a/projects/vdk-core/plugins/vdk-logging-ltsv/setup.py b/projects/vdk-core/plugins/vdk-logging-ltsv/setup.py
@@ -26,5 +26,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/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/plugins/vdk-postgres/.plugin-ci.yml b/projects/vdk-core/plugins/vdk-postgres/.plugin-ci.yml
@@ -28,6 +28,9 @@ build-py39-vdk-postgres:
   extends: .build-vdk-postgres
   image: "python:3.9"
 
+build-py310-vdk-postgres:
+  extends: .build-vdk-postgres
+  image: "python:3.10"
 
 release-vdk-postgres:
   variables:

diff --git a/projects/vdk-core/plugins/vdk-postgres/setup.py b/projects/vdk-core/plugins/vdk-postgres/setup.py
@@ -27,5 +27,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/plugins/vdk-server/.plugin-ci.yml b/projects/vdk-core/plugins/vdk-server/.plugin-ci.yml
@@ -22,6 +22,9 @@ build-py39-vdk-server:
   extends: .build-vdk-server
   image: "python:3.9"
 
+build-py310-vdk-server:
+  extends: .build-vdk-server
+  image: "python:3.10"
 
 release-vdk-server:
   variables:

diff --git a/projects/vdk-core/plugins/vdk-server/setup.py b/projects/vdk-core/plugins/vdk-server/setup.py
@@ -25,5 +25,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/plugins/vdk-snowflake/.plugin-ci.yml b/projects/vdk-core/plugins/vdk-snowflake/.plugin-ci.yml
@@ -19,6 +19,10 @@ build-py39-vdk-snowflake:
   extends: .build-vdk-snowflake
   image: "python:3.9"
 
+.build-py310-vdk-snowflake: # TODO: unhide the job(remove the dot) once the snowflake connector has been updated
+  extends: .build-vdk-snowflake
+  image: "python:3.10"
+
 release-vdk-snowflake:
   variables:
     PLUGIN_NAME: vdk-snowflake

diff --git a/projects/vdk-core/plugins/vdk-snowflake/setup.py b/projects/vdk-core/plugins/vdk-snowflake/setup.py
@@ -26,5 +26,6 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        #        "Programming Language :: Python :: 3.10", - not supported yet as the connector hasn't been updated
     ],
 )
diff --git a/projects/vdk-core/plugins/vdk-sqlite/.plugin-ci.yml b/projects/vdk-core/plugins/vdk-sqlite/.plugin-ci.yml
@@ -23,6 +23,9 @@ build-py39-vdk-sqlite:
   extends: .build-vdk-sqlite
   image: "python:3.9"
 
+build-py310-vdk-sqlite:
+  extends: .build-vdk-sqlite
+  image: "python:3.10"
 
 release-vdk-sqlite:
   variables:

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

diff --git a/projects/vdk-core/plugins/vdk-test-utils/setup.py b/projects/vdk-core/plugins/vdk-test-utils/setup.py
@@ -23,5 +23,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/plugins/vdk-trino/.plugin-ci.yml b/projects/vdk-core/plugins/vdk-trino/.plugin-ci.yml
@@ -28,6 +28,9 @@ build-py39-vdk-trino:
   extends: .build-vdk-trino
   image: "python:3.9"
 
+build-py310-vdk-trino:
+  extends: .build-vdk-trino
+  image: "python:3.10"
 
 release-vdk-trino:
   variables:

diff --git a/projects/vdk-core/plugins/vdk-trino/setup.py b/projects/vdk-core/plugins/vdk-trino/setup.py
@@ -25,5 +25,6 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
     ],
 )