Skip to content

Commit f945d7b

Browse files
committed
Update tox release settings
1 parent 31bcd0a commit f945d7b

File tree

4 files changed

+18
-13
lines changed

4 files changed

+18
-13
lines changed

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@
3838
entry_points={
3939
"console_scripts": [
4040
"fosslight_android = fosslight_android.android_binary_analysis:main"
41-
]
42-
}
41+
]
42+
}
4343
)

src/fosslight_android/_binary_db_controller.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def get_oss_info_by_tlsh_and_filename(file_name, checksum_value, tlsh_value, sou
112112
matched_tlsh = row
113113
break
114114
except Exception as error: # TLSH COMPARISON FAILED
115-
logger.debug("Comparing TLSH:"+str(error))
115+
logger.debug(f"Comparing TLSH:{error}")
116116

117117
if matched_tlsh != "":
118118
final_result_item = get_list_by_using_query(

src/fosslight_android/_util.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ def write_txt_file(file_name, str_to_write, run_command_dir):
3535
f.write(str_to_write)
3636
f.close()
3737
except Exception as error:
38-
logger.info("Failed to write text:"+file_to_create)
39-
logger.info(str(error))
38+
logger.info(f"Failed to write text:{file_to_create}\n{error}")
4039

4140

4241
def get_path_by_using_find(file_list_to_find, build_out_path, result_file, run_command_dir):
@@ -68,4 +67,4 @@ def get_path_by_using_find(file_list_to_find, build_out_path, result_file, run_c
6867
str_report = search_time + "\r\n" + str_report
6968
write_txt_file(result_file, str_report, run_command_dir)
7069
except Exception as error:
71-
logger.error("FIND Command:"+str(error))
70+
logger.error(f"FIND Command:{error}")

tox.ini

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,16 @@ android_build_log = "android.log"
88

99
[flake8]
1010
max-line-length = 145
11-
exclude = .tox/*
11+
exclude =
12+
.git,
13+
__pycache__,
14+
doc,
15+
resources,
16+
.tox,
17+
script,
18+
site-packages
19+
max-complexity = 10
20+
ignore = C901
1221

1322
[pytest]
1423
filterwarnings = ignore::DeprecationWarning
@@ -26,15 +35,12 @@ commands =
2635
fosslight_android -s {[main]android_src_path} -a {[main]android_build_log} -m
2736

2837
[testenv:release]
29-
changedir = test
3038
deps =
3139
-r{toxinidir}/requirements-dev.txt
3240

3341
commands =
3442
pytest -v --flake8 --ignore=script
3543
fosslight_android -h
36-
fosslight_android -p pkg_test.tar.gz
37-
fosslight_android -b binary.txt -n NOTICE.html -c ok
38-
fosslight_android -b binary.txt -n NOTICE.html -c nok
39-
fosslight_android -d needtoadd-notice.html
40-
44+
fosslight_android -b test/binary.txt -n test/NOTICE.html -c ok
45+
fosslight_android -b test/binary.txt -n test/NOTICE.html -c nok
46+
fosslight_android -d test/needtoadd-notice.html

0 commit comments

Comments
 (0)