fix(pyproject): adding pyproject back in for v2beta1 api. Also updating license to be SPDX format in all pyprojects.

Signed-off-by: CollinHowland <[email protected]>

Author: CollinHowland

api/v2alpha1/python/pyproject.toml

@@ -25,7 +25,7 @@ authors = [
 ]
 readme = '../../README.md'
 requires-python = '>=3.9.0'
-license = 'Apache 2.0'
+license = 'Apache-2.0'
 dependencies = [
     # Typically we can't support multiple major versions of protobuf
     # The runtime protobuf package MUST be aligned with the protobuf

backend/api/v1beta1/python_http_client/pyproject.toml

@@ -28,7 +28,7 @@ classifiers = [
     'Topic :: Software Development :: Libraries',
     'Topic :: Software Development :: Libraries :: Python Modules',
 ]
-license = 'Apache 2.0'
+license = 'Apache-2.0'
 license-files = {globs = ['LICENSE']}
 keywords = [
     'OpenAPI',

backend/api/v2beta1/python_http_client/pyproject.toml

@@ -0,0 +1,58 @@
+# Copyright 2023 The Kubeflow Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+[build-system]
+requires = ['setuptools>=61.0', 'wheel']
+build-backend = 'setuptools.build_meta'
+
+[project]
+name = 'kfp-server-api'
+version = '2.14.6'
+description = 'Kubeflow Pipelines API'
+authors = [
+    {name = 'google', email = '[email protected]'}
+]
+keywords = [
+    'OpenAPI',
+    'OpenAPI-Generator',
+    'Kubeflow Pipelines API',
+]
+readme = 'README.md'
+requires-python = '>=3.9.0'
+license = 'Apache-2.0'
+dependencies = [
+    'urllib3 >= 1.15',
+    'six >= 1.10',
+    'certifi',
+    'python-dateutil',
+]
+
+[dependency-groups]
+dev = [
+    'pytest~=4.6.7', # needed for python 2.7+3.4
+    'pytest-cov>=2.8.1',
+    'pytest-randomly==1.2.3', # needed for python 2.7+3.4
+]
+
+[project.urls]
+Github = 'https://github.com/kubeflow/pipelines'
+Documentation = 'https://kfp-kubernetes.readthedocs.io/'
+'Bug Tracker'= 'https://github.com/kubeflow/pipelines/issues'
+Source = 'https://github.com/kubeflow/pipelines/tree/master/kubernetes_platform/python'
+
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.packages.find]
+exclude = ['test.*', 'tests.*']

backend/api/v2beta1/python_http_client/setup.py

@@ -1,41 +1,5 @@
 # coding: utf-8
 
-"""
-    Kubeflow Pipelines API
+from setuptools import setup
 
-    This file contains REST API specification for Kubeflow Pipelines. The file is autogenerated from the swagger definition.
-
-    Contact: [email protected]
-    Generated by: https://openapi-generator.tech
-"""
-
-
-from setuptools import setup, find_packages  # noqa: H301
-
-NAME = "kfp-server-api"
-VERSION = "2.14.6"
-# To install the library, run the following
-#
-# python setup.py install
-#
-# prerequisite: setuptools
-# http://pypi.python.org/pypi/setuptools
-
-REQUIRES = ["urllib3 >= 1.15", "six >= 1.10", "certifi", "python-dateutil"]
-
-setup(
-    name=NAME,
-    version=VERSION,
-    description="Kubeflow Pipelines API",
-    author="google",
-    author_email="[email protected]",
-    url="https://github.com/kubeflow/pipelines",
-    keywords=["OpenAPI", "OpenAPI-Generator", "Kubeflow Pipelines API"],
-    install_requires=REQUIRES,
-    packages=find_packages(exclude=["test", "tests"]),
-    include_package_data=True,
-    license="Apache 2.0",
-    long_description="""\
-    This file contains REST API specification for Kubeflow Pipelines. The file is autogenerated from the swagger definition.  # noqa: E501
-    """
-)
+setup()

kubernetes_platform/python/pyproject.toml

@@ -25,7 +25,7 @@ authors = [
 ]
 readme = 'README.md'
 requires-python = '>=3.9.0'
-license = 'Apache 2.0'
+license = 'Apache-2.0'
 dependencies = [
     # protobuf version should be identical to the one in kfp-pipeline-spec
     # api/v2alpha1/python/pyroject.toml

kubernetes_platform/python/setup.py

@@ -1,82 +1,3 @@
-# Copyright 2023 The Kubeflow Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import os
-import re
-from typing import List
-
 import setuptools
 
-NAME = 'kfp-kubernetes'
-
-def get_requirements(requirements_file: str) -> List[str]:
-    """Read requirements from requirements.in."""
-
-    file_path = os.path.join(os.path.dirname(__file__), requirements_file)
-    with open(file_path, 'r') as f:
-        lines = f.readlines()
-    lines = [line.strip() for line in lines]
-    lines = [line for line in lines if not line.startswith('#') and line]
-    return lines
-
-def find_version(*file_path_parts: str) -> str:
-    """Get version from kfp.__init__.__version__."""
-
-    file_path = os.path.join(os.path.dirname(__file__), *file_path_parts)
-    with open(file_path, 'r') as f:
-        version_file_text = f.read()
-
-    version_match = re.search(
-        r"^__version__ = ['\"]([^'\"]*)['\"]",
-        version_file_text,
-        re.M,
-    )
-    if version_match:
-        return version_match[1]
-    else:
-        raise ValueError('Could not find version.')
-
-
-def read_readme() -> str:
-    readme_path = os.path.join(os.path.dirname(__file__), 'README.md')
-    with open(readme_path) as f:
-        return f.read()
-
-
-setuptools.setup(
-    name=NAME,
-    version=find_version('kfp', 'kubernetes', '__init__.py'),
-    description='Kubernetes platform configuration library and generated protos.',
-    long_description=read_readme(),
-    long_description_content_type='text/markdown',
-    author='google',
-    author_email='[email protected]',
-    url='https://github.com/kubeflow/pipelines',
-    project_urls={
-        'Documentation':
-            'https://kfp-kubernetes.readthedocs.io/',
-        'Bug Tracker':
-            'https://github.com/kubeflow/pipelines/issues',
-        'Source':
-            'https://github.com/kubeflow/pipelines/tree/master/kubernetes_platform/python',
-    },
-    packages=setuptools.find_namespace_packages(include=['kfp.*']),
-    python_requires='>=3.9.0',
-    install_requires=get_requirements('requirements.in'),
-    include_package_data=True,
-    extras_require={
-        'dev': get_requirements('requirements-dev.txt'),
-    },
-    license='Apache 2.0',
-)
+setuptools.setup()

sdk/python/pyproject.toml

@@ -25,7 +25,7 @@ authors = [
 ]
 readme = 'README.md'
 requires-python = '>=3.9.0'
-license = 'Apache 2.0'
+license = 'Apache-2.0'
 classifiers = [
     'Intended Audience :: Developers',
     'Intended Audience :: Education',