Merge branch 'prepare-2.1.0'

CHANGELOG.rst

@@ -1,7 +1,7 @@
 Changelog
 =========
 
-2.1.0 (unreleased)
+2.1.0 (2017-12-06)
 ------------------
 
 **New features**

requirements.txt

@@ -1,33 +1,40 @@
-appdirs==1.4.2
-boto==2.46.1
-colander==1.3.2
-colorama==0.3.7
-cornice==2.4.0
-cornice-swagger==0.5.0
-hupper==0.4.2
-iso8601==0.1.11
-jsonpatch==1.15
-jsonpointer==1.10
+bcrypt==3.1.4
+boto==2.48.0
+certifi==2017.11.5
+cffi==1.11.2
+chardet==3.0.4
+colander==1.4
+colorama==0.3.9
+cornice==3.0.0
+cornice-swagger==0.5.2
+dockerflow==2017.11.0
+hupper==1.0
+idna==2.6
+iso8601==0.1.12
+jsonpatch==1.20
+jsonpointer==1.14
 jsonschema==2.6.0
-kinto==6.0.0
-packaging==16.8
+kinto==8.0.0
+logging-color-formatter==1.0.2
 PasteDeploy==1.5.2
-pyparsing==2.1.10
-pyramid==1.8.2
+plaster==1.0
+plaster-pastedeploy==0.4.2
+pycparser==2.18
+pyramid==1.9.1
 pyramid-multiauth==0.9.0
 pyramid-storage==0.1.2
-pyramid-tm==1.1.1
-python-dateutil==2.6.0
-repoze.lru==0.6
-requests==2.13.0
-simplejson==3.10.0
-six==1.10.0
-structlog==16.1.0
-transaction==2.1.0
+pyramid-tm==2.2
+python-dateutil==2.6.1
+repoze.lru==0.7
+requests==2.18.4
+simplejson==3.13.2
+six==1.11.0
+transaction==2.1.2
 translationstring==1.3
 ujson==1.35
-venusian==1.0
-waitress==1.0.2
-WebOb==1.7.1
-zope.deprecation==4.2.0
-zope.interface==4.3.3
+urllib3==1.22
+venusian==1.1.0
+waitress==1.1.0
+WebOb==1.7.4
+zope.deprecation==4.3.0
+zope.interface==4.4.3

setup.py

@@ -25,7 +25,7 @@
 
 setup(
     name='kinto-attachment',
-    version='2.0.2.dev0',
+    version='2.1.0',
     description="Attach files to Kinto records",
     long_description=readme + '\n\n' + history,
     author="Mozilla",