Skip to content

Commit 01d10b8

Browse files
committed
chore: remove code formatting for setup.py
1 parent 12878e4 commit 01d10b8

File tree

16 files changed

+61
-96
lines changed

16 files changed

+61
-96
lines changed

gapic/templates/noxfile.py.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ BLACK_VERSION = "black[jupyter]==23.7.0"
1616
ISORT_VERSION = "isort==5.11.0"
1717

1818
{% if api.naming.module_namespace %}
19-
FORMAT_PATHS = ["docs", "{{ api.naming.module_namespace[0] }}", "tests", "setup.py"]
19+
FORMAT_PATHS = ["docs", "{{ api.naming.module_namespace[0] }}", "tests"]
2020
LINT_PATHS = ["docs", "{{ api.naming.module_namespace[0] }}", "tests", "noxfile.py", "setup.py"]
2121
{% else %}
22-
FORMAT_PATHS = ["docs", "{{ api.naming.versioned_module_name }}", "tests", "setup.py"]
22+
FORMAT_PATHS = ["docs", "{{ api.naming.versioned_module_name }}", "tests"]
2323
LINT_PATHS = ["docs", "{{ api.naming.versioned_module_name }}", "tests", "noxfile.py", "setup.py"]
2424
{% endif %}
2525

gapic/templates/setup.py.j2

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import io
99
import os
1010
import re
1111

12-
import setuptools # type: ignore
12+
import setuptools # type: ignore
1313

1414
package_root = os.path.abspath(os.path.dirname(__file__))
1515

16-
name = '{{ api.naming.warehouse_package_name }}'
16+
name = "{{ api.naming.warehouse_package_name }}"
1717

1818
{% set warehouse_description = api.naming.warehouse_package_name.replace('-',' ')|title %}
1919

@@ -22,9 +22,9 @@ description = "{{ warehouse_description }} API client library"
2222

2323
version = None
2424

25-
with open(os.path.join(package_root, '{{ package_path }}/gapic_version.py')) as fp:
25+
with open(os.path.join(package_root, "{{ package_path }}/gapic_version.py")) as fp:
2626
version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read())
27-
assert (len(version_candidates) == 1)
27+
assert len(version_candidates) == 1
2828
version = version_candidates[0]
2929

3030
if version[0] == "0":
@@ -52,14 +52,16 @@ dependencies = [
5252
{% endif %}
5353
{% endfor %}
5454
]
55-
extras = {
5655
{% if rest_async_io_enabled %}
56+
extras = {
5757
"async_rest": [
5858
"google-api-core[grpc] >= 2.21.0, < 3.0.0",
59-
"google-auth[aiohttp] >= 2.35.0, <3.0.0"
59+
"google-auth[aiohttp] >= 2.35.0, <3.0.0",
6060
],
61-
{% endif %}
6261
}
62+
{% else %}
63+
extras = {}
64+
{% endif %}
6365
url = "https://github.com/googleapis/google-cloud-python/tree/main/packages/{{ api.naming.warehouse_package_name }}"
6466
6567
package_root = os.path.abspath(os.path.dirname(__file__))
@@ -68,11 +70,7 @@ readme_filename = os.path.join(package_root, "README.rst")
6870
with io.open(readme_filename, encoding="utf-8") as readme_file:
6971
readme = readme_file.read()
7072
71-
packages = [
72-
package
73-
for package in setuptools.find_namespace_packages()
74-
if package.startswith("{{ api.naming.namespace_packages|first }}")
75-
]
73+
packages = [package for package in setuptools.find_namespace_packages() if package.startswith("{{ api.naming.namespace_packages|first }}")]
7674
7775
setuptools.setup(
7876
name=name,

tests/integration/goldens/asset/noxfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
BLACK_VERSION = "black[jupyter]==23.7.0"
2727
ISORT_VERSION = "isort==5.11.0"
2828

29-
FORMAT_PATHS = ["docs", "google", "tests", "setup.py"]
29+
FORMAT_PATHS = ["docs", "google", "tests"]
3030
LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]
3131

3232
# We're most interested in ensuring that code is formatted properly

tests/integration/goldens/asset/setup.py

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717
import os
1818
import re
1919

20-
import setuptools # type: ignore
20+
import setuptools # type: ignore
2121

2222
package_root = os.path.abspath(os.path.dirname(__file__))
2323

24-
name = 'google-cloud-asset'
24+
name = "google-cloud-asset"
2525

2626

2727
description = "Google Cloud Asset API client library"
2828

2929
version = None
3030

31-
with open(os.path.join(package_root, 'google/cloud/asset/gapic_version.py')) as fp:
31+
with open(os.path.join(package_root, "google/cloud/asset/gapic_version.py")) as fp:
3232
version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read())
33-
assert (len(version_candidates) == 1)
33+
assert len(version_candidates) == 1
3434
version = version_candidates[0]
3535

3636
if version[0] == "0":
@@ -52,8 +52,7 @@
5252
"google-cloud-os-config >= 1.0.0, <2.0.0",
5353
"grpc-google-iam-v1 >= 0.14.0, <1.0.0",
5454
]
55-
extras = {
56-
}
55+
extras = {}
5756
url = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-asset"
5857

5958
package_root = os.path.abspath(os.path.dirname(__file__))
@@ -62,11 +61,7 @@
6261
with io.open(readme_filename, encoding="utf-8") as readme_file:
6362
readme = readme_file.read()
6463

65-
packages = [
66-
package
67-
for package in setuptools.find_namespace_packages()
68-
if package.startswith("google")
69-
]
64+
packages = [package for package in setuptools.find_namespace_packages() if package.startswith("google")]
7065

7166
setuptools.setup(
7267
name=name,

tests/integration/goldens/credentials/noxfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
BLACK_VERSION = "black[jupyter]==23.7.0"
2727
ISORT_VERSION = "isort==5.11.0"
2828

29-
FORMAT_PATHS = ["docs", "google", "tests", "setup.py"]
29+
FORMAT_PATHS = ["docs", "google", "tests"]
3030
LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]
3131

3232
# We're most interested in ensuring that code is formatted properly

tests/integration/goldens/credentials/setup.py

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717
import os
1818
import re
1919

20-
import setuptools # type: ignore
20+
import setuptools # type: ignore
2121

2222
package_root = os.path.abspath(os.path.dirname(__file__))
2323

24-
name = 'google-iam-credentials'
24+
name = "google-iam-credentials"
2525

2626

2727
description = "Google Iam Credentials API client library"
2828

2929
version = None
3030

31-
with open(os.path.join(package_root, 'google/iam/credentials/gapic_version.py')) as fp:
31+
with open(os.path.join(package_root, "google/iam/credentials/gapic_version.py")) as fp:
3232
version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read())
33-
assert (len(version_candidates) == 1)
33+
assert len(version_candidates) == 1
3434
version = version_candidates[0]
3535

3636
if version[0] == "0":
@@ -49,8 +49,7 @@
4949
"proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
5050
"protobuf>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
5151
]
52-
extras = {
53-
}
52+
extras = {}
5453
url = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-iam-credentials"
5554

5655
package_root = os.path.abspath(os.path.dirname(__file__))
@@ -59,11 +58,7 @@
5958
with io.open(readme_filename, encoding="utf-8") as readme_file:
6059
readme = readme_file.read()
6160

62-
packages = [
63-
package
64-
for package in setuptools.find_namespace_packages()
65-
if package.startswith("google")
66-
]
61+
packages = [package for package in setuptools.find_namespace_packages() if package.startswith("google")]
6762

6863
setuptools.setup(
6964
name=name,

tests/integration/goldens/eventarc/noxfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
BLACK_VERSION = "black[jupyter]==23.7.0"
2727
ISORT_VERSION = "isort==5.11.0"
2828

29-
FORMAT_PATHS = ["docs", "google", "tests", "setup.py"]
29+
FORMAT_PATHS = ["docs", "google", "tests"]
3030
LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]
3131

3232
# We're most interested in ensuring that code is formatted properly

tests/integration/goldens/eventarc/setup.py

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717
import os
1818
import re
1919

20-
import setuptools # type: ignore
20+
import setuptools # type: ignore
2121

2222
package_root = os.path.abspath(os.path.dirname(__file__))
2323

24-
name = 'google-cloud-eventarc'
24+
name = "google-cloud-eventarc"
2525

2626

2727
description = "Google Cloud Eventarc API client library"
2828

2929
version = None
3030

31-
with open(os.path.join(package_root, 'google/cloud/eventarc_v1/gapic_version.py')) as fp:
31+
with open(os.path.join(package_root, "google/cloud/eventarc_v1/gapic_version.py")) as fp:
3232
version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read())
33-
assert (len(version_candidates) == 1)
33+
assert len(version_candidates) == 1
3434
version = version_candidates[0]
3535

3636
if version[0] == "0":
@@ -50,8 +50,7 @@
5050
"protobuf>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
5151
"grpc-google-iam-v1 >= 0.14.0, <1.0.0",
5252
]
53-
extras = {
54-
}
53+
extras = {}
5554
url = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-eventarc"
5655

5756
package_root = os.path.abspath(os.path.dirname(__file__))
@@ -60,11 +59,7 @@
6059
with io.open(readme_filename, encoding="utf-8") as readme_file:
6160
readme = readme_file.read()
6261

63-
packages = [
64-
package
65-
for package in setuptools.find_namespace_packages()
66-
if package.startswith("google")
67-
]
62+
packages = [package for package in setuptools.find_namespace_packages() if package.startswith("google")]
6863

6964
setuptools.setup(
7065
name=name,

tests/integration/goldens/logging/noxfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
BLACK_VERSION = "black[jupyter]==23.7.0"
2727
ISORT_VERSION = "isort==5.11.0"
2828

29-
FORMAT_PATHS = ["docs", "google", "tests", "setup.py"]
29+
FORMAT_PATHS = ["docs", "google", "tests"]
3030
LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]
3131

3232
# We're most interested in ensuring that code is formatted properly

tests/integration/goldens/logging/setup.py

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717
import os
1818
import re
1919

20-
import setuptools # type: ignore
20+
import setuptools # type: ignore
2121

2222
package_root = os.path.abspath(os.path.dirname(__file__))
2323

24-
name = 'google-cloud-logging'
24+
name = "google-cloud-logging"
2525

2626

2727
description = "Google Cloud Logging API client library"
2828

2929
version = None
3030

31-
with open(os.path.join(package_root, 'google/cloud/logging/gapic_version.py')) as fp:
31+
with open(os.path.join(package_root, "google/cloud/logging/gapic_version.py")) as fp:
3232
version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read())
33-
assert (len(version_candidates) == 1)
33+
assert len(version_candidates) == 1
3434
version = version_candidates[0]
3535

3636
if version[0] == "0":
@@ -49,8 +49,7 @@
4949
"proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
5050
"protobuf>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
5151
]
52-
extras = {
53-
}
52+
extras = {}
5453
url = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-logging"
5554

5655
package_root = os.path.abspath(os.path.dirname(__file__))
@@ -59,11 +58,7 @@
5958
with io.open(readme_filename, encoding="utf-8") as readme_file:
6059
readme = readme_file.read()
6160

62-
packages = [
63-
package
64-
for package in setuptools.find_namespace_packages()
65-
if package.startswith("google")
66-
]
61+
packages = [package for package in setuptools.find_namespace_packages() if package.startswith("google")]
6762

6863
setuptools.setup(
6964
name=name,

0 commit comments

Comments
 (0)