Commit 2db8fcf1 authored by Jérome Perrin's avatar Jérome Perrin

drop more python2 support

parent c2ebc726
...@@ -44,7 +44,6 @@ setup(name=name, ...@@ -44,7 +44,6 @@ setup(name=name,
'croniter', # needed to know cron schedule 'croniter', # needed to know cron schedule
'pytz', # needed to manipulate timezone 'pytz', # needed to manipulate timezone
'tzlocal', # needed to manipulate timezone 'tzlocal', # needed to manipulate timezone
'backports.lzma',
'netifaces', 'netifaces',
'erp5.util', 'erp5.util',
'PyRSS2Gen', 'PyRSS2Gen',
...@@ -56,8 +55,7 @@ setup(name=name, ...@@ -56,8 +55,7 @@ setup(name=name,
'six', 'six',
'cryptography', 'cryptography',
'click', 'click',
'websocket-client; python_version>="3"', 'websocket-client',
'ipaddress; python_version<"3"',
), ),
extras_require = { extras_require = {
'lampconfigure': ["mysqlclient"], #needed for MySQL Database access 'lampconfigure': ["mysqlclient"], #needed for MySQL Database access
......
...@@ -4,8 +4,6 @@ ...@@ -4,8 +4,6 @@
Check if a mariadb result matches the desired threshold or raises an error. Check if a mariadb result matches the desired threshold or raises an error.
""" """
from __future__ import print_function
import json import json
import os import os
import re import re
...@@ -13,7 +11,7 @@ import sys ...@@ -13,7 +11,7 @@ import sys
import time import time
import datetime import datetime
import argparse import argparse
from backports import lzma import lzma
def checkMariadbDigestResult(mariadbdex_path, mariadbdex_report_status_file, def checkMariadbDigestResult(mariadbdex_path, mariadbdex_report_status_file,
max_query_threshold, slowest_query_threshold): max_query_threshold, slowest_query_threshold):
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################
from __future__ import unicode_literals
import unittest import unittest
import os import os
import time import time
...@@ -32,7 +31,7 @@ import tempfile ...@@ -32,7 +31,7 @@ import tempfile
import datetime import datetime
import shutil import shutil
import codecs import codecs
from backports import lzma import lzma
from . import data from . import data
from slapos.promise.check_slow_queries_digest_result import checkMariadbDigestResult from slapos.promise.check_slow_queries_digest_result import checkMariadbDigestResult
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment