bump requirements

backend/requirements.txt

@@ -1,43 +1,42 b''
-repoze.sendmail==4.1
+repoze.sendmail==4.4.1
 pyramid==1.10.2
-pyramid_tm==0.12
+pyramid_tm==2.2.1
 pyramid_debugtoolbar
 pyramid_authstack==1.0.1
-SQLAlchemy==1.0.12
+SQLAlchemy==1.2.18
 alembic==1.0.8
 webhelpers2==2.0
-transaction==1.4.3
-zope.sqlalchemy==0.7.6
-pyramid_mailer==0.14.1
-redis==2.10.5
+transaction==2.4.0
+zope.sqlalchemy==1.1
+pyramid_mailer==0.15.1
+redis==3.2.1
 redlock-py==1.0.8
-pyramid_jinja2==2.6.2
-psycopg2==2.7.7
-wtforms==2.1
-celery==3.1.23
-formencode==1.3.0
-psutil==2.1.2
+pyramid_jinja2==2.8
+psycopg2-binary==2.7.7
+wtforms==2.2.1
+celery==4.2.1
+formencode==1.3.1
+psutil==5.6.1
 ziggurat_foundations==0.8.3
 bcrypt==3.1.6
 appenlight_client
-markdown==2.5
+markdown==3.0.1
 colander==1.7
 defusedxml==0.5.0
-dogpile.cache==0.5.7
+dogpile.cache==0.7.1
 pyramid_redis_sessions==1.0.1
-simplejson==3.8.2
-waitress==1.0
+simplejson==3.16.0
+waitress==1.2.1
 gunicorn==19.9.0
-requests==2.20.0
-requests_oauthlib==0.6.1
-gevent==1.1.1
-gevent-websocket==0.9.5
-pygments==2.1.3
+uwsgi==2.0.18
+requests==2.21.0
+requests_oauthlib==1.2.0
+gevent==1.4.0
+pygments==2.3.1
 lxml==4.3.2
-paginate==0.5.4
-paginate-sqlalchemy==0.2.0
+paginate==0.5.6
+paginate-sqlalchemy==0.3.0
 elasticsearch>=2.0.0,<3.0.0
-six>=1.10.0
 mock==1.0.1
 itsdangerous==1.1.0
 camplight==0.9.6
@@ -45,5 +44,4 b' jira==1.0.7'
 python-dateutil==2.5.3
 authomatic==0.1.0.post1
 cryptography==2.6.1
-webassets==0.11.1
 

backend/src/appenlight/celery/__init__.py

@@ -57,7 +57,7 b' def on_preload_parsed(options, **kwargs):'
     if not ini_location:
         raise Exception('You need to pass pyramid ini location using '
                         '--ini=filename.ini argument to the worker')
-    env = bootstrap(ini_location)
+    env = bootstrap(ini_location[0])
     api_key = env['request'].registry.settings['appenlight.api_key']
     tr_config = env['request'].registry.settings.get(
         'appenlight.transport_config')

backend/src/appenlight/lib/cache_regions.py

@@ -18,7 +18,8 b' import copy'
 import hashlib
 import inspect
 
-from dogpile.cache import make_region, compat
+from dogpile.cache import make_region
+from dogpile.cache.util import compat
 
 regions = None
 

backend/src/appenlight/models/config.py

@@ -16,7 +16,7 b''
 
 import sqlalchemy as sa
 from ziggurat_foundations.models.base import BaseModel
-from sqlalchemy.dialects.postgres import JSON
+from sqlalchemy.dialects.postgresql import JSON
 
 from . import Base
 

backend/src/appenlight/models/plugin_config.py

@@ -16,7 +16,7 b''
 
 import sqlalchemy as sa
 from ziggurat_foundations.models.base import BaseModel
-from sqlalchemy.dialects.postgres import JSON
+from sqlalchemy.dialects.postgresql import JSON
 
 from . import Base
 

backend/src/appenlight/models/report_group.py

@@ -84,7 +84,7 b' class ReportGroup(Base, BaseModel):'
                                              'assigned_reports_relation',
                                              lazy='dynamic',
                                              order_by=sa.desc(
-                                                 "reports_groups.id")
+                                                 sa.text("reports_groups.id"))
                                          ),
                                          passive_deletes=True,
                                          passive_updates=True,

backend/src/appenlight/models/tag.py

@@ -17,7 +17,7 b''
 import sqlalchemy as sa
 from datetime import datetime
 from ziggurat_foundations.models.base import BaseModel
-from sqlalchemy.dialects.postgres import JSON
+from sqlalchemy.dialects.postgresql import JSON
 
 from . import Base
 

backend/src/appenlight/views/admin/admin.py

@@ -130,14 +130,13 b' def system(request):'
     min_mem = 1024 * 1024 * 40  # 40MB
     process_info = []
     for p in psutil.process_iter():
-        mem_used = p.get_memory_info().rss
+        mem_used = p.memory_info().rss
         if mem_used < min_mem:
             continue
         process_info.append({'owner': p.username(),
                              'pid': p.pid,
-                             'cpu': round(p.get_cpu_percent(interval=0), 1),
-                             'mem_percentage': round(p.get_memory_percent(),
-                                                     1),
+                             'cpu': round(p.cpu_percent(interval=0), 1),
+                             'mem_percentage': round(p.memory_percent(),1),
                              'mem_usage': bytes2human(mem_used),
                              'name': p.name(),
                              'command': ' '.join(p.cmdline())

backend/src/appenlight/views/applications.py

@@ -17,7 +17,6 b''
 import copy
 import json
 import logging
-import six
 
 from datetime import datetime, timedelta
 

backend/src/appenlight/views/tests.py

@@ -20,7 +20,6 b' import datetime'
 import time
 import random
 import redis
-import six
 import pyramid.renderers
 import requests