Skip to content

Commit

Permalink
feat: upgrade to kfp v2 and Python 3.9
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonny Browning committed Jul 19, 2023
1 parent a981b73 commit bfa2904
Show file tree
Hide file tree
Showing 32 changed files with 833 additions and 626 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

---
default_language_version:
python: python3.7
python: python3.9

repos:
- repo: https://github.com/gruntwork-io/pre-commit
Expand Down
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.7.12
3.9.16
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,9 @@ destroy-infra: ## DESTROY the Terraform infrastructure in your project. Requires
@ cd terraform/envs/$(env) && \
terraform init -backend-config='bucket=${VERTEX_PROJECT_ID}-tfstate' && \
terraform destroy -var 'project_id=${VERTEX_PROJECT_ID}' -var 'region=${VERTEX_LOCATION}'

build-training-container: ## Build and push training container image using Docker
@ cd training && \
poetry export -f requirements.txt -o requirements.txt && \
docker build -t ${TRAINING_CONTAINER_IMAGE} . && \
docker push ${TRAINING_CONTAINER_IMAGE}
2 changes: 1 addition & 1 deletion cloudbuild/e2e-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ steps:
# Install Python deps
# Run end-to-end (E2E) pipeline tests on both pipelines
- name: python:3.7
- name: python:3.9
entrypoint: /bin/sh
args:
- -c
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild/pr-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ steps:
# Install poetry and deps, run pre-commit and unit tests
# Then compile pipelines (to make sure they can compile)
# need to run "git init" for pre-commit checks to work
- name: python:3.7
- name: python:3.9
entrypoint: /bin/sh
args:
- -c
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
steps:

# Install poetry, install deps, compile pipelines
- name: python:3.7
- name: python:3.9
entrypoint: /bin/sh
args:
- -c
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild/trigger-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.
---
steps:
- name: 'python:3.7'
- name: 'python:3.9'
args:
- '-c'
- |
Expand Down
2 changes: 1 addition & 1 deletion components/bigquery-components/.python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.7.12
3.9.16
62 changes: 31 additions & 31 deletions components/bigquery-components/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions components/bigquery-components/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ readme = "README.md"
classifiers = [
"Development Status :: 3 - Alpha",
"Intended Audience :: Developers",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.9",
]

[tool.poetry.dependencies]
python = ">=3.7,<3.11"
python = ">=3.9,<3.11"
kfp = "^2.0.1"

[tool.poetry.group.dev.dependencies]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@


@component(
base_image="python:3.7",
base_image="python:3.9",
packages_to_install=["google-cloud-bigquery==2.30.0"],
)
def extract_bq_to_dataset(
Expand Down
2 changes: 1 addition & 1 deletion components/vertex-components/.python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.7.12
3.9.16
Loading

0 comments on commit bfa2904

Please sign in to comment.