Skip to content

Commit 73a38a2

Browse files
crwilcoxcojenco
crwilcox
authored and
cojenco
committed
fix: add classifer for Python 3.8 (googleapis#63)
* fix: add classifer for Python 3.8 * fix: update black version
1 parent 6caf854 commit 73a38a2

5 files changed

Lines changed: 26 additions & 25 deletions

File tree

‎noxfile.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
import nox
2424

2525

26-
BLACK_VERSION = "black==19.3b0"
26+
BLACK_VERSION = "black==19.10b0"
2727
BLACK_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]
2828

2929
if os.path.exists("samples"):
3030
BLACK_PATHS.append("samples")
3131

3232

33-
@nox.session(python="3.7")
33+
@nox.session(python="3.8")
3434
def lint(session):
3535
"""Run linters.
3636
@@ -56,7 +56,7 @@ def blacken(session):
5656
session.run("black", *BLACK_PATHS)
5757

5858

59-
@nox.session(python="3.7")
59+
@nox.session(python="3.8")
6060
def lint_setup_py(session):
6161
"""Verify that setup.py is valid (including RST check)."""
6262
session.install("docutils", "pygments")
@@ -89,7 +89,7 @@ def unit(session):
8989
default(session)
9090

9191

92-
@nox.session(python=["2.7", "3.7"])
92+
@nox.session(python=["2.7", "3.8"])
9393
def system(session):
9494
"""Run the system test suite."""
9595
system_test_path = os.path.join("tests", "system.py")
@@ -124,7 +124,7 @@ def system(session):
124124
session.run("py.test", "--quiet", system_test_folder_path, *session.posargs)
125125

126126

127-
@nox.session(python="3.7")
127+
@nox.session(python="3.8")
128128
def cover(session):
129129
"""Run the final coverage report.
130130
@@ -137,7 +137,7 @@ def cover(session):
137137
session.run("coverage", "erase")
138138

139139

140-
@nox.session(python="3.7")
140+
@nox.session(python="3.8")
141141
def docs(session):
142142
"""Build the docs for this library."""
143143

‎setup.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
"Programming Language :: Python :: 3.5",
7777
"Programming Language :: Python :: 3.6",
7878
"Programming Language :: Python :: 3.7",
79+
"Programming Language :: Python :: 3.8",
7980
"Operating System :: OS Independent",
8081
"Topic :: Internet",
8182
],

‎tests/system/test_system.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1495,7 +1495,7 @@ class TestAnonymousClient(unittest.TestCase):
14951495
def test_access_to_public_bucket(self):
14961496
anonymous = storage.Client.create_anonymous_client()
14971497
bucket = anonymous.bucket(self.PUBLIC_BUCKET)
1498-
blob, = retry_429_503(bucket.list_blobs)(max_results=1)
1498+
(blob,) = retry_429_503(bucket.list_blobs)(max_results=1)
14991499
with tempfile.TemporaryFile() as stream:
15001500
retry_429_503(blob.download_to_file)(stream)
15011501

@@ -1582,7 +1582,7 @@ def test_blob_w_explicit_kms_key_name(self):
15821582
# We don't know the current version of the key.
15831583
self.assertTrue(blob.kms_key_name.startswith(kms_key_name))
15841584

1585-
listed, = list(self.bucket.list_blobs())
1585+
(listed,) = list(self.bucket.list_blobs())
15861586
self.assertTrue(listed.kms_key_name.startswith(kms_key_name))
15871587

15881588
def test_bucket_w_default_kms_key_name(self):

‎tests/unit/test_blob.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2451,7 +2451,7 @@ def test_rewrite_w_generations(self):
24512451
self.assertEqual(rewritten, 33)
24522452
self.assertEqual(size, 42)
24532453

2454-
kw, = connection._requested
2454+
(kw,) = connection._requested
24552455
self.assertEqual(kw["method"], "POST")
24562456
self.assertEqual(
24572457
kw["path"],

‎tests/unit/test_bucket.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ def test_get_blob_miss(self):
648648
bucket = self._make_one(name=NAME)
649649
result = bucket.get_blob(NONESUCH, client=client, timeout=42)
650650
self.assertIsNone(result)
651-
kw, = connection._requested
651+
(kw,) = connection._requested
652652
self.assertEqual(kw["method"], "GET")
653653
self.assertEqual(kw["path"], "/b/%s/o/%s" % (NAME, NONESUCH))
654654
self.assertEqual(kw["timeout"], 42)
@@ -663,7 +663,7 @@ def test_get_blob_hit_w_user_project(self):
663663
blob = bucket.get_blob(BLOB_NAME, client=client)
664664
self.assertIs(blob.bucket, bucket)
665665
self.assertEqual(blob.name, BLOB_NAME)
666-
kw, = connection._requested
666+
(kw,) = connection._requested
667667
expected_qp = {"userProject": USER_PROJECT, "projection": "noAcl"}
668668
self.assertEqual(kw["method"], "GET")
669669
self.assertEqual(kw["path"], "/b/%s/o/%s" % (NAME, BLOB_NAME))
@@ -681,7 +681,7 @@ def test_get_blob_hit_w_generation(self):
681681
self.assertIs(blob.bucket, bucket)
682682
self.assertEqual(blob.name, BLOB_NAME)
683683
self.assertEqual(blob.generation, GENERATION)
684-
kw, = connection._requested
684+
(kw,) = connection._requested
685685
expected_qp = {"generation": GENERATION, "projection": "noAcl"}
686686
self.assertEqual(kw["method"], "GET")
687687
self.assertEqual(kw["path"], "/b/%s/o/%s" % (NAME, BLOB_NAME))
@@ -704,7 +704,7 @@ def test_get_blob_hit_with_kwargs(self):
704704
)
705705
self.assertIs(blob.bucket, bucket)
706706
self.assertEqual(blob.name, BLOB_NAME)
707-
kw, = connection._requested
707+
(kw,) = connection._requested
708708
self.assertEqual(kw["method"], "GET")
709709
self.assertEqual(kw["path"], "/b/%s/o/%s" % (NAME, BLOB_NAME))
710710
self.assertEqual(kw["headers"], _get_encryption_headers(KEY))
@@ -720,7 +720,7 @@ def test_list_blobs_defaults(self):
720720
iterator = bucket.list_blobs()
721721
blobs = list(iterator)
722722
self.assertEqual(blobs, [])
723-
kw, = connection._requested
723+
(kw,) = connection._requested
724724
self.assertEqual(kw["method"], "GET")
725725
self.assertEqual(kw["path"], "/b/%s/o" % NAME)
726726
self.assertEqual(kw["query_params"], {"projection": "noAcl"})
@@ -762,7 +762,7 @@ def test_list_blobs_w_all_arguments_and_user_project(self):
762762
)
763763
blobs = list(iterator)
764764
self.assertEqual(blobs, [])
765-
kw, = connection._requested
765+
(kw,) = connection._requested
766766
self.assertEqual(kw["method"], "GET")
767767
self.assertEqual(kw["path"], "/b/%s/o" % NAME)
768768
self.assertEqual(kw["query_params"], EXPECTED)
@@ -935,7 +935,7 @@ def test_delete_blob_miss(self):
935935
client = _Client(connection)
936936
bucket = self._make_one(client=client, name=NAME)
937937
self.assertRaises(NotFound, bucket.delete_blob, NONESUCH)
938-
kw, = connection._requested
938+
(kw,) = connection._requested
939939
self.assertEqual(kw["method"], "DELETE")
940940
self.assertEqual(kw["path"], "/b/%s/o/%s" % (NAME, NONESUCH))
941941
self.assertEqual(kw["query_params"], {})
@@ -950,7 +950,7 @@ def test_delete_blob_hit_with_user_project(self):
950950
bucket = self._make_one(client=client, name=NAME, user_project=USER_PROJECT)
951951
result = bucket.delete_blob(BLOB_NAME, timeout=42)
952952
self.assertIsNone(result)
953-
kw, = connection._requested
953+
(kw,) = connection._requested
954954
self.assertEqual(kw["method"], "DELETE")
955955
self.assertEqual(kw["path"], "/b/%s/o/%s" % (NAME, BLOB_NAME))
956956
self.assertEqual(kw["query_params"], {"userProject": USER_PROJECT})
@@ -965,7 +965,7 @@ def test_delete_blob_hit_with_generation(self):
965965
bucket = self._make_one(client=client, name=NAME)
966966
result = bucket.delete_blob(BLOB_NAME, generation=GENERATION)
967967
self.assertIsNone(result)
968-
kw, = connection._requested
968+
(kw,) = connection._requested
969969
self.assertEqual(kw["method"], "DELETE")
970970
self.assertEqual(kw["path"], "/b/%s/o/%s" % (NAME, BLOB_NAME))
971971
self.assertEqual(kw["query_params"], {"generation": GENERATION})
@@ -1056,7 +1056,7 @@ def test_copy_blobs_wo_name(self):
10561056
self.assertIs(new_blob.bucket, dest)
10571057
self.assertEqual(new_blob.name, BLOB_NAME)
10581058

1059-
kw, = connection._requested
1059+
(kw,) = connection._requested
10601060
COPY_PATH = "/b/{}/o/{}/copyTo/b/{}/o/{}".format(
10611061
SOURCE, BLOB_NAME, DEST, BLOB_NAME
10621062
)
@@ -1082,7 +1082,7 @@ def test_copy_blobs_source_generation(self):
10821082
self.assertIs(new_blob.bucket, dest)
10831083
self.assertEqual(new_blob.name, BLOB_NAME)
10841084

1085-
kw, = connection._requested
1085+
(kw,) = connection._requested
10861086
COPY_PATH = "/b/{}/o/{}/copyTo/b/{}/o/{}".format(
10871087
SOURCE, BLOB_NAME, DEST, BLOB_NAME
10881088
)
@@ -1149,7 +1149,7 @@ def test_copy_blobs_w_name_and_user_project(self):
11491149
COPY_PATH = "/b/{}/o/{}/copyTo/b/{}/o/{}".format(
11501150
SOURCE, BLOB_NAME, DEST, NEW_NAME
11511151
)
1152-
kw, = connection._requested
1152+
(kw,) = connection._requested
11531153
self.assertEqual(kw["method"], "POST")
11541154
self.assertEqual(kw["path"], COPY_PATH)
11551155
self.assertEqual(kw["query_params"], {"userProject": USER_PROJECT})
@@ -1175,7 +1175,7 @@ def test_rename_blob(self):
11751175
COPY_PATH = "/b/{}/o/{}/copyTo/b/{}/o/{}".format(
11761176
BUCKET_NAME, BLOB_NAME, BUCKET_NAME, NEW_BLOB_NAME
11771177
)
1178-
kw, = connection._requested
1178+
(kw,) = connection._requested
11791179
self.assertEqual(kw["method"], "POST")
11801180
self.assertEqual(kw["path"], COPY_PATH)
11811181
self.assertEqual(kw["query_params"], {})
@@ -1200,7 +1200,7 @@ def test_rename_blob_to_itself(self):
12001200
COPY_PATH = "/b/{}/o/{}/copyTo/b/{}/o/{}".format(
12011201
BUCKET_NAME, BLOB_NAME, BUCKET_NAME, BLOB_NAME
12021202
)
1203-
kw, = connection._requested
1203+
(kw,) = connection._requested
12041204
self.assertEqual(kw["method"], "POST")
12051205
self.assertEqual(kw["path"], COPY_PATH)
12061206
self.assertEqual(kw["query_params"], {})
@@ -2676,7 +2676,7 @@ def test_lock_retention_policy_ok(self):
26762676

26772677
bucket.lock_retention_policy(timeout=42)
26782678

2679-
kw, = connection._requested
2679+
(kw,) = connection._requested
26802680
self.assertEqual(kw["method"], "POST")
26812681
self.assertEqual(kw["path"], "/b/{}/lockRetentionPolicy".format(name))
26822682
self.assertEqual(kw["query_params"], {"ifMetagenerationMatch": 1234})
@@ -2707,7 +2707,7 @@ def test_lock_retention_policy_w_user_project(self):
27072707

27082708
bucket.lock_retention_policy()
27092709

2710-
kw, = connection._requested
2710+
(kw,) = connection._requested
27112711
self.assertEqual(kw["method"], "POST")
27122712
self.assertEqual(kw["path"], "/b/{}/lockRetentionPolicy".format(name))
27132713
self.assertEqual(

0 commit comments

Comments
 (0)