Merge pull request #64 from lyft/HOTFIX-upgrade-pynamodb

Upgrade pynamodb for connection pooling and upgrade boto3 for stable release
lyft · Jun 30, 2015 · c4c3411 · c4c3411
2 parents 97caa76 + deb8754
commit c4c3411
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ops/config/pillar/env.sls b/ops/config/pillar/env.sls
@@ -2,7 +2,7 @@ environment:
   development:
     AWS_ACCESS_KEY_ID: 'AKIAJU3OAK6B6NVHOMCQ'
     AWS_SECRET_ACCESS_KEY: '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'
-    BOTO_DEFAULT_REGION: 'us-east-1'
+    AWS_DEFAULT_REGION: 'us-east-1'
     CLIENT_ID: '392351837929-bb99e14u1bs0cu46ovhgqamcs48rahto.apps.googleusercontent.com'
     CLIENT_SECRET: 'tJZlGOuaGKf7F1wSDq7jMvch'
     DEBUG: true
@@ -23,7 +23,7 @@ environment:
     USE_AUTH: true
   staging:
     APPLICATION_ENV: {{ grains.service_instance }}
-    BOTO_DEFAULT_REGION: 'us-east-1'
+    AWS_DEFAULT_REGION: 'us-east-1'
     CLIENT_ID: '392351837929-bb99e14u1bs0cu46ovhgqamcs48rahto.apps.googleusercontent.com'
     CLIENT_SECRET: 'tJZlGOuaGKf7F1wSDq7jMvch'
     DEBUG: false
@@ -42,7 +42,7 @@ environment:
     USE_AUTH: true
   production:
     APPLICATION_ENV: {{ grains.service_instance }}
-    BOTO_DEFAULT_REGION: 'us-east-1'
+    AWS_DEFAULT_REGION: 'us-east-1'
     CLIENT_ID: '392351837929-bb99e14u1bs0cu46ovhgqamcs48rahto.apps.googleusercontent.com'
     CLIENT_SECRET: 'tJZlGOuaGKf7F1wSDq7jMvch'
     DEBUG: false

diff --git a/requirements.txt b/requirements.txt
@@ -7,10 +7,10 @@ six==1.8.0
 wsgiref==0.1.2
 
 # For KMS
-boto3==0.0.6
+boto3==1.0.1
 
 # For storage
-pynamodb==1.3.4
+pynamodb==1.4.2
 
 # For encryption
 pycrypto==2.6.1