Skip to content

Commit 1998e60

Browse files
Vaghinak BasentsyanVaghinak Basentsyan
authored andcommitted
Merge remote-tracking branch 'origin/develop' into FRIDAY-290
# Conflicts: # src/superannotate/lib/app/interface/sdk_interface.py
2 parents 7e3c9a9 + b1a487b commit 1998e60

27 files changed

+1271
-404
lines changed

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ repos:
3636
hooks:
3737
- id: black
3838
name: Uncompromising Code Formatter (black)
39-
- repo: 'https://github.com/asottile/dead'
40-
rev: v1.3.0
41-
hooks:
42-
- id: dead
39+
# - repo: 'https://github.com/asottile/dead'
40+
# rev: v1.3.0
41+
# hooks:
42+
# - id: dead
4343
files: src/
4444
exclude: src/lib/app/analytics | src/lib/app/converters | src/lib/app/input_converters

pytest.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
minversion = 3.0
33
log_cli=true
44
python_files = test_*.py
5-
addopts = -n 32 --dist=loadscope
5+
;addopts = -n 32 --dist=loadscope

src/superannotate/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,3 +299,4 @@
299299
logging.config.fileConfig(
300300
os.path.join(WORKING_DIR, "logging.conf"), disable_existing_loggers=False
301301
)
302+
sys.tracebacklimit = 1

src/superannotate/lib/app/common.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,6 @@ def save_web_format(output_dir, classes, files_dict):
148148
json.dump(classes, fw)
149149

150150

151-
def dump_output(output_dir, platform, classes, files_dict):
152-
if platform == "Web":
153-
save_web_format(output_dir, classes, files_dict)
154-
else:
155-
save_desktop_format(output_dir, classes, files_dict)
156-
157-
158151
def write_to_json(output_path, json_data):
159152
with open(output_path, "w") as fw:
160153
json.dump(json_data, fw, indent=2)

0 commit comments

Comments
 (0)