Merge pull request #75 from octue/blob-utils

Move blob utils to correct place

Author: thclark

django_gcp/storage/__init__.py

@@ -1,6 +1,18 @@
 # TODO: Refactor tests to import members directly then remove this module export
 from . import gcloud
+from .blob_utils import BlobFieldMixin, get_blob, get_blob_name, get_path, get_signed_url, upload_blob
 from .gcloud import GoogleCloudFile, GoogleCloudMediaStorage, GoogleCloudStaticStorage, GoogleCloudStorage
 
-
-__all__ = ["GoogleCloudStorage", "GoogleCloudFile", "gcloud", "GoogleCloudMediaStorage", "GoogleCloudStaticStorage"]
+__all__ = [
+    "GoogleCloudStorage",
+    "GoogleCloudFile",
+    "gcloud",
+    "GoogleCloudMediaStorage",
+    "GoogleCloudStaticStorage",
+    "BlobFieldMixin",
+    "get_blob",
+    "get_blob_name",
+    "get_path",
+    "get_signed_url",
+    "upload_blob",
+]

django_gcp/tasks/utils.py django_gcp/storage/blob_utils.py

@@ -114,7 +114,7 @@ def get_signed_url(instance, field_name, expiration=None):
     return get_blob(instance, field_name).generate_signed_url(expiration=expiration)
 
 
-class BlobFieldModel:
+class BlobFieldMixin:
     """Mixin to a model to provide extra utility methods for processing of blobs"""
 
     def get_blob(self, field_name):

django_gcp/tasks/__init__.py

@@ -1,16 +1,9 @@
 from .manager import TaskManager
 from .tasks import OnDemandTask, PeriodicTask, SubscriberTask
-from .utils import BlobFieldMixin, get_blob, get_blob_name, get_path, get_signed_url, upload_blob
 
 __all__ = (
     "PeriodicTask",
     "SubscriberTask",
     "OnDemandTask",
     "TaskManager",
-    "BlobFieldMixin",
-    "get_blob",
-    "get_blob_name",
-    "get_path",
-    "get_signed_url",
-    "upload_blob",
 )

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-gcp"
-version = "0.14.0"
+version = "0.15.0"
 description = "Utilities to run Django on Google Cloud Platform"
 authors = ["Tom Clark"]
 license = "MIT"