pyrox.dev
1diff --git a/graphite_api/config.py b/graphite_api/config.py
2index 5e1e382..dc033a8 100644
3--- a/graphite_api/config.py
4+++ b/graphite_api/config.py
5@@ -112,11 +112,11 @@ def configure(app):
6 app.cache = None
7 if 'cache' in config:
8 try:
9- from flask.ext.cache import Cache
10+ from flask_caching import Cache
11 except ImportError:
12 warnings.warn("'cache' is provided in the configuration but "
13- "Flask-Cache is not installed. Please `pip install "
14- "Flask-Cache`.")
15+ "flask-caching is not installed. Please `pip "
16+ "install flask-caching`.")
17 else:
18 cache_conf = {'CACHE_DEFAULT_TIMEOUT': 60,
19 'CACHE_KEY_PREFIX': 'graphite-api:'}
20diff --git a/requirements.txt b/requirements.txt
21index c68b446..7826b0c 100644
22--- a/requirements.txt
23+++ b/requirements.txt
24@@ -1,5 +1,5 @@
25 Flask
26-Flask-Cache
27+Flask-Caching
28 cairocffi
29 pyparsing>=1.5.7
30 pytz
31diff --git a/setup.py b/setup.py
32index 0337cbe..df07989 100644
33--- a/setup.py
34+++ b/setup.py
35@@ -38,7 +38,7 @@ setup(
36 extras_require={
37 'sentry': ['raven[flask]'],
38 'cyanite': ['cyanite'],
39- 'cache': ['Flask-Cache'],
40+ 'cache': ['Flask-Caching'],
41 'statsd': ['statsd'],
42 },
43 zip_safe=False,
44diff --git a/tests/test_render.py b/tests/test_render.py
45index be5609d..a0e7190 100644
46--- a/tests/test_render.py
47+++ b/tests/test_render.py
48@@ -8,7 +8,7 @@ from graphite_api._vendor import whisper
49 from . import TestCase, WHISPER_DIR
50
51 try:
52- from flask.ext.cache import Cache
53+ from flask_caching import Cache
54 except ImportError:
55 Cache = None
56
57diff --git a/tox.ini b/tox.ini
58index 85a0abb..c820393 100644
59--- a/tox.ini
60+++ b/tox.ini
61@@ -47,7 +47,7 @@ basepython = python2.7
62 deps =
63 {[testenv]deps}
64 Flask
65- Flask-Cache
66+ Flask-Caching
67 pyparsing
68 mock
69
70@@ -56,7 +56,7 @@ basepython = python3.3
71 deps =
72 {[testenv]deps}
73 Flask
74- Flask-Cache
75+ Flask-Caching
76 pyparsing
77
78 [testenv:py34]
79@@ -66,7 +66,7 @@ commands =
80 deps =
81 {[testenv]deps}
82 Flask
83- Flask-Cache
84+ Flask-Caching
85 pyparsing
86
87 [testenv:py35]
88@@ -76,7 +76,7 @@ commands =
89 deps =
90 {[testenv]deps}
91 Flask
92- Flask-Cache
93+ Flask-Caching
94 pyparsing
95
96 [testenv:pyparsing1]
97@@ -84,7 +84,7 @@ basepython = python2.7
98 deps =
99 {[testenv]deps}
100 Flask
101- Flask-Cache
102+ Flask-Caching
103 pyparsing==1.5.7
104 mock
105
106@@ -93,7 +93,7 @@ basepython = pypy
107 deps =
108 {[testenv]deps}
109 Flask
110- Flask-Cache
111+ Flask-Caching
112 pyparsing
113 mock
114
115@@ -102,7 +102,7 @@ basepython = python2.7
116 deps =
117 {[testenv]deps}
118 Flask<0.9
119- Flask-Cache
120+ Flask-Caching
121 pyparsing
122 mock
123
124@@ -111,7 +111,7 @@ basepython = python2.7
125 deps =
126 {[testenv]deps}
127 Flask<0.10
128- Flask-Cache
129+ Flask-Caching
130 pyparsing
131 mock
132