Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into napoleon
Browse files Browse the repository at this point in the history
  • Loading branch information
RahulSankhla312 committed Apr 24, 2024
2 parents 5671d7c + bcaf470 commit 2ce601e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion floss/version.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Copyright (C) 2017 Mandiant, Inc. All Rights Reserved.
# caution: this file gets overwritten when building using PyInstaller, don't add required data in here without handling
__version__ = "3.0.1"
__version__ = "3.1.0"
12 changes: 6 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,19 @@ dependencies = [
"tabulate==0.9.0",
"vivisect==1.1.1",
"viv-utils[flirt]==0.7.9",
"pydantic==2.6.0",
"pydantic==2.7.0",
"tqdm==4.66.2",
"networkx==3.1",
"halo==0.0.31",
"rich==13.4.2",
"rich==13.7.1",
"pefile>=2022.5.30",
"binary2strings==0.1.13",
]
dynamic = ["version", "readme"]

[tool.setuptools.dynamic]
version = {attr = "floss.version.__version__"}
readme = {file = "README.md"}
readme = {file = "README.md", content-type = "text/markdown"}

[tool.setuptools]
packages = ["floss", "floss.sigs"]
Expand All @@ -55,8 +55,8 @@ packages = ["floss", "floss.sigs"]
dev = [
"pre-commit==3.5.0",
"pyyaml==6.0.1",
"pytest==8.0.2",
"pytest-sugar==0.9.4",
"pytest==8.1.1",
"pytest-sugar==1.0.0",
"pytest-instafail==0.5.0",
"pytest-cov==4.1.0",
"pycodestyle==2.11.1",
Expand All @@ -69,7 +69,7 @@ dev = [
]
build = [
"pyinstaller==6.5.0",
"setuptools==69.1.1",
"setuptools==69.5.1",
"build==1.0.3"
]

Expand Down

0 comments on commit 2ce601e

Please sign in to comment.