Skip to content

Commit

Permalink
build runs now
Browse files Browse the repository at this point in the history
  • Loading branch information
fzakaria committed Aug 30, 2023
1 parent 033cc2d commit 8a61728
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ sqlelf.egg-info/
*.pyc
.vscode/
dist/
result
5 changes: 3 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@
inherit system;
overlays = [ poetry2nix.overlay (import ./overlay.nix) ];
};
in {
in
{
packages = {
sqlelf = pkgs.sqlelf;
default = pkgs.sqlelf;
};

devShell = pkgs.sqlelf-env.env.overrideAttrs
(oldAttrs: { buildInputs = [ pkgs.poetry pkgs.sqlite ]; });
(oldAttrs: { buildInputs = with pkgs; [ poetry pyright nixpkgs-fmt ]; });
});
}
19 changes: 18 additions & 1 deletion poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ python = ">=3.10"
capstone = "^5.0.1"
lief = "^0.13.2"
apsw = "^3.43.0.0"
# TODO(fzakaria): Would love to specify this as an exact version
# but I was getting weird failures with `nix build`
# ERROR: Could not find a version that satisfies the requirement setuptools<61.0.0,>=60.0.0 (from sqlelf) (from versions: none)
# ERROR: No matching distribution found for setuptools<61.0.0,>=60.0.0
setuptools = "*"

[tool.poetry.group.dev.dependencies]
black = "^23.7.0"
Expand All @@ -28,10 +33,6 @@ sqlelf = "sqlelf.cli:start"
skip = [".git", "result"]
profile = "black"

[tool.flake8]
extend-ignore = "E203"
max-line-length = 88

[tool.pytest.ini_options]
addopts = ""

Expand Down
3 changes: 3 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[flake8]
extend-ignore = E203
max-line-length = 88
2 changes: 1 addition & 1 deletion sqlelf/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def start():
args = parser.parse_args()

# Iterate through our arguments and if one of them is a directory explode it out
filenames = reduce(
filenames: list[str] = reduce(
lambda a, b: a + b,
map(
lambda dir: [os.path.join(dir, f) for f in os.listdir(dir)]
Expand Down

0 comments on commit 8a61728

Please sign in to comment.