Upgrade gevent (lyft#146)

* Upgrade gevent * Update changelog and bump version
Radioafricagroup · May 9, 2017 · 69c798b · 69c798b
1 parent b3b7cce
commit 69c798b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,34 +1,30 @@
 # Changelog
 
-## 1.9
+# 1
+
+## 1.10.0
+
+* Upgrade gevent and greenlet for CVE-2016-5180 and gevent/gevent#477
 
 ## 1.9.0
 
 * piptools upgrade of transitive dependencies. Most notably this was run to
  upgrade gunicorn to 19.7.1, which allows for using FORWARDED\_ALLOW\_IPS in
  the environment, as well as any other newer gunicorn settings.
 
-## 1.8
-
 ### 1.8.0
 
 * Switch LRU for in-memory cache from an inefficient python implementation to
  lru-dict.
 
-## 1.7
-
 ### 1.7.0
 
 * Update appdirs requirement
 
-## 1.6
-
 ### 1.6.0
 
 * Update python-saml for CVE-2016-1000252.
 
-## 1.5
-
 ### 1.5.1
 
 * Fix docker\_push.sh
@@ -38,21 +34,15 @@
 * Added a feature to disable the credential conflict checks; see configuration
  docs for IGNORE\_CONFLICTS
 
-## 1.4
-
 ### 1.4.0
 
 * Added support for sending basic webhooks; see configuration docs for
  WEBHOOK\_URL
 
-## 1.3
-
 ### 1.3.0
 
 * Update statsd depencency from 3.1 to 3.2.1
 
-## 1.2
-
 ### 1.2.0
 
 * Switch to doing semver in a more proper way. Though generally all previous
@@ -64,8 +54,6 @@
 * Made the XSRF cookie name configurable. See the configuration docs for how to
  changet he XSRF cookie name.
 
-## 1.1
-
 ### 1.1.21
 
 * Move scripts into the confidant module to be able to use the scripts when pip

diff --git a/requirements.in b/requirements.in
@@ -141,12 +141,12 @@ gunicorn>=19.1.1,<20.0.0
 # License: MIT
 # Upstream url: http://www.gevent.org/
 # Use: For concurrency
-gevent==1.0.2
+gevent==1.2.1
 
 # License: MIT
 # Upstream url: https://github.com/python-greenlet/greenlet
 # Use: For concurrency
-greenlet==0.4.9
+greenlet==0.4.12
 
 # License: MIT
 # Upstream url: https://github.com/jsocol/pystatsd

diff --git a/requirements.txt b/requirements.txt
@@ -22,8 +22,8 @@ flask-sslify==0.1.5
 flask==0.10.1
 funcsigs==1.0.2 # via mock
 futures==3.0.5 # via s3transfer
-gevent==1.0.2
-greenlet==0.4.9
+gevent==1.2.1
+greenlet==0.4.12
 guard==1.0.1
 gunicorn==19.7.1
 humanize==0.5.1 # via delorean

diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@
 
 setup(
  name="confidant",
- version="1.9.0",
+ version="1.10.0",
  packages=find_packages(exclude=["test*"]),
  include_package_data=True,
  zip_safe=False,