Merge remote-tracking branch 'origin/dev' into dev

apps/assets/tasks.py

@@ -19,7 +19,7 @@ FORKS = 10
 TIMEOUT = 60
 logger = get_logger(__file__)
 CACHE_MAX_TIME = 60*60*60
-disk_pattern = re.compile(r'^hd|sd')
+disk_pattern = re.compile(r'^hd|sd|xvd')
 
 
 @shared_task

apps/common/utils.py

@@ -327,6 +327,10 @@ def capacity_convert(size, expect='auto', rate=1000):
             if rate > std_size/rate_ > 1:
                 expect = unit
                 break
+
+    if expect not in rate_mapping:
+        expect = 'K'
+
     expect_size = std_size / rate_mapping[expect]
     return expect_size, expect
 

config_example.py

@@ -119,5 +119,5 @@ class ProductionConfig(Config):
 
 
 # Default using Config settings, you can write if/else for different env
-config = Config()
+config = DevelopmentConfig()
 

requirements/mac_requirements.txt

@@ -1 +1 @@
-openssl  brew install libtiff libjpeg webp little-cms2
+brew install libtiff libjpeg webp little-cms2 openssl