From f939e209cf6d0f9b7c35acc56e46553ff891036e Mon Sep 17 00:00:00 2001 From: Tommy Li Date: Mon, 12 Feb 2024 16:13:58 -0800 Subject: [PATCH 1/8] Update github actions to also test python 3.12 --- .github/workflows/kfp-tekton-unittests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kfp-tekton-unittests.yml b/.github/workflows/kfp-tekton-unittests.yml index f84cb3c747..6f8827f824 100644 --- a/.github/workflows/kfp-tekton-unittests.yml +++ b/.github/workflows/kfp-tekton-unittests.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} From de72cb626b46f0b1bbd08a543a7d8b8b54ac29b8 Mon Sep 17 00:00:00 2001 From: Tommy Li Date: Mon, 12 Feb 2024 16:18:27 -0800 Subject: [PATCH 2/8] Update setup.py --- sdk/python/setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/python/setup.py b/sdk/python/setup.py index 6b4f9b6bd6..df3aaa8f77 100644 --- a/sdk/python/setup.py +++ b/sdk/python/setup.py @@ -61,7 +61,8 @@ REQUIRES = [ "kfp>=1.8.10,<1.8.23", "kfp-tekton-server-api==1.8.0rc8", - "PyYAML>=6,<7" + "PyYAML>=6,<7", + "setuptools>=68.2.2" ] TESTS_REQUIRE = [ From df5b50445a0958db136a3e392fb2c88514167809 Mon Sep 17 00:00:00 2001 From: Tommy Li Date: Mon, 12 Feb 2024 16:22:07 -0800 Subject: [PATCH 3/8] Update setup.py --- sdk/python/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/python/setup.py b/sdk/python/setup.py index df3aaa8f77..2a436d63bd 100644 --- a/sdk/python/setup.py +++ b/sdk/python/setup.py @@ -62,7 +62,7 @@ "kfp>=1.8.10,<1.8.23", "kfp-tekton-server-api==1.8.0rc8", "PyYAML>=6,<7", - "setuptools>=68.2.2" + "setuptools>=69.1" ] TESTS_REQUIRE = [ From 783ee8daa15485e5f92530f43249a467abaafd81 Mon Sep 17 00:00:00 2001 From: Tommy Li Date: Mon, 12 Feb 2024 16:28:57 -0800 Subject: [PATCH 4/8] Update kfp-tekton-unittests.yml --- .github/workflows/kfp-tekton-unittests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kfp-tekton-unittests.yml b/.github/workflows/kfp-tekton-unittests.yml index 6f8827f824..6ee6fb2ec2 100644 --- a/.github/workflows/kfp-tekton-unittests.yml +++ b/.github/workflows/kfp-tekton-unittests.yml @@ -24,7 +24,7 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Install dependencies - run: python -m pip install -e sdk/python + run: SETUPTOOLS_USE_DISTUTILS="" python -m pip install -e sdk/python - name: Unit Tests run: VENV=$VIRTUAL_ENV make ci_unit_test validate-testdata: From b0f45ab6c4dd3dba97514229606a8ba284b23719 Mon Sep 17 00:00:00 2001 From: Tommy Li Date: Mon, 12 Feb 2024 16:31:02 -0800 Subject: [PATCH 5/8] Update kfp-tekton-unittests.yml --- .github/workflows/kfp-tekton-unittests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/kfp-tekton-unittests.yml b/.github/workflows/kfp-tekton-unittests.yml index 6ee6fb2ec2..7a9eb329a6 100644 --- a/.github/workflows/kfp-tekton-unittests.yml +++ b/.github/workflows/kfp-tekton-unittests.yml @@ -24,7 +24,9 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Install dependencies - run: SETUPTOOLS_USE_DISTUTILS="" python -m pip install -e sdk/python + env: + SETUPTOOLS_USE_DISTUTILS: "" + run: python -m pip install -e sdk/python - name: Unit Tests run: VENV=$VIRTUAL_ENV make ci_unit_test validate-testdata: From 0fe24c018961a058af044330bfe162d5c4af62df Mon Sep 17 00:00:00 2001 From: Tommy Li Date: Mon, 12 Feb 2024 16:45:24 -0800 Subject: [PATCH 6/8] Update kfp-tekton-unittests.yml --- .github/workflows/kfp-tekton-unittests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/kfp-tekton-unittests.yml b/.github/workflows/kfp-tekton-unittests.yml index 7a9eb329a6..0033a8a275 100644 --- a/.github/workflows/kfp-tekton-unittests.yml +++ b/.github/workflows/kfp-tekton-unittests.yml @@ -23,6 +23,10 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} + - name: Install setuptools + env: + SETUPTOOLS_USE_DISTUTILS: "" + run: python -m pip install "setuptools>=69.1" - name: Install dependencies env: SETUPTOOLS_USE_DISTUTILS: "" From d78d8d1e210880dc3d8e50919ccb44783b8d7fe5 Mon Sep 17 00:00:00 2001 From: Tommy Li Date: Mon, 12 Feb 2024 16:54:00 -0800 Subject: [PATCH 7/8] Update kfp-tekton-unittests.yml --- .github/workflows/kfp-tekton-unittests.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/kfp-tekton-unittests.yml b/.github/workflows/kfp-tekton-unittests.yml index 0033a8a275..c4bc96e699 100644 --- a/.github/workflows/kfp-tekton-unittests.yml +++ b/.github/workflows/kfp-tekton-unittests.yml @@ -9,7 +9,6 @@ on: env: GITHUB_ACTION: "true" - SETUPTOOLS_USE_DISTUTILS: "stdlib" jobs: python-unittest: @@ -23,13 +22,7 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - - name: Install setuptools - env: - SETUPTOOLS_USE_DISTUTILS: "" - run: python -m pip install "setuptools>=69.1" - name: Install dependencies - env: - SETUPTOOLS_USE_DISTUTILS: "" run: python -m pip install -e sdk/python - name: Unit Tests run: VENV=$VIRTUAL_ENV make ci_unit_test From 385741d1e8443b4be0ab80e57ce4b37ae1fbc3ba Mon Sep 17 00:00:00 2001 From: Tommy Li Date: Mon, 12 Feb 2024 16:57:58 -0800 Subject: [PATCH 8/8] Update README.md --- sdk/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/README.md b/sdk/README.md index f1f683611b..d584eed286 100644 --- a/sdk/README.md +++ b/sdk/README.md @@ -61,7 +61,7 @@ adding the `TektonCompiler` and the `TektonClient`: ## Project Prerequisites - - Python: `3.8` or later + - Python: `3.8` or later. For Python 3.12, make sure to not have the `SETUPTOOLS_USE_DISTUTILS` flag because it's already [deprecated](https://github.com/pypa/setuptools/issues/4002). - Tekton: [`v0.53.2`](https://github.com/tektoncd/pipeline/releases/tag/v0.53.2) or [later](https://github.com/tektoncd/pipeline/releases/latest) - Tekton CLI: [`0.30.1`](https://github.com/tektoncd/cli/releases/tag/v0.30.1) - Kubeflow Pipelines: [KFP with Tekton backend](/guides/kfp_tekton_install.md)