Skip to content

Commit 2ac0a60

Browse files
committed
feat(pyproject): adding pyproject.toml to kfp-kubernetes, and updating some previous pyproject.tomls
Signed-off-by: CollinHowland <[email protected]>
1 parent 032bc78 commit 2ac0a60

File tree

6 files changed

+152
-88
lines changed

6 files changed

+152
-88
lines changed

api/v2alpha1/python/pyproject.toml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@
1313
# limitations under the License.
1414

1515
[build-system]
16-
requires = ["setuptools>=61.0", "wheel"]
17-
build-backend = "setuptools.build_meta"
16+
requires = ['setuptools>=61.0', 'wheel']
17+
build-backend = 'setuptools.build_meta'
1818

1919
[project]
20-
name = "kfp-pipeline-spec"
21-
version = "2.14.0"
22-
description = "Kubeflow Pipelines pipeline spec"
20+
name = 'kfp-pipeline-spec'
21+
version = '2.14.0'
22+
description = 'Kubeflow Pipelines pipeline spec'
2323
authors = [
24-
{name = "google", email = "[email protected]"},
24+
{name = 'google', email = '[email protected]'},
2525
]
26-
readme = "../../README.md"
27-
requires-python = ">=3.9.0"
28-
license = "Apache 2.0"
26+
readme = '../../README.md'
27+
requires-python = '>=3.9.0'
28+
license = 'Apache 2.0'
2929
dependencies = [
3030
# Typically we can't support multiple major versions of protobuf
3131
# The runtime protobuf package MUST be aligned with the protobuf
@@ -34,19 +34,19 @@ dependencies = [
3434
# 6.x aligns with 30.x+.
3535
# See for support tiers:
3636
# https://protobuf.dev/support/version-support/#python
37-
"protobuf==6.31.1,<7.0",
37+
'protobuf==6.31.1,<7.0',
3838
]
3939

4040
[dependency-groups]
4141
dev = []
4242

4343
[project.urls]
44-
Github = "https://github.com/kubeflow/pipelines"
44+
Github = 'https://github.com/kubeflow/pipelines'
4545

4646

4747
[tool.setuptools]
4848
include-package-data = true
4949

5050

5151
[tool.setuptools.packages.find]
52-
include = ["kfp.*"]
52+
include = ['kfp.*']
Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
[build-system]
2-
requires = ["setuptools>=61.0", "wheel"]
3-
build-backend = "setuptools.build_meta"
2+
requires = ['setuptools>=61.0', 'wheel']
3+
build-backend = 'setuptools.build_meta'
44

55
[project]
6-
name = "kfp-server-api"
7-
version = "2.14.3"
8-
description = "Kubeflow Pipelines API"
6+
name = 'kfp-server-api'
7+
version = '2.14.3'
8+
description = 'Kubeflow Pipelines API'
99
authors = [
10-
{name = "google", email = "[email protected]"},
10+
{name = 'google', email = '[email protected]'},
1111
]
12-
readme = "README.md"
13-
requires-python = ">=3.9.0"
12+
readme = 'README.md'
13+
requires-python = '>=3.9.0'
1414
classifiers = [
1515
'Intended Audience :: Developers',
1616
'Intended Audience :: Education',
@@ -28,36 +28,36 @@ classifiers = [
2828
'Topic :: Software Development :: Libraries',
2929
'Topic :: Software Development :: Libraries :: Python Modules',
3030
]
31-
license = "Apache 2.0"
32-
license-files = {globs = ["LICENSE"]}
31+
license = 'Apache 2.0'
32+
license-files = {globs = ['LICENSE']}
3333
keywords = [
34-
"OpenAPI",
35-
"OpenAPI-Generator",
36-
"Kubeflow Pipelines API",
34+
'OpenAPI',
35+
'OpenAPI-Generator',
36+
'Kubeflow Pipelines API',
3737
]
3838
dependencies = [
39-
"certifi >= 14.05.14",
40-
"future; python_version<=2.7",
41-
"six >= 1.10",
42-
"python_dateutil >= 2.5.3",
43-
"setuptools >= 21.0.0",
44-
"urllib3 >= 1.15.1",
39+
'certifi >= 14.05.14',
40+
'future; python_version<=2.7',
41+
'six >= 1.10',
42+
'python_dateutil >= 2.5.3',
43+
'setuptools >= 21.0.0',
44+
'urllib3 >= 1.15.1',
4545
]
4646

4747

4848
[dependency-groups]
4949
dev = [
50-
"pytest~=4.6.7", # needed for python 2.7+3.4
51-
"pytest-cov>=2.8.1",
52-
"pytest-randomly==1.2.3", # needed for python 2.7+3.4
50+
'pytest~=4.6.7', # needed for python 2.7+3.4
51+
'pytest-cov>=2.8.1',
52+
'pytest-randomly==1.2.3', # needed for python 2.7+3.4
5353
]
5454

5555
[project.urls]
56-
Github = "https://github.com/kubeflow/pipelines"
56+
Github = 'https://github.com/kubeflow/pipelines'
5757

5858

5959
[tool.setuptools]
6060
include-package-data = true
6161

6262
[tool.setuptools.packages.find]
63-
exclude = ["*test*"]
63+
exclude = ['*test*']
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# Copyright 2023 The Kubeflow Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
[build-system]
16+
requires = ['setuptools>=61.0', 'wheel']
17+
build-backend = 'setuptools.build_meta'
18+
19+
[project]
20+
name = 'kfp-kubernetes'
21+
dynamic = ['version', 'readme']
22+
description = 'Kubernetes platform configuration library and generated protos.'
23+
authors = [
24+
{name = 'google', email = '[email protected]'}
25+
]
26+
readme = 'README.md'
27+
requires-python = '>=3.9.0'
28+
license = 'Apache 2.0'
29+
dependencies = [
30+
# protobuf version should be identical to the one in kfp-pipeline-spec
31+
# api/v2alpha1/python/pyroject.toml
32+
'protobuf==6.31.1,<7.0',
33+
'kfp>=2.14.0,<3',
34+
]
35+
36+
[dependency-groups]
37+
dev = [
38+
'docformatter==1.4',
39+
'isort==5.10.1',
40+
'mypy==0.941',
41+
'pre-commit==2.19.0',
42+
'pycln==2.1.1',
43+
'pytest==7.1.2',
44+
'pytest-xdist==2.5.0',
45+
'yapf==0.43.0',
46+
]
47+
48+
[project.urls]
49+
Github = 'https://github.com/kubeflow/pipelines'
50+
Documentation = 'https://kfp-kubernetes.readthedocs.io/'
51+
'Bug Tracker'= 'https://github.com/kubeflow/pipelines/issues'
52+
Source = 'https://github.com/kubeflow/pipelines/tree/master/kubernetes_platform/python'
53+
54+
[project.scripts]
55+
dsl-compile = 'kfp.cli.compile_:main'
56+
kfp = 'kfp.cli.__main__:main'
57+
58+
[tool.setuptools]
59+
include-package-data = true
60+
61+
[tool.setuptools.packages.find]
62+
include = ['kfp.*']
63+
64+
[tool.setuptools.dynamic]
65+
version = {attr = 'kfp.kubernetes.__init__.__version__'}

kubernetes_platform/python/requirements-dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ pre-commit==2.19.0
55
pycln==2.1.1
66
pytest==7.1.2
77
pytest-xdist==2.5.0
8-
yapf==0.32.0
8+
yapf==0.43.0

sdk/python/pyproject.toml

Lines changed: 49 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@
1313
# limitations under the License.
1414

1515
[build-system]
16-
requires = ["setuptools>=61.0", "wheel"]
17-
build-backend = "setuptools.build_meta"
16+
requires = ['setuptools>=61.0', 'wheel']
17+
build-backend = 'setuptools.build_meta'
1818

1919
[project]
20-
name = "kfp"
21-
dynamic = ["version", "readme"]
22-
description = "Kubeflow Pipelines SDK"
20+
name = 'kfp'
21+
dynamic = ['version', 'readme']
22+
description = 'Kubeflow Pipelines SDK'
2323
authors = [
24-
{name = "The Kubeflow Authors"}
24+
{name = 'The Kubeflow Authors'}
2525
]
26-
readme = "README.md"
27-
requires-python = ">=3.9.0"
28-
license = "Apache 2.0"
26+
readme = 'README.md'
27+
requires-python = '>=3.9.0'
28+
license = 'Apache 2.0'
2929
classifiers = [
3030
'Intended Audience :: Developers',
3131
'Intended Audience :: Education',
@@ -48,78 +48,77 @@ dependencies = [
4848
# the following in this folder:
4949
# pip-compile --no-emit-index-url requirements.in
5050

51-
"click==8.1.8",
52-
"click-option-group==0.5.7",
53-
"docstring-parser>=0.7.3,<1",
54-
# Pin google-api-core version for the bug fixing in 1.31.5",
51+
'click==8.1.8',
52+
'click-option-group==0.5.7',
53+
'docstring-parser>=0.7.3,<1',
54+
# Pin google-api-core version for the bug fixing in 1.31.5',
5555
# https://github.com/googleapis/python-api-core/releases/tag/v1.31.5
56-
"google-api-core>=1.31.5,<3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0",
57-
"google-auth>=1.6.1,<3",
56+
'google-api-core>=1.31.5,<3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0',
57+
'google-auth>=1.6.1,<3',
5858
# https://github.com/googleapis/python-storage/blob/main/CHANGELOG.md#221-2022-03-15
59-
"google-cloud-storage>=2.2.1,<4",
59+
'google-cloud-storage>=2.2.1,<4',
6060
# pin kfp-pipeline-spec to an exact version, since this is the contract between a given KFP
6161
# SDK version and the BE. we don't want old version of the SDK to write new fields and to
6262
# have the BE reject the new unsupported field (even if the new field backward compatible from a proto perspective)
63-
"kfp-pipeline-spec==2.14.0",
63+
'kfp-pipeline-spec==2.14.0',
6464
# Update the upper version whenever a new major version of the
6565
# kfp-server-api package is released.
6666
# Update the lower version when kfp sdk depends on new apis/fields in
6767
# kfp-server-api
68-
"kfp-server-api>=2.14.0,<3",
69-
"kubernetes>=8.0.0,<31",
68+
'kfp-server-api>=2.14.0,<3',
69+
'kubernetes>=8.0.0,<31',
7070
# protobuf version should be identical to the one in kfp-pipeline-spec
7171
# api/v2alpha1/python/requirements.txt
72-
"protobuf==6.31.1,<7.0",
73-
"PyYAML>=5.3,<7",
74-
"requests-toolbelt>=0.8.0,<2",
75-
"tabulate>=0.8.6,<1",
76-
"urllib3<3.0.0",
72+
'protobuf==6.31.1,<7.0',
73+
'PyYAML>=5.3,<7',
74+
'requests-toolbelt>=0.8.0,<2',
75+
'tabulate>=0.8.6,<1',
76+
'urllib3<3.0.0',
7777

7878
## standard library backports ##
79-
"typing-extensions>=3.7.4,<5; python_version<'3.9'",
79+
'typing-extensions>=3.7.4,<5; python_version<3.9',
8080
]
8181

8282
[project.optional-dependencies]
83-
kubernetes = ["kfp-kubernetes<2"]
84-
all = ["docker", "kfp-kubernetes<2"]
83+
kubernetes = ['kfp-kubernetes<2']
84+
all = ['docker', 'kfp-kubernetes<2']
8585

8686
[dependency-groups]
8787
dev = [
88-
"absl-py==1.4.0",
89-
"docformatter==1.4",
90-
"docker==5.0.3",
91-
"isort==5.10.1",
92-
"mypy==0.941",
93-
"pip-tools==6.0.0",
94-
"pre-commit==2.19.0",
95-
"pycln==2.1.1",
96-
"pylint==2.17.7",
97-
"pytest==7.1.2",
98-
"pytest-cov==3.0.0",
99-
"pytest-xdist==2.5.0",
100-
"types-protobuf==3.19.15",
101-
"types-PyYAML==6.0.5",
102-
"types-requests==2.27.14",
103-
"types-tabulate==0.8.6",
104-
"yapf==0.32.0",
88+
'absl-py==1.4.0',
89+
'docformatter==1.4',
90+
'docker==5.0.3',
91+
'isort==5.10.1',
92+
'mypy==0.941',
93+
'pip-tools==6.0.0',
94+
'pre-commit==2.19.0',
95+
'pycln==2.1.1',
96+
'pylint==2.17.7',
97+
'pytest==7.1.2',
98+
'pytest-cov==3.0.0',
99+
'pytest-xdist==2.5.0',
100+
'types-protobuf==3.19.15',
101+
'types-PyYAML==6.0.5',
102+
'types-requests==2.27.14',
103+
'types-tabulate==0.8.6',
104+
'yapf==0.43.0',
105105
]
106106

107107
[project.urls]
108108
Documentation = 'https://kubeflow-pipelines.readthedocs.io/en/stable/'
109-
"Bug Tracker" = 'https://github.com/kubeflow/pipelines/issues'
109+
'Bug Tracker' = 'https://github.com/kubeflow/pipelines/issues'
110110
Source = 'https://github.com/kubeflow/pipelines/tree/master/sdk'
111111
Changelog = 'https://github.com/kubeflow/pipelines/blob/master/sdk/RELEASE.md'
112112

113113
[project.scripts]
114-
dsl-compile = "kfp.cli.compile_:main"
115-
kfp = "kfp.cli.__main__:main"
114+
dsl-compile = 'kfp.cli.compile_:main'
115+
kfp = 'kfp.cli.__main__:main'
116116

117117
[tool.setuptools]
118118
include-package-data = true
119119

120120
[tool.setuptools.packages.find]
121-
exclude = ["*test*"]
121+
exclude = ['*test*']
122122

123123
[tool.setuptools.dynamic]
124-
version = {attr = "kfp.version.__version__"}
125-
readme = {file = "README.md", content-type = "text/markdown"}
124+
version = {attr = 'kfp.version.__version__'}

sdk/python/requirements-dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ types-protobuf==3.19.15
1414
types-PyYAML==6.0.5
1515
types-requests==2.27.14
1616
types-tabulate==0.8.6
17-
yapf==0.32.0
17+
yapf==0.43.0

0 commit comments

Comments
 (0)