From 2fe57b8c6243eac1299f58983fa6e2c937cd2d65 Mon Sep 17 00:00:00 2001 From: Rin Arakaki Date: Tue, 15 Oct 2024 12:55:10 +0900 Subject: [PATCH 01/11] Create pyproject.toml --- pyproject.toml | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pyproject.toml diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 000000000..bf5a44ccb --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,43 @@ +[build-system] +requires = ["setuptools", "setuptools-scm"] +build-backend = "setuptools.build_meta" + +[project] +name = "google-cloud-storage" +version = "2.18.2" +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-auth >= 2.26.1, < 3.0dev", + "google-api-core >= 2.15.0, <3.0.0dev", + "google-cloud-core >= 2.3.0, < 3.0dev", + "google-resumable-media >= 2.7.2", + "requests >= 2.18.0, < 3.0.0dev", + "google-crc32c >= 1.0, < 2.0dev", +] + +[project.optional-dependencies] +protobuf = ["protobuf<6.0.0dev"] +tracing" = ["opentelemetry-api >= 1.1.0"] + From 6d20d2911bea0478c431d491b5f6f81902905d3f Mon Sep 17 00:00:00 2001 From: Rin Arakaki Date: Tue, 15 Oct 2024 12:56:24 +0900 Subject: [PATCH 02/11] Update setup.py --- setup.py | 54 ------------------------------------------------------ 1 file changed, 54 deletions(-) diff --git a/setup.py b/setup.py index bcb839106..2a9827a84 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import io import os import setuptools @@ -20,42 +19,13 @@ # Package metadata. -name = "google-cloud-storage" description = "Google Cloud Storage API client 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-auth >= 2.26.1, < 3.0dev", - "google-api-core >= 2.15.0, <3.0.0dev", - "google-cloud-core >= 2.3.0, < 3.0dev", - "google-resumable-media >= 2.7.2", - "requests >= 2.18.0, < 3.0.0dev", - "google-crc32c >= 1.0, < 2.0dev", -] -extras = { - "protobuf": ["protobuf<6.0.0dev"], - "tracing": [ - "opentelemetry-api >= 1.1.0", - ], -} # Setup boilerplate below this line. package_root = os.path.abspath(os.path.dirname(__file__)) -version = {} -with open(os.path.join(package_root, "google/cloud/storage/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 = [ @@ -66,34 +36,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-storage", - 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 21577466b337dcea5970258893abf7419b36d5c8 Mon Sep 17 00:00:00 2001 From: rinarakaki Date: Tue, 15 Oct 2024 03:57:52 +0000 Subject: [PATCH 03/11] fix --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index bf5a44ccb..ad487f098 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,5 +39,4 @@ dependencies = [ [project.optional-dependencies] protobuf = ["protobuf<6.0.0dev"] -tracing" = ["opentelemetry-api >= 1.1.0"] - +tracing = ["opentelemetry-api >= 1.1.0"] From 722f3e5b9938c8f015eee55195954395d7969378 Mon Sep 17 00:00:00 2001 From: rinarakaki Date: Tue, 15 Oct 2024 04:45:39 +0000 Subject: [PATCH 04/11] dynamic version --- pyproject.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index ad487f098..33f2c30d1 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-storage" -version = "2.18.2" authors = [{ name = "Google LLC", email = "googleapis-packages@google.com" }] license = { text = "Apache 2.0" } requires-python = ">=3.7" @@ -36,7 +35,11 @@ dependencies = [ "requests >= 2.18.0, < 3.0.0dev", "google-crc32c >= 1.0, < 2.0dev", ] +dynamic = ["version"] [project.optional-dependencies] protobuf = ["protobuf<6.0.0dev"] tracing = ["opentelemetry-api >= 1.1.0"] + +[tool.setuptools.dynamic] +version = { attr = "google.cloud.storage.version.__version__" } From 1f160d5deb8bae39a235c352a7a762bde142eb71 Mon Sep 17 00:00:00 2001 From: rinarakaki Date: Tue, 15 Oct 2024 04:46:21 +0000 Subject: [PATCH 05/11] move description --- pyproject.toml | 1 + setup.py | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 33f2c30d1..c82949627 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 Storage API client library" classifiers = [ # Should be one of: # "Development Status :: 3 - Alpha" diff --git a/setup.py b/setup.py index 2a9827a84..9fc16bf4c 100644 --- a/setup.py +++ b/setup.py @@ -17,11 +17,6 @@ import setuptools -# Package metadata. - -description = "Google Cloud Storage API client library" - - # Setup boilerplate below this line. package_root = os.path.abspath(os.path.dirname(__file__)) @@ -36,7 +31,6 @@ setuptools.setup( - description=description, url="https://github.com/googleapis/python-storage", platforms="Posix; MacOS X; Windows", packages=packages, From 05e4aaa1cff7a088de694fde8a8c9ddab1eba1e4 Mon Sep 17 00:00:00 2001 From: rinarakaki Date: Tue, 15 Oct 2024 07:51:57 +0000 Subject: [PATCH 06/11] move urls --- pyproject.toml | 3 +++ setup.py | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c82949627..30e530d22 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,6 +38,9 @@ dependencies = [ ] dynamic = ["version"] +[project.urls] +Repository = "https://github.com/googleapis/python-storage" + [project.optional-dependencies] protobuf = ["protobuf<6.0.0dev"] tracing = ["opentelemetry-api >= 1.1.0"] diff --git a/setup.py b/setup.py index 9fc16bf4c..a0f14e894 100644 --- a/setup.py +++ b/setup.py @@ -29,9 +29,7 @@ if package.startswith("google") ] - setuptools.setup( - url="https://github.com/googleapis/python-storage", platforms="Posix; MacOS X; Windows", packages=packages, include_package_data=True, From 4ed9ae2d9dde24cbb4f96d699e332ff377c322b1 Mon Sep 17 00:00:00 2001 From: rinarakaki Date: Tue, 15 Oct 2024 08:23:28 +0000 Subject: [PATCH 07/11] move packages --- pyproject.toml | 5 +++++ setup.py | 15 --------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 30e530d22..d676cf112 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,3 +47,8 @@ tracing = ["opentelemetry-api >= 1.1.0"] [tool.setuptools.dynamic] version = { attr = "google.cloud.storage.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 a0f14e894..141741c5c 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 f9c80c82b910230ea9bf9620b915f9d5d5d3ebc8 Mon Sep 17 00:00:00 2001 From: Rin Arakaki Date: Tue, 15 Oct 2024 18:42:39 +0900 Subject: [PATCH 08/11] zip_safe is deprecated --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 141741c5c..e8a3aa232 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 8a4166dfaa349b0392c391c997140e4f2bf61e49 Mon Sep 17 00:00:00 2001 From: Rin Arakaki Date: Tue, 15 Oct 2024 18:42:56 +0900 Subject: [PATCH 09/11] include-package-data = true by default --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index e8a3aa232..73932a211 100644 --- a/setup.py +++ b/setup.py @@ -17,5 +17,4 @@ setuptools.setup( platforms="Posix; MacOS X; Windows", - include_package_data=True, ) From 0a76cae03e139530508aeb38efe74e4d4d2c2506 Mon Sep 17 00:00:00 2001 From: Rin Arakaki Date: Tue, 15 Oct 2024 18:43:11 +0900 Subject: [PATCH 10/11] platforms are ignored --- setup.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 73932a211..168877fa5 100644 --- a/setup.py +++ b/setup.py @@ -15,6 +15,4 @@ import setuptools -setuptools.setup( - platforms="Posix; MacOS X; Windows", -) +setuptools.setup() From 2ad504d7d3e5a3b805418936e7cdd497a1f9e035 Mon Sep 17 00:00:00 2001 From: rinarakaki Date: Sun, 20 Oct 2024 04:48:00 +0000 Subject: [PATCH 11/11] Add copyright notice --- pyproject.toml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d676cf112..37882ec71 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" @@ -42,7 +56,7 @@ dynamic = ["version"] Repository = "https://github.com/googleapis/python-storage" [project.optional-dependencies] -protobuf = ["protobuf<6.0.0dev"] +protobuf = ["protobuf < 6.0.0dev"] tracing = ["opentelemetry-api >= 1.1.0"] [tool.setuptools.dynamic]