Merge pull request #178 from MSeal/s3TestFix

Attempt to fix s3 tests
nteract · Aug 26, 2018 · 7a868ae · 7a868ae
2 parents 74fab1a + b12f884
commit 7a868ae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/papermill/tests/test_s3.py b/papermill/tests/test_s3.py
@@ -2,6 +2,7 @@
 
 import os.path
 import pytest
+import boto3
 import moto
 from moto import mock_s3
 
@@ -176,12 +177,10 @@ def test_split_error():
 
 read_from_gen = lambda g: "\n".join(g)
 
-
-@pytest.yield_fixture
+@pytest.yield_fixture(scope="function")
 def s3_client():
     mock_s3 = moto.mock_s3()
     mock_s3.start()
-    import boto3
 
     client = boto3.client('s3')
     client.create_bucket(Bucket=test_bucket_name)

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -5,8 +5,11 @@ mock
 pytest>=3.3
 pytest-cov
 pytest-mock
-moto==1.2.0
+moto>=1.2.0
 check-manifest
 black; python_version >= '3.6'
 attrs>=17.4.0
 pre-commit
+# Until https://github.com/spulec/moto/issues/1793 is resolved
+boto3 < 1.8.0
+botocore < 1.11.0