Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vdk-core plugins: Support 3.10 #538

Merged
merged 5 commits into from
Nov 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions projects/vdk-core/plugins/.plugin-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions projects/vdk-core/plugins/plugin-template/.plugin-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion projects/vdk-core/plugins/plugin-template/README.md
Original file line number Diff line number Diff line change
@@ -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.
1 change: 1 addition & 0 deletions projects/vdk-core/plugins/plugin-template/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
],
)
4 changes: 4 additions & 0 deletions projects/vdk-core/plugins/quickstart-vdk/.plugin-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions projects/vdk-core/plugins/quickstart-vdk/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
],
)
4 changes: 4 additions & 0 deletions projects/vdk-core/plugins/vdk-csv/.plugin-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions projects/vdk-core/plugins/vdk-csv/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
],
)
4 changes: 4 additions & 0 deletions projects/vdk-core/plugins/vdk-greenplum/.plugin-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions projects/vdk-core/plugins/vdk-greenplum/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
],
)
4 changes: 4 additions & 0 deletions projects/vdk-core/plugins/vdk-impala/.plugin-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions projects/vdk-core/plugins/vdk-impala/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
],
)
3 changes: 3 additions & 0 deletions projects/vdk-core/plugins/vdk-ingest-file/.plugin-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions projects/vdk-core/plugins/vdk-ingest-file/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
],
)
3 changes: 3 additions & 0 deletions projects/vdk-core/plugins/vdk-ingest-http/.plugin-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions projects/vdk-core/plugins/vdk-ingest-http/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
],
)
3 changes: 3 additions & 0 deletions projects/vdk-core/plugins/vdk-logging-json/.plugin-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions projects/vdk-core/plugins/vdk-logging-json/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,6 @@
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
],
)
3 changes: 3 additions & 0 deletions projects/vdk-core/plugins/vdk-logging-ltsv/.plugin-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions projects/vdk-core/plugins/vdk-logging-ltsv/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,6 @@
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions projects/vdk-core/plugins/vdk-plugin-control-cli/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
],
)
3 changes: 3 additions & 0 deletions projects/vdk-core/plugins/vdk-postgres/.plugin-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions projects/vdk-core/plugins/vdk-postgres/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
],
)
3 changes: 3 additions & 0 deletions projects/vdk-core/plugins/vdk-server/.plugin-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions projects/vdk-core/plugins/vdk-server/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
],
)
4 changes: 4 additions & 0 deletions projects/vdk-core/plugins/vdk-snowflake/.plugin-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions projects/vdk-core/plugins/vdk-snowflake/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
],
)
3 changes: 3 additions & 0 deletions projects/vdk-core/plugins/vdk-sqlite/.plugin-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions projects/vdk-core/plugins/vdk-test-utils/.plugin-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions projects/vdk-core/plugins/vdk-test-utils/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
],
)
3 changes: 3 additions & 0 deletions projects/vdk-core/plugins/vdk-trino/.plugin-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions projects/vdk-core/plugins/vdk-trino/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
],
)