From cf771d7f14dc3c3758072878a6b670b747e7cd21 Mon Sep 17 00:00:00 2001 From: Steve Pulec Date: Mon, 6 Mar 2017 21:22:37 -0500 Subject: [PATCH] Add py26 deprecation to changelog --- CHANGELOG.md | 1 + setup.py | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 912659875..5938acbb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ Latest BACKWARDS INCOMPATIBLE * The normal @mock_ decorators will no longer work with boto. It is suggested that you upgrade to boto3 or use the standalone-server mode. If you would still like to use boto, you must use the @mock__deprecated decorators which will be removed in a future release. * The @mock_s3bucket_path decorator is now deprecated. Use the @mock_s3 decorator instead. + * Drop support for Python 2.6 Added * Reset API: a reset API has been added to flush all of the current data ex: `requests.post("http://motoapi.amazonaws.com/moto-api/reset")` diff --git a/setup.py b/setup.py index d34715554..a09438d69 100644 --- a/setup.py +++ b/setup.py @@ -15,9 +15,6 @@ install_requires = [ ] extras_require = { - # No builtin OrderedDict before 2.7 - ':python_version=="2.6"': ['ordereddict'], - 'server': ['flask'], }