Merge pull request #4415 from yan12125/remove-boto-version-upper-bounds

Remove version upper bounds for boto3/botocore and update

.bbtravis.yml

@@ -18,6 +18,10 @@ env:
   global:
   - BUILDBOT_TEST_DB_URL=sqlite://
   - HYPER_SIZE=m1
+  # Current moto (1.3.7) requires dummy credentials to work
+  # https://github.com/spulec/moto/issues/1924
+  - AWS_SECRET_ACCESS_KEY=foobar_secret
+  - AWS_ACCESS_KEY_ID=foobar_key
   matrix:
   - TWISTED=latest SQLALCHEMY=latest TESTS=coverage
 

.travis.yml

@@ -22,13 +22,19 @@ python:
   - "2.7"
 
 env:
-  # we now use travis only for real database testing
-  # travis containers do have much more optimized db installations
+  global:
+    # Current moto (1.3.7) requires dummy credentials to work
+    # https://github.com/spulec/moto/issues/1924
+    - AWS_SECRET_ACCESS_KEY=foobar_secret
+    - AWS_ACCESS_KEY_ID=foobar_key
+  matrix:
+    # we now use travis only for real database testing
+    # travis containers do have much more optimized db installations
 
-  - TWISTED=latest SQLALCHEMY=latest TESTS=coverage BUILDBOT_TEST_DB_URL=mysql+mysqldb://travis@127.0.0.1/bbtest?storage_engine=InnoDB
-  # Configuration that runs tests with real PostgreSQL database with pg8000 and psycopg2 drivers
-  - TWISTED=latest SQLALCHEMY=latest TESTS=coverage BUILDBOT_TEST_DB_URL=postgresql+psycopg2:///bbtest?user=postgres
-  - TWISTED=latest SQLALCHEMY=latest TESTS=coverage BUILDBOT_TEST_DB_URL=postgresql+pg8000:///bbtest?user=postgres
+    - TWISTED=latest SQLALCHEMY=latest TESTS=coverage BUILDBOT_TEST_DB_URL=mysql+mysqldb://travis@127.0.0.1/bbtest?storage_engine=InnoDB
+    # Configuration that runs tests with real PostgreSQL database with pg8000 and psycopg2 drivers
+    - TWISTED=latest SQLALCHEMY=latest TESTS=coverage BUILDBOT_TEST_DB_URL=postgresql+psycopg2:///bbtest?user=postgres
+    - TWISTED=latest SQLALCHEMY=latest TESTS=coverage BUILDBOT_TEST_DB_URL=postgresql+pg8000:///bbtest?user=postgres
 
 # Dependencies installation commands
 install:

appveyor.yml

@@ -2,6 +2,11 @@
 # https://www.appveyor.com/docs
 
 environment:
+  # Current moto (1.3.7) requires dummy credentials to work
+  # https://github.com/spulec/moto/issues/1924
+  AWS_SECRET_ACCESS_KEY: foobar_secret
+  AWS_ACCESS_KEY_ID: foobar_key
+
   matrix:
     # For Python versions available on AppVeyor, see
     # http://www.appveyor.com/docs/installed-software#python

master/setup.py

@@ -493,7 +493,6 @@ def define_plugin_entries(groups):
     'pyjade',
     # boto3 and moto required for running EC2 tests
     'boto3',
-    'botocore<1.11', # botocore>=1.11.0 broke moto
     'moto',
     'mock>=2.0.0',
 ]

requirements-ci.txt

@@ -9,8 +9,8 @@ Babel==2.6.0
 backports.functools-lru-cache==1.5
 blockdiag==1.5.4
 boto==2.49.0
-boto3==1.8.6
-botocore==1.10.65 # pyup: ignore
+boto3==1.9.41
+botocore==1.12.41
 cffi==1.11.5
 click==7.0
 configparser==3.5.0
@@ -40,7 +40,7 @@ markdown2==2.3.6
 MarkupSafe==1.0
 mccabe==0.6.1
 mock==2.0.0
-moto==1.3.5
+moto==1.3.7
 olefile==0.46
 packaging==18.0
 pathlib2==2.3.2