From 3fb70209af4e3fba69d395d1182ce6e9bd91964a Mon Sep 17 00:00:00 2001 From: Rin Arakaki Date: Tue, 15 Oct 2024 12:49:37 +0900 Subject: [PATCH 01/10] Create pyproject.toml --- pyproject.toml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pyproject.toml diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..0bd5101 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,38 @@ +[build-system] +requires = ["setuptools", "setuptools-scm"] +build-backend = "setuptools.build_meta" + +[project] +name = "google-cloud-core" +version = "2.4.1" +authors = [{ name = "Google LLC", email = "googleapis-packages@google.com" }] +license = { text = "Apache 2.0" } +requires-python = ">=3.7" +readme = "README.rst" +classifiers = [ + # Should be one of: + # "Development Status :: 3 - Alpha" + # "Development Status :: 4 - Beta" + # "Development Status :: 5 - Production/Stable" + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "License :: OSI Approved :: Apache Software License", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Operating System :: OS Independent", + "Topic :: Internet", +] +dependencies = [ + "google-api-core >= 1.31.6, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0", + "google-auth >= 1.25.0, < 3.0dev", + "importlib-metadata > 1.0.0; python_version<'3.8'", +] + +[project.optional-dependencies] +grpc = ["grpcio >= 1.38.0, < 2.0dev", "grpcio-status >= 1.38.0, < 2.0.dev0"] From 4e92adf806a66a2a123d9da192c6f4202e2caa46 Mon Sep 17 00:00:00 2001 From: Rin Arakaki Date: Tue, 15 Oct 2024 12:50:02 +0900 Subject: [PATCH 02/10] Update setup.py --- setup.py | 50 -------------------------------------------------- 1 file changed, 50 deletions(-) diff --git a/setup.py b/setup.py index eced53a..419f770 100644 --- a/setup.py +++ b/setup.py @@ -20,38 +20,12 @@ # Package metadata. -name = "google-cloud-core" description = "Google Cloud API client core library" -# Should be one of: -# 'Development Status :: 3 - Alpha' -# 'Development Status :: 4 - Beta' -# 'Development Status :: 5 - Production/Stable' -release_status = "Development Status :: 5 - Production/Stable" -dependencies = [ - "google-api-core >= 1.31.6, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0", - "google-auth >= 1.25.0, < 3.0dev", - "importlib-metadata > 1.0.0; python_version<'3.8'", -] -extras = { - "grpc": [ - "grpcio >= 1.38.0, < 2.0dev", - "grpcio-status >= 1.38.0, < 2.0.dev0", - ], -} # Setup boilerplate below this line. package_root = os.path.abspath(os.path.dirname(__file__)) -version = {} -with open(os.path.join(package_root, "google/cloud/version.py")) as fp: - exec(fp.read(), version) -version = version["__version__"] - -readme_filename = os.path.join(package_root, "README.rst") -with io.open(readme_filename, encoding="utf-8") as readme_file: - readme = readme_file.read() - # Only include packages under the 'google' namespace. Do not include tests, # benchmarks, etc. packages = [ @@ -61,34 +35,10 @@ ] setuptools.setup( - name=name, - version=version, description=description, - long_description=readme, - author="Google LLC", - author_email="googleapis-packages@google.com", - license="Apache 2.0", url="https://github.com/googleapis/python-cloud-core", - classifiers=[ - release_status, - "Intended Audience :: Developers", - "License :: OSI Approved :: Apache Software License", - "Programming Language :: Python", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "Operating System :: OS Independent", - "Topic :: Internet", - ], platforms="Posix; MacOS X; Windows", packages=packages, - install_requires=dependencies, - extras_require=extras, - python_requires=">=3.7", include_package_data=True, zip_safe=False, ) From 4307b012d8a6f59ca7d4d706c6ecfc28b0c2385e Mon Sep 17 00:00:00 2001 From: rinarakaki Date: Tue, 15 Oct 2024 04:42:36 +0000 Subject: [PATCH 03/10] dynamic version --- pyproject.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0bd5101..96706c2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,10 +1,9 @@ [build-system] -requires = ["setuptools", "setuptools-scm"] +requires = ["setuptools"] build-backend = "setuptools.build_meta" [project] name = "google-cloud-core" -version = "2.4.1" authors = [{ name = "Google LLC", email = "googleapis-packages@google.com" }] license = { text = "Apache 2.0" } requires-python = ">=3.7" @@ -33,6 +32,10 @@ dependencies = [ "google-auth >= 1.25.0, < 3.0dev", "importlib-metadata > 1.0.0; python_version<'3.8'", ] +dynamic = ["version"] [project.optional-dependencies] grpc = ["grpcio >= 1.38.0, < 2.0dev", "grpcio-status >= 1.38.0, < 2.0.dev0"] + +[tool.setuptools.dynamic] +version = { attr = "google.cloud.version.__version__" } From a562d285b730b485d7c2c9a748259a240e85a944 Mon Sep 17 00:00:00 2001 From: rinarakaki Date: Tue, 15 Oct 2024 04:43:13 +0000 Subject: [PATCH 04/10] move description --- pyproject.toml | 1 + setup.py | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 96706c2..d145259 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,6 +8,7 @@ authors = [{ name = "Google LLC", email = "googleapis-packages@google.com" }] license = { text = "Apache 2.0" } requires-python = ">=3.7" readme = "README.rst" +description = "Google Cloud API client core library" classifiers = [ # Should be one of: # "Development Status :: 3 - Alpha" diff --git a/setup.py b/setup.py index 419f770..f30606a 100644 --- a/setup.py +++ b/setup.py @@ -12,16 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import io import os import setuptools -# Package metadata. - -description = "Google Cloud API client core library" - # Setup boilerplate below this line. package_root = os.path.abspath(os.path.dirname(__file__)) @@ -35,7 +30,6 @@ ] setuptools.setup( - description=description, url="https://github.com/googleapis/python-cloud-core", platforms="Posix; MacOS X; Windows", packages=packages, From 93fec994b6e15bea3323a119ab6a1f17aeda8e21 Mon Sep 17 00:00:00 2001 From: rinarakaki Date: Tue, 15 Oct 2024 07:49:02 +0000 Subject: [PATCH 05/10] move urls --- pyproject.toml | 3 +++ setup.py | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d145259..7cacf7a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,6 +35,9 @@ dependencies = [ ] dynamic = ["version"] +[project.urls] +Repository = "https://github.com/googleapis/python-cloud-core" + [project.optional-dependencies] grpc = ["grpcio >= 1.38.0, < 2.0dev", "grpcio-status >= 1.38.0, < 2.0.dev0"] diff --git a/setup.py b/setup.py index f30606a..a0f14e8 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,6 @@ ] setuptools.setup( - url="https://github.com/googleapis/python-cloud-core", platforms="Posix; MacOS X; Windows", packages=packages, include_package_data=True, From dcdb5809c76ef3bd9519f402a3d3280ad8e3e8a1 Mon Sep 17 00:00:00 2001 From: rinarakaki Date: Tue, 15 Oct 2024 08:22:07 +0000 Subject: [PATCH 06/10] move packages --- pyproject.toml | 5 +++++ setup.py | 15 --------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 7cacf7a..643a602 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,3 +43,8 @@ grpc = ["grpcio >= 1.38.0, < 2.0dev", "grpcio-status >= 1.38.0, < 2.0.dev0"] [tool.setuptools.dynamic] version = { attr = "google.cloud.version.__version__" } + +[tool.setuptools.packages.find] +# Only include packages under the 'google' namespace. Do not include tests, +# benchmarks, etc. +include = ["google*"] diff --git a/setup.py b/setup.py index a0f14e8..141741c 100644 --- a/setup.py +++ b/setup.py @@ -12,26 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import os - import setuptools -# Setup boilerplate below this line. - -package_root = os.path.abspath(os.path.dirname(__file__)) - -# Only include packages under the 'google' namespace. Do not include tests, -# benchmarks, etc. -packages = [ - package - for package in setuptools.find_namespace_packages() - if package.startswith("google") -] - setuptools.setup( platforms="Posix; MacOS X; Windows", - packages=packages, include_package_data=True, zip_safe=False, ) From 11a0dab894f696b8128455501e4f67c80877b33b Mon Sep 17 00:00:00 2001 From: Rin Arakaki Date: Tue, 15 Oct 2024 17:27:48 +0900 Subject: [PATCH 07/10] zip_safe is deprecated --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 141741c..e8a3aa2 100644 --- a/setup.py +++ b/setup.py @@ -18,5 +18,4 @@ setuptools.setup( platforms="Posix; MacOS X; Windows", include_package_data=True, - zip_safe=False, ) From de11f1a8706607a27faa69693663223803ba345e Mon Sep 17 00:00:00 2001 From: Rin Arakaki Date: Tue, 15 Oct 2024 17:31:30 +0900 Subject: [PATCH 08/10] include-package-data = true by default --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index e8a3aa2..73932a2 100644 --- a/setup.py +++ b/setup.py @@ -17,5 +17,4 @@ setuptools.setup( platforms="Posix; MacOS X; Windows", - include_package_data=True, ) From 6705d6edb99d03d4b6b60f693886e2eb0557cc1c Mon Sep 17 00:00:00 2001 From: Rin Arakaki Date: Tue, 15 Oct 2024 17:40:44 +0900 Subject: [PATCH 09/10] platforms are ignored --- setup.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 73932a2..168877f 100644 --- a/setup.py +++ b/setup.py @@ -15,6 +15,4 @@ import setuptools -setuptools.setup( - platforms="Posix; MacOS X; Windows", -) +setuptools.setup() From e565789db1453ba5cca085243abf9d8a3ceba0cb Mon Sep 17 00:00:00 2001 From: rinarakaki Date: Sun, 20 Oct 2024 04:43:30 +0000 Subject: [PATCH 10/10] Add copyright notice --- pyproject.toml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 643a602..7d635e7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,17 @@ +# Copyright 2024 Google LLC +# +# 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"] build-backend = "setuptools.build_meta" @@ -29,9 +43,9 @@ classifiers = [ "Topic :: Internet", ] dependencies = [ - "google-api-core >= 1.31.6, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0", + "google-api-core >= 1.31.6, < 3.0.0dev, != 2.0.*, != 2.1.*, != 2.2.*, != 2.3.0", "google-auth >= 1.25.0, < 3.0dev", - "importlib-metadata > 1.0.0; python_version<'3.8'", + "importlib-metadata > 1.0.0; python_version < '3.8'", ] dynamic = ["version"]