Merge pull request #7 from Bladrak/tc_aws

Renamed to tc_aws
thumbor-community · Jul 2, 2015 · 56fa0bf · 56fa0bf
2 parents 3726318 + df1517d
commit 56fa0bf
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,4 @@
+# CHANGELOG
+
+## 2015-07-02
+- [BC BREAK] Renamed package to tc_aws
diff --git a/Readme.md b/Readme.md
@@ -11,9 +11,9 @@ This is a fork of https://github.com/willtrking/thumbor_aws ; as this repository
 Features
 --------
 
- * thumbor_aws.loaders.s3_loader
- * thumbor_aws.result_storages.s3_storage
- * thumbor_aws.storages.s3_storage
+ * tc_aws.loaders.s3_loader
+ * tc_aws.result_storages.s3_storage
+ * tc_aws.storages.s3_storage
 
 Additional Configuration values used:
 
@@ -49,6 +49,6 @@ Additional Configuration values used:
 
     #Optional config value to enable the HTTP loader
     #This would allow you to load watermarks in over your images dynamically through a URI
-    #E.g. 
+    #E.g.
     #http://your-thumbor.com/unsafe/filters:watermark(http://example.com/watermark.png,0,0,50)/s3_bucket/photo.jpg
     AWS_ENABLE_HTTP_LOADER = True or False (Default: False)
diff --git a/circle.yml b/circle.yml
@@ -5,7 +5,7 @@ dependencies:
 
 test:
   override:
-    - pyvows -c -l thumbor_aws
+    - pyvows -c -l tc_aws
   post:
     - fpm -s python -t deb --iteration 1 --no-python-dependencies -d python-dateutil -d thumbor -d python-boto --python-install-lib /usr/lib/python2.7/dist-packages -x "*.pyc" ./setup.py
     - mv ./*.deb $CIRCLE_ARTIFACTS
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(
-	name = 'thumbor_aws',
+	name = 'tc_aws',
 	version = "1",
 	description = 'Thumbor AWS extensions',
 	author = 'William King',

diff --git a/thumbor_aws/__init__.py → tc_aws/__init__.py b/thumbor_aws/__init__.py → tc_aws/__init__.py
diff --git a/thumbor_aws/connection.py → tc_aws/connection.py b/thumbor_aws/connection.py → tc_aws/connection.py
diff --git a/thumbor_aws/loaders/__init__.py → tc_aws/loaders/__init__.py b/thumbor_aws/loaders/__init__.py → tc_aws/loaders/__init__.py
diff --git a/thumbor_aws/loaders/s3_loader.py → tc_aws/loaders/s3_loader.py b/thumbor_aws/loaders/s3_loader.py → tc_aws/loaders/s3_loader.py
@@ -5,7 +5,7 @@
 from tornado.concurrent import return_future
 import urllib2
 
-import thumbor_aws.connection
+import tc_aws.connection
 import thumbor.loaders.http_loader as http_loader
 
 
@@ -50,7 +50,7 @@ def load(context, url, callback):
 
     if _validate_bucket(context, bucket):
         bucket_loader = Bucket(
-            connection=thumbor_aws.connection.get_connection(context),
+            connection=tc_aws.connection.get_connection(context),
             name=bucket
         )
         file_key = None

diff --git a/thumbor_aws/result_storages/__init__.py → tc_aws/result_storages/__init__.py b/thumbor_aws/result_storages/__init__.py → tc_aws/result_storages/__init__.py
diff --git a/thumbor_aws/result_storages/s3_storage.py → tc_aws/result_storages/s3_storage.py b/thumbor_aws/result_storages/s3_storage.py → tc_aws/result_storages/s3_storage.py
@@ -12,7 +12,7 @@
 from boto.s3.key import Key
 from dateutil.parser import parse as parse_ts
 
-import thumbor_aws.connection
+import tc_aws.connection
 
 class Storage(BaseStorage):
 
@@ -26,7 +26,7 @@ def __init__(self, context):
 
     def __get_s3_bucket(self):
         return Bucket(
-            connection=thumbor_aws.connection.get_connection(self.context),
+            connection=tc_aws.connection.get_connection(self.context),
             name=self.context.config.RESULT_STORAGE_BUCKET
         )
 

diff --git a/thumbor_aws/storages/__init__.py → tc_aws/storages/__init__.py b/thumbor_aws/storages/__init__.py → tc_aws/storages/__init__.py
diff --git a/thumbor_aws/storages/s3_storage.py → tc_aws/storages/s3_storage.py b/thumbor_aws/storages/s3_storage.py → tc_aws/storages/s3_storage.py
@@ -14,7 +14,7 @@
 from boto.s3.key import Key
 from dateutil.parser import parse as parse_ts
 
-import thumbor_aws.connection
+import tc_aws.connection
 
 class Storage(BaseStorage):
 
@@ -25,7 +25,7 @@ def __init__(self, context):
 
     def __get_s3_bucket(self):
         return Bucket(
-            connection=thumbor_aws.connection.get_connection(self.context),
+            connection=tc_aws.connection.get_connection(self.context),
             name=self.context.config.STORAGE_BUCKET
         )
 

diff --git a/vows/storage_vows.py b/vows/storage_vows.py
@@ -23,7 +23,7 @@
 from boto.s3.key import Key
 from moto import mock_s3
 
-from thumbor_aws.storages.s3_storage import Storage
+from tc_aws.storages.s3_storage import Storage
 
 s3_bucket = 'thumbor-images-test'