Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.toolbox
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Joanne Hugé
slapos.toolbox
Commits
2db8fcf1
Commit
2db8fcf1
authored
Sep 21, 2023
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drop more python2 support
parent
c2ebc726
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
8 deletions
+3
-8
setup.py
setup.py
+1
-3
slapos/promise/check_slow_queries_digest_result/__init__.py
slapos/promise/check_slow_queries_digest_result/__init__.py
+1
-3
slapos/test/promise/test_check_slow_queries_digest_result.py
slapos/test/promise/test_check_slow_queries_digest_result.py
+1
-2
No files found.
setup.py
View file @
2db8fcf1
...
@@ -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
...
...
slapos/promise/check_slow_queries_digest_result/__init__.py
View file @
2db8fcf1
...
@@ -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
):
...
...
slapos/test/promise/test_check_slow_queries_digest_result.py
View file @
2db8fcf1
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment