Merge branch 'master' into archive-warn

package.json

@@ -1,7 +1,7 @@
 {
   "devDependencies": {
-    "rollup": "^0.66.2",
-    "rollup-plugin-svelte": "^4.3.1",
+    "rollup": "^0.66.4",
+    "rollup-plugin-svelte": "^4.3.2",
     "svelte": "^2.13.5"
   }
 }

requirements-dev.txt

@@ -1,22 +1,22 @@
 -i https://pypi.python.org/simple/
-atomicwrites==1.2.1; python_version >= '2.7'
+atomicwrites==1.2.1; python_version != '3.2.*'
 attrs==18.2.0
 certifi==2018.8.24
 chardet==3.0.4
 codecov==2.0.15
 coverage==4.5.1
 idna==2.7
-mirakuru==1.0.0; python_version != '3.1.*'
+mirakuru==1.0.0; python_version != '3.2.*'
 more-itertools==4.3.0
-pluggy==0.7.1; python_version >= '2.7'
+pluggy==0.7.1; python_version != '3.2.*'
 port-for==0.4
-psutil==5.4.7; python_version != '3.1.*'
-py==1.6.0; python_version >= '2.7'
+psutil==5.4.7; python_version != '3.2.*'
+py==1.6.0; python_version != '3.2.*'
 pytest-cov==2.6.0
 pytest-redis==1.3.2
 pytest==3.8.1
 redis==2.10.6
 requests==2.19.1
 six==1.11.0
-urllib3==1.23; python_version != '3.1.*'
+urllib3==1.23; python_version != '3.2.*'
 versioneer==0.18

requirements.txt

@@ -4,14 +4,14 @@ amqp==2.3.2
 asn1crypto==0.24.0
 billiard==3.5.0.4
 blinker==1.4
-brotli==1.0.4
+brotli==1.0.6
 celery==4.2.1
 certifi==2018.8.24
-cffi==1.11.5; python_version >= '2.7'
+cffi==1.11.5; python_version != '3.3.*'
 chardet==3.0.4
 click==6.7
 cloudpickle==0.5.6
-cryptography==2.3.1; python_version >= '2.7'
+cryptography==2.3.1; python_version != '3.3.*'
 csscompressor==0.9.5
 decorator==4.3.0
 doit==0.31.1
@@ -20,7 +20,7 @@ flask-sqlalchemy==2.3.2
 flask==1.0.2
 gunicorn==19.9.0
 honcho==1.0.1
-http-ece==1.0.5; python_version >= '2.7'
+http-ece==1.0.5; python_version != '3.3.*'
 idna==2.7
 itsdangerous==0.24
 jinja2==2.10
@@ -30,7 +30,7 @@ markupsafe==1.0
 mastodon.py==1.3.1
 pillow==5.2.0
 psycopg2==2.7.5
-pycparser==2.19; python_version >= '2.7'
+pycparser==2.19; python_version != '3.3.*'
 pyinotify==0.9.6; sys_platform == 'linux'
 python-dateutil==2.7.3
 python-editor==1.0.3
@@ -41,6 +41,6 @@ requests==2.19.1
 six==1.11.0
 sqlalchemy==1.2.12
 twitter==1.18.0
-urllib3==1.23; python_version != '3.1.*'
+urllib3==1.23; python_version != '3.2.*'
 vine==1.1.4
 werkzeug==0.14.1

yarn.lock

@@ -235,9 +235,9 @@ require-relative@^0.8.7:
   version "0.8.7"
   resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
 
-rollup-plugin-svelte@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-svelte/-/rollup-plugin-svelte-4.3.1.tgz#9343c7f2be22aa1511ff9ad997b4b9d0bbd43ad6"
+rollup-plugin-svelte@^4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-svelte/-/rollup-plugin-svelte-4.3.2.tgz#09cac792dbccadf352f5871bfda769aceaee5c02"
   dependencies:
     require-relative "^0.8.7"
     rollup-pluginutils "^2.3.0"
@@ -250,9 +250,9 @@ rollup-pluginutils@^2.3.0:
     estree-walker "^0.5.2"
     micromatch "^2.3.11"
 
-rollup@^0.66.2:
-  version "0.66.2"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.66.2.tgz#77acdb9f4093f5f035ce75480577c40a81ea7999"
+rollup@^0.66.4:
+  version "0.66.4"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.66.4.tgz#8067b9638af82873b7fd644af9c3d72108ca4bab"
   dependencies:
     "@types/estree" "0.0.39"
     "@types/node" "*"