Merge pull request #2 from Answers4AWS/master

update to 1.0.7

README.rst

@@ -5,6 +5,14 @@ DistAMI
    :target: https://travis-ci.org/Answers4AWS/distami
    :alt: Build Status
 
+.. image:: https://pypip.in/d/distami/badge.png
+   :target: https://pypi.python.org/pypi/distami
+   :alt: PyPI Downloads
+
+.. image:: https://pypip.in/v/distami/badge.png
+   :target: https://pypi.python.org/pypi/distami
+   :alt: PyPI Version
+
 Distributes an AMI by copying it to one, many, or all AWS regions, and by optionally making the AMIs and Snapshots public or shared with specific AWS Accounts.
 
 Usage

distami/__init__.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 
 __author__ = 'Peter Sankauskas'
-__version__ = '1.0.5'
+__version__ = '1.0.7'

distami/utils.py

@@ -76,6 +76,9 @@ def get_regions_to_copy_to(source_region):
         # Filter out GovCloud
         if region.name == 'us-gov-west-1':
             continue
+        # Filter out China
+        if region.name == 'cn-north-1':
+            continue
         regions.append(region.name)
 
     return regions

tests/unit/test_utils.py

@@ -14,13 +14,10 @@
 
 import unittest
 
-from distami import utils 
+from distami import utils
 
 class UtilTests(unittest.TestCase):
     def test_get_regions_to_copy_to(self):
-        all_public_regions = ['ap-southeast-1', 'ap-southeast-2', 'ap-northeast-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1', 'eu-west-1']
+        all_public_regions = ['ap-southeast-1', 'ap-southeast-2', 'ap-northeast-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1', 'eu-west-1', 'eu-central-1']
         regions = utils.get_regions_to_copy_to('not-a-real-region')
         self.assertItemsEqual(regions, all_public_regions)
-
-
-