From: Daniel Roy Greenfeld <pydanny@users.noreply.github.com>
Date: Fri, 6 Apr 2018 14:40:15 +0000 (-0500)
Subject: Merge branch 'master' into pyup-update-wheel-0.30.0-to-0.31.0
X-Git-Tag: 1.4.3~5^2~1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=12ec545ab3d6191d11e1d52109135baf7d893189;p=cached-property.git

Merge branch 'master' into pyup-update-wheel-0.30.0-to-0.31.0
---

12ec545ab3d6191d11e1d52109135baf7d893189
diff --cc requirements.txt
index 996ea5a,19a2c2e..989a38b
--- a/requirements.txt
+++ b/requirements.txt
@@@ -1,6 -1,6 +1,6 @@@
  # Testing and deployment packages.
  coverage==4.4.2
- pytest==3.3.0
+ pytest==3.5.0
  pytest-cov==2.5.1
- freezegun==0.3.9
+ freezegun==0.3.10
 -wheel==0.30.0
 +wheel==0.31.0