Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
beat
beat.core
Commits
04484221
Commit
04484221
authored
Mar 20, 2019
by
André Anjos
💬
Browse files
Merge branch '73_standardize_simplejson' into 'master'
Standardize simplejson Closes
#73
See merge request
!63
parents
a1e373d4
5af82d13
Pipeline
#28268
passed with stages
in 20 minutes and 54 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
beat/core/algorithm.py
View file @
04484221
...
...
@@ -49,10 +49,9 @@ Forward importing from :py:mod:`beat.backend.python.algorithm`
import
os
import
six
import
sys
import
json
import
numpy
import
pkg_resources
import
simplejson
as
json
from
.
import
dataformat
from
.
import
library
...
...
@@ -69,9 +68,6 @@ def load_algorithm_prototype(prefix):
prototype_data
=
pkg_resources
.
resource_string
(
__name__
,
"prototypes/algorithm.json"
)
if
sys
.
version_info
<
(
3
,
6
):
prototype_data
=
prototype_data
.
decode
(
"utf-8"
)
algorithm_data
=
json
.
loads
(
prototype_data
)
ref_dataformats
=
[
"integer"
,
"integers"
]
dataformat
=
None
...
...
beat/core/bcp/worker.py
View file @
04484221
...
...
@@ -62,9 +62,9 @@ Options:
import
os
import
sys
import
json
import
signal
import
tempfile
import
simplejson
as
json
import
zmq
...
...
@@ -192,8 +192,6 @@ def run(
if
command
==
BCP
.
BCPE_EXECUTE
:
job_id
=
request
.
pop
(
0
)
job_data
=
request
.
pop
(
0
)
if
sys
.
version_info
<
(
3
,
6
):
job_data
=
job_data
.
decode
(
"utf-8"
)
data
=
json
.
loads
(
job_data
)
reply
=
[
BCP
.
BCPP_JOB_RECEIVED
,
job_id
]
...
...
beat/core/bcpapi/execution.py
View file @
04484221
...
...
@@ -44,8 +44,8 @@ Execution utilities
import
logging
import
multiprocessing
import
signal
import
json
import
zmq
import
simplejson
as
json
from
..dock
import
Host
from
..execution.local
import
LocalExecutor
...
...
beat/core/test/test_bcp.py
View file @
04484221
...
...
@@ -37,14 +37,13 @@
# Tests for experiment execution
import
os
import
json
import
unittest
import
multiprocessing
import
queue
import
zmq
import
simplejson
as
json
from
..bcpapi
import
BCP
from
..bcpapi.client
import
BeatComputationClient
from
..bcpapi.execution
import
ExecutionProcess
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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