Merge pull request fsspec#161 from jschneier/build-wheel

Build a universal wheel
TomAugspurger · Jul 17, 2019 · d410a16 · d410a16
2 parents 10bdd01 + d4b9d2e
commit d410a16
Show file tree

Hide file tree

Showing 4 changed files with 269 additions and 266 deletions.
diff --git a/gcsfs/core.py b/gcsfs/core.py
@@ -919,7 +919,7 @@ def __init__(self, gcsfs, path, mode='rb', block_size=DEFAULT_BLOCK_SIZE,
         if self.consistency == 'md5':
             self.md5 = md5()
         if mode == 'wb':
-            if block_size < GCS_MIN_BLOCK_SIZE:
+            if self.blocksize < GCS_MIN_BLOCK_SIZE:
                 warnings.warn('Setting block size to minimum value, 2**18')
                 self.blocksize = GCS_MIN_BLOCK_SIZE
             self.location = None

diff --git a/gcsfs/tests/recordings/test_file_access.yaml b/gcsfs/tests/recordings/test_file_access.yaml
@@ -17,7 +17,7 @@ interactions:
   response:
     body:
       string: !!binary |
-        H4sIALeDF10C/4WOQQoCMQxFr1KylnZAcDFLL1JKjZ1inZQkM62Id9fqAdw+3uf9J4QYUcQr3XCF
+        H4sIAIY0L10C/4WOQQoCMQxFr1KylnZAcDFLL1JKjZ1inZQkM62Id9fqAdw+3uf9J4QYUcQr3XCF
         2UDvHQ4GsNfMKD4PeDxN04dJpIrDWVSrzM611mwiSgVDzWIj3V3YdHEX3EWJQ0J73UrxkVZlKubv
         jvOOo/594/Xxy50xMDK83tzjrvutAAAA
     headers:
@@ -54,7 +54,7 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '25'
+      - '24'
       Content-Type:
       - application/json
     method: POST
@@ -101,7 +101,7 @@ interactions:
       Cache-Control:
       - private, max-age=0
       Content-Length:
-      - '227'
+      - '225'
       Content-Type:
       - application/json; charset=UTF-8
       Server:
@@ -135,7 +135,7 @@ interactions:
       Cache-Control:
       - private, max-age=0
       Content-Length:
-      - '227'
+      - '225'
       Content-Type:
       - application/json; charset=UTF-8
       Server:
@@ -169,7 +169,7 @@ interactions:
       Cache-Control:
       - private, max-age=0
       Content-Length:
-      - '227'
+      - '225'
       Content-Type:
       - application/json; charset=UTF-8
       Server:
@@ -203,7 +203,7 @@ interactions:
       Cache-Control:
       - private, max-age=0
       Content-Length:
-      - '227'
+      - '225'
       Content-Type:
       - application/json; charset=UTF-8
       Server:
@@ -238,9 +238,9 @@ interactions:
       Content-Length:
       - '0'
       Content-Type:
-      - text/html; charset=UTF-8
+      - text/plain; charset=utf-8
       Location:
-      - https://www.googleapis.com/upload/storage/v1/b/gcsfs-testing/o?uploadType=resumable&upload_id=AEnB2UoXvmfZm-CwnW7B8qPDhj4kwZJn4PyOi5zs1qEzFpRP0qiIWEh9ZWtepVE4atNzZ10UVfPn3rlHwA_KuwEZObd6eIiM5Q
+      - https://www.googleapis.com/upload/storage/v1/b/gcsfs-testing/o?uploadType=resumable&upload_id=AEnB2UrdVh_gOz0DbDCEUXyCagi8izgCXKpjbpkCxNAEdk4sznXel7OjNzFtZFcfiK2HGbHA5kYzbSrxXZN12T-8v04FJRWmqQ
       Pragma:
       - no-cache
       Server:
@@ -269,26 +269,26 @@ interactions:
       Content-Type:
       - application/octet-stream
     method: POST
-    uri: https://www.googleapis.com/upload/storage/v1/b/gcsfs-testing/o?uploadType=resumable&uploadType=resumable&upload_id=AEnB2UoXvmfZm-CwnW7B8qPDhj4kwZJn4PyOi5zs1qEzFpRP0qiIWEh9ZWtepVE4atNzZ10UVfPn3rlHwA_KuwEZObd6eIiM5Q
+    uri: https://www.googleapis.com/upload/storage/v1/b/gcsfs-testing/o?uploadType=resumable&uploadType=resumable&upload_id=AEnB2UrdVh_gOz0DbDCEUXyCagi8izgCXKpjbpkCxNAEdk4sznXel7OjNzFtZFcfiK2HGbHA5kYzbSrxXZN12T-8v04FJRWmqQ
   response:
     body:
-      string: "{\n \"kind\": \"storage#object\",\n \"id\": \"gcsfs-testing/nested/file1/1561822137129739\",\n
+      string: "{\n \"kind\": \"storage#object\",\n \"id\": \"gcsfs-testing/nested/file1/1563374728619070\",\n
         \"selfLink\": \"https://www.googleapis.com/storage/v1/b/gcsfs-testing/o/nested%2Ffile1\",\n
         \"name\": \"nested/file1\",\n \"bucket\": \"gcsfs-testing\",\n \"generation\":
-        \"1561822137129739\",\n \"metageneration\": \"1\",\n \"timeCreated\": \"2019-06-29T15:28:57.129Z\",\n
-        \"updated\": \"2019-06-29T15:28:57.129Z\",\n \"storageClass\": \"STANDARD\",\n
-        \"timeStorageClassUpdated\": \"2019-06-29T15:28:57.129Z\",\n \"size\": \"6\",\n
-        \"md5Hash\": \"sZRqySSS0jR8YjW00mERhA==\",\n \"mediaLink\": \"https://www.googleapis.com/download/storage/v1/b/gcsfs-testing/o/nested%2Ffile1?generation=1561822137129739&alt=media\",\n
-        \"crc32c\": \"NT3Yvg==\",\n \"etag\": \"CIu2vu2Aj+MCEAE=\"\n}\n"
+        \"1563374728619070\",\n \"metageneration\": \"1\",\n \"timeCreated\": \"2019-07-17T14:45:28.618Z\",\n
+        \"updated\": \"2019-07-17T14:45:28.618Z\",\n \"storageClass\": \"MULTI_REGIONAL\",\n
+        \"timeStorageClassUpdated\": \"2019-07-17T14:45:28.618Z\",\n \"size\": \"6\",\n
+        \"md5Hash\": \"sZRqySSS0jR8YjW00mERhA==\",\n \"mediaLink\": \"https://www.googleapis.com/download/storage/v1/b/gcsfs-testing/o/nested%2Ffile1?generation=1563374728619070&alt=media\",\n
+        \"crc32c\": \"NT3Yvg==\",\n \"etag\": \"CL7I5tqYvOMCEAE=\"\n}\n"
     headers:
       Cache-Control:
       - no-cache, no-store, max-age=0, must-revalidate
       Content-Length:
-      - '693'
+      - '695'
       Content-Type:
       - application/json; charset=UTF-8
       ETag:
-      - CIu2vu2Aj+MCEAE=
+      - CL7I5tqYvOMCEAE=
       Pragma:
       - no-cache
       Server:
@@ -325,7 +325,7 @@ interactions:
       Content-Type:
       - application/octet-stream
       ETag:
-      - CIu2vu2Aj+MCEAE=
+      - CL7I5tqYvOMCEAE=
       Pragma:
       - no-cache
       Server:
@@ -334,13 +334,13 @@ interactions:
       - Origin
       - X-Origin
       X-Goog-Generation:
-      - '1561822137129739'
+      - '1563374728619070'
       X-Goog-Hash:
       - crc32c=NT3Yvg==,md5=sZRqySSS0jR8YjW00mERhA==
       X-Goog-Metageneration:
       - '1'
       X-Goog-Storage-Class:
-      - STANDARD
+      - MULTI_REGIONAL
     status:
       code: 200
       message: OK
@@ -388,20 +388,20 @@ interactions:
   response:
     body:
       string: "{\n \"kind\": \"storage#objects\",\n \"items\": [\n  {\n   \"kind\":
-        \"storage#object\",\n   \"id\": \"gcsfs-testing/nested/file1/1561822137129739\",\n
+        \"storage#object\",\n   \"id\": \"gcsfs-testing/nested/file1/1563374728619070\",\n
         \  \"selfLink\": \"https://www.googleapis.com/storage/v1/b/gcsfs-testing/o/nested%2Ffile1\",\n
         \  \"name\": \"nested/file1\",\n   \"bucket\": \"gcsfs-testing\",\n   \"generation\":
-        \"1561822137129739\",\n   \"metageneration\": \"1\",\n   \"timeCreated\":
-        \"2019-06-29T15:28:57.129Z\",\n   \"updated\": \"2019-06-29T15:28:57.129Z\",\n
-        \  \"storageClass\": \"STANDARD\",\n   \"timeStorageClassUpdated\": \"2019-06-29T15:28:57.129Z\",\n
-        \  \"size\": \"6\",\n   \"md5Hash\": \"sZRqySSS0jR8YjW00mERhA==\",\n   \"mediaLink\":
-        \"https://www.googleapis.com/download/storage/v1/b/gcsfs-testing/o/nested%2Ffile1?generation=1561822137129739&alt=media\",\n
-        \  \"crc32c\": \"NT3Yvg==\",\n   \"etag\": \"CIu2vu2Aj+MCEAE=\"\n  }\n ]\n}\n"
+        \"1563374728619070\",\n   \"metageneration\": \"1\",\n   \"timeCreated\":
+        \"2019-07-17T14:45:28.618Z\",\n   \"updated\": \"2019-07-17T14:45:28.618Z\",\n
+        \  \"storageClass\": \"MULTI_REGIONAL\",\n   \"timeStorageClassUpdated\":
+        \"2019-07-17T14:45:28.618Z\",\n   \"size\": \"6\",\n   \"md5Hash\": \"sZRqySSS0jR8YjW00mERhA==\",\n
+        \  \"mediaLink\": \"https://www.googleapis.com/download/storage/v1/b/gcsfs-testing/o/nested%2Ffile1?generation=1563374728619070&alt=media\",\n
+        \  \"crc32c\": \"NT3Yvg==\",\n   \"etag\": \"CL7I5tqYvOMCEAE=\"\n  }\n ]\n}\n"
     headers:
       Cache-Control:
       - private, max-age=0, must-revalidate, no-transform
       Content-Length:
-      - '776'
+      - '778'
       Content-Type:
       - application/json; charset=UTF-8
       Server:
@@ -424,7 +424,7 @@ interactions:
       Range:
       - bytes=0-5242882
     method: GET
-    uri: https://www.googleapis.com/download/storage/v1/b/gcsfs-testing/o/nested%2Ffile1?alt=media&generation=1561822137129739
+    uri: https://www.googleapis.com/download/storage/v1/b/gcsfs-testing/o/nested%2Ffile1?alt=media&generation=1563374728619070
   response:
     body:
       string: 'hello
@@ -442,7 +442,7 @@ interactions:
       Content-Type:
       - application/octet-stream
       ETag:
-      - CIu2vu2Aj+MCEAE=
+      - CL7I5tqYvOMCEAE=
       Pragma:
       - no-cache
       Server:
@@ -451,11 +451,11 @@ interactions:
       - Origin
       - X-Origin
       X-Goog-Generation:
-      - '1561822137129739'
+      - '1563374728619070'
       X-Goog-Metageneration:
       - '1'
       X-Goog-Storage-Class:
-      - STANDARD
+      - MULTI_REGIONAL
     status:
       code: 206
       message: Partial Content
@@ -469,9 +469,9 @@ interactions:
       Connection:
       - keep-alive
       Range:
-      - bytes=3-5242888
+      - bytes=3-5242885
     method: GET
-    uri: https://www.googleapis.com/download/storage/v1/b/gcsfs-testing/o/nested%2Ffile1?alt=media&generation=1561822137129739
+    uri: https://www.googleapis.com/download/storage/v1/b/gcsfs-testing/o/nested%2Ffile1?alt=media&generation=1563374728619070
   response:
     body:
       string: 'lo
@@ -489,7 +489,7 @@ interactions:
       Content-Type:
       - application/octet-stream
       ETag:
-      - CIu2vu2Aj+MCEAE=
+      - CL7I5tqYvOMCEAE=
       Pragma:
       - no-cache
       Server:
@@ -498,11 +498,11 @@ interactions:
       - Origin
       - X-Origin
       X-Goog-Generation:
-      - '1561822137129739'
+      - '1563374728619070'
       X-Goog-Metageneration:
       - '1'
       X-Goog-Storage-Class:
-      - STANDARD
+      - MULTI_REGIONAL
     status:
       code: 206
       message: Partial Content
@@ -518,7 +518,7 @@ interactions:
       Range:
       - bytes=0-5242885
     method: GET
-    uri: https://www.googleapis.com/download/storage/v1/b/gcsfs-testing/o/nested%2Ffile1?alt=media&generation=1561822137129739
+    uri: https://www.googleapis.com/download/storage/v1/b/gcsfs-testing/o/nested%2Ffile1?alt=media&generation=1563374728619070
   response:
     body:
       string: 'hello
@@ -536,7 +536,7 @@ interactions:
       Content-Type:
       - application/octet-stream
       ETag:
-      - CIu2vu2Aj+MCEAE=
+      - CL7I5tqYvOMCEAE=
       Pragma:
       - no-cache
       Server:
@@ -545,11 +545,11 @@ interactions:
       - Origin
       - X-Origin
       X-Goog-Generation:
-      - '1561822137129739'
+      - '1563374728619070'
       X-Goog-Metageneration:
       - '1'
       X-Goog-Storage-Class:
-      - STANDARD
+      - MULTI_REGIONAL
     status:
       code: 206
       message: Partial Content