Merge branch 'release-0.0.17'

boto · May 7, 2015 · 17c6c57 · 17c6c57
2 parents 17398d2 + 52741c0
commit 17c6c57
Show file tree

Hide file tree

Showing 40 changed files with 3,076 additions and 220 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,8 @@ tests/.coverage
 # Test state / virtualenvs
 .tox
 .coverage
+coverage.xml
+nosetests.xml
 
 # Common virtualenv names
 venv

diff --git a/.travis.yml b/.travis.yml
@@ -6,9 +6,7 @@ python:
   - "3.4"
 sudo: false
 install:
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then travis_retry pip install -r requirements26.txt; fi
-  - if [[ $TRAVIS_PYTHON_VERSION == 2.* ]]; then travis_retry pip install -r requirements2.txt; fi
-  - travis_retry pip install -r requirements.txt
-  - travis_retry pip install coverage python-coveralls
-script: nosetests --with-coverage --cover-erase
-after_success: coveralls
+  - python scripts/ci/install
+script: python scripts/ci/run-tests
+after_success:
+  - pip install python-coveralls && cd tests && coveralls
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+0.0.17 - 2015-05-07
+-------------------
+
+* feature:Botocore: Update to Botocore 0.107.0.
+
+  * Adopt new data structure model.
+
 0.0.16 - 2015-04-20
 -------------------
 

diff --git a/boto3/__init__.py b/boto3/__init__.py
@@ -17,7 +17,7 @@
 
 
 __author__ = 'Amazon Web Services'
-__version__ = '0.0.16'
+__version__ = '0.0.17'
 
 
 # The default Boto3 session; autoloaded when needed.

diff --git a/.../cloudformation-2010-05-15.resources.json → ...loudformation/2010-05-15/resources-1.json b/.../cloudformation-2010-05-15.resources.json → ...loudformation/2010-05-15/resources-1.json
diff --git a/...ources/dynamodb-2012-08-10.resources.json → ...data/dynamodb/2012-08-10/resources-1.json b/...ources/dynamodb-2012-08-10.resources.json → ...data/dynamodb/2012-08-10/resources-1.json
diff --git a/...a/resources/ec2-2014-10-01.resources.json → boto3/data/ec2/2014-10-01/resources-1.json b/...a/resources/ec2-2014-10-01.resources.json → boto3/data/ec2/2014-10-01/resources-1.json