Merge branch 'master' into gzip-gcs

Author: thuibr

docs/backends/azure.rst

@@ -123,7 +123,7 @@ Settings
 
   Global connection timeout in seconds.
 
-``max_memory`` size ``AZURE_BLOB_MAX_MEMORY_SIZE``
+``max_memory_size`` or ``AZURE_BLOB_MAX_MEMORY_SIZE``
 
   Default: ``2*1024*1024`` i.e ``2MB``
 

docs/backends/gcloud.rst

@@ -213,7 +213,7 @@ Settings
   the credentials provided to django-storages (See :ref:`GS Credentials <gs-creds>`).
 
   Note: Default Google Compute Engine (GCE) Service accounts are
-  `unable to sign urls <https://googlecloudplatform.github.io/google-cloud-python/latest/storage/blobs.html#google.cloud.storage.blob.Blob.generate_signed_url>`_.
+  `unable to sign urls <https://cloud.google.com/python/docs/reference/storage/latest/google.cloud.storage.blob.Blob#google_cloud_storage_blob_Blob_generate_signed_url>`_.
 
   The ``expiration`` value is handled by the underlying `Google library  <https://googlecloudplatform.github.io/google-cloud-python/latest/storage/blobs.html#google.cloud.storage.blob.Blob.generate_signed_url>`_.
   It supports `timedelta`, `datetime`, or `integer` seconds since epoch time.

pyproject.toml

@@ -55,7 +55,7 @@ dropbox = [
   "dropbox>=7.2.1",
 ]
 google = [
-  "google-cloud-storage>=1.27",
+  "google-cloud-storage>=1.32",
 ]
 libcloud = [
   "apache-libcloud",

storages/backends/gcloud.py

@@ -63,7 +63,7 @@ def _get_file(self):
             if "r" in self._mode:
                 self._is_dirty = False
                 # This automatically decompresses the file
-                self.blob.download_to_file(self._file)
+                self.blob.download_to_file(self._file, checksum="crc32c")
                 self._file.seek(0)
         return self._file
 

tests/test_gcloud.py

@@ -43,7 +43,7 @@ def test_open_read(self):
                 self.filename, chunk_size=None
             )
 
-            f.blob.download_to_file = lambda tmpfile: tmpfile.write(data)
+            f.blob.download_to_file = lambda tmpfile, **kwargs: tmpfile.write(data)
             self.assertEqual(f.read(), data)
 
     def test_open_read_num_bytes(self):
@@ -56,7 +56,7 @@ def test_open_read_num_bytes(self):
                 self.filename, chunk_size=None
             )
 
-            f.blob.download_to_file = lambda tmpfile: tmpfile.write(data)
+            f.blob.download_to_file = lambda tmpfile, **kwargs: tmpfile.write(data)
             self.assertEqual(f.read(num_bytes), data[0:num_bytes])
 
     def test_open_read_nonexistent(self):
@@ -521,7 +521,7 @@ def test_storage_save_gzipped(self, *args):
         """
         Test saving a gzipped file
         """
-        name = "test_storage_save.js.gz"
+        name = "test_storage_save.css.gz"
         content = ContentFile("I am gzip'd", name=name)
 
         blob = Blob("x", None)
@@ -537,7 +537,7 @@ def test_storage_save_gzipped(self, *args):
                 retry=DEFAULT_RETRY,
                 size=11,
                 predefined_acl=None,
-                content_type="application/javascript",
+                content_type="text/css",
             )
         finally:
             patcher.stop()