Update moto to 1.x milestone version (#2471)

test/contrib/s3_test.py

@@ -95,23 +95,26 @@ def test_read_iterator_long(self):
             tempf = tempfile.NamedTemporaryFile(mode='wb', delete=False)
             temppath = tempf.name
             firstline = ''.zfill(key.Key.BufferSize * 5) + os.linesep
-            contents = firstline + 'line two' + os.linesep + 'line three'
+            secondline = 'line two' + os.linesep
+            thirdline = 'line three' + os.linesep
+            contents = firstline + secondline + thirdline
             tempf.write(contents.encode('utf-8'))
             tempf.close()
 
             client = S3Client(AWS_ACCESS_KEY, AWS_SECRET_KEY)
             create_bucket()
-            client.put(temppath, 's3://mybucket/largetempfile')
-            t = S3Target('s3://mybucket/largetempfile', client=client)
+            remote_path = 's3://mybucket/largetempfile'
+            client.put(temppath, remote_path)
+            t = S3Target(remote_path, client=client)
             with t.open() as read_file:
                 lines = [line for line in read_file]
         finally:
             key.Key.BufferSize = old_buffer
 
         self.assertEqual(3, len(lines))
         self.assertEqual(firstline, lines[0])
-        self.assertEqual("line two" + os.linesep, lines[1])
-        self.assertEqual("line three", lines[2])
+        self.assertEqual(secondline, lines[1])
+        self.assertEqual(thirdline, lines[2])
 
     def test_get_path(self):
         t = self.create_target()

tox.ini

@@ -7,7 +7,7 @@ usedevelop = True
 install_command = pip install {opts} {packages}
 deps=
   mock<2.0
-  moto<1.0
+  moto<2.0
   HTTPretty==0.8.10
   nose<2.0
   docker>=2.1.0