fix formatting, pin ruff version, remove rdp refs
This commit is contained in:
parent
c15e6cb082
commit
4613e8c2b3
@ -1,14 +0,0 @@
|
|||||||
{ pkgs }:
|
|
||||||
final: prev: {
|
|
||||||
|
|
||||||
rad-development-python = prev.rad-development-python.overridePythonAttrs (
|
|
||||||
_: {
|
|
||||||
src = pkgs.fetchgit {
|
|
||||||
url = "https://github.com/RAD-Development/rad-development-python";
|
|
||||||
rev = "f919535e1eb39b78f77c3c2b8ccee9244fd7fc92";
|
|
||||||
sha256 = "0vba1d184ks4r78d9z252paxpfwvwq4h9fvhmsavby1rr2dr1976";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
}
|
|
10
flake.nix
10
flake.nix
@ -41,7 +41,6 @@
|
|||||||
self,
|
self,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
flake-utils,
|
flake-utils,
|
||||||
pre-commit-hooks,
|
|
||||||
poetry2nix,
|
poetry2nix,
|
||||||
...
|
...
|
||||||
}@inputs:
|
}@inputs:
|
||||||
@ -51,19 +50,16 @@
|
|||||||
# see https://github.com/nix-community/poetry2nix/tree/master#api for more functions and examples.
|
# see https://github.com/nix-community/poetry2nix/tree/master#api for more functions and examples.
|
||||||
pkgs = nixpkgs.legacyPackages.${system}.extend poetry2nix.overlays.default;
|
pkgs = nixpkgs.legacyPackages.${system}.extend poetry2nix.overlays.default;
|
||||||
|
|
||||||
pyOverrides = _final: prev: {
|
overrides = pkgs.poetry2nix.overrides.withDefaults (
|
||||||
|
_final: prev: {
|
||||||
# prefer binary wheels instead of source distributions for rust based dependencies
|
# prefer binary wheels instead of source distributions for rust based dependencies
|
||||||
# avoids needing to build them from source. technically a security risk
|
# avoids needing to build them from source. technically a security risk
|
||||||
polars = prev.polars.override { preferWheel = true; };
|
polars = prev.polars.override { preferWheel = true; };
|
||||||
ruff = prev.ruff.override { preferWheel = true; };
|
ruff = prev.ruff.override { preferWheel = true; };
|
||||||
greenlet = prev.greenlet.override { preferWheel = true; };
|
greenlet = prev.greenlet.override { preferWheel = true; };
|
||||||
sqlalchemy = prev.sqlalchemy.override { preferWheel = true; };
|
sqlalchemy = prev.sqlalchemy.override { preferWheel = true; };
|
||||||
};
|
}
|
||||||
|
|
||||||
overlay = pkgs.lib.composeExtensions pyOverrides (
|
|
||||||
import ./.poetry-git-overlay.nix { inherit pkgs; }
|
|
||||||
);
|
);
|
||||||
overrides = pkgs.poetry2nix.overrides.withDefaults overlay;
|
|
||||||
|
|
||||||
poetryConfig = {
|
poetryConfig = {
|
||||||
inherit overrides;
|
inherit overrides;
|
||||||
|
@ -2,7 +2,6 @@ import argparse
|
|||||||
|
|
||||||
|
|
||||||
def parse_inputs() -> argparse.Namespace:
|
def parse_inputs() -> argparse.Namespace:
|
||||||
|
|
||||||
parser = argparse.ArgumentParser()
|
parser = argparse.ArgumentParser()
|
||||||
parser.add_argument("flake_path", metavar="flake-path", help="path to flake to evaluate")
|
parser.add_argument("flake_path", metavar="flake-path", help="path to flake to evaluate")
|
||||||
parser.add_argument("--keep-hydra", action="store_true", help="allow evaluating Hydra jobs")
|
parser.add_argument("--keep-hydra", action="store_true", help="allow evaluating Hydra jobs")
|
||||||
|
@ -18,6 +18,7 @@ def configure_logger(level: str = "INFO") -> None:
|
|||||||
handlers=[logging.StreamHandler(sys.stdout)],
|
handlers=[logging.StreamHandler(sys.stdout)],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def partition(predicate, iterable):
|
def partition(predicate, iterable):
|
||||||
"""Partition entries into false entries and true entries.
|
"""Partition entries into false entries and true entries.
|
||||||
|
|
||||||
@ -27,6 +28,7 @@ def partition(predicate, iterable):
|
|||||||
t1, t2 = itertools.tee(iterable)
|
t1, t2 = itertools.tee(iterable)
|
||||||
return itertools.filterfalse(predicate, t1), filter(predicate, t2)
|
return itertools.filterfalse(predicate, t1), filter(predicate, t2)
|
||||||
|
|
||||||
|
|
||||||
def bash_wrapper(command: str, path: str = ".") -> tuple[str, str, int]:
|
def bash_wrapper(command: str, path: str = ".") -> tuple[str, str, int]:
|
||||||
"""Execute a bash command and capture the output.
|
"""Execute a bash command and capture the output.
|
||||||
|
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
from flupdt.flake_show import get_derivations
|
from flupdt.flake_show import get_derivations
|
||||||
from flupdt.cli import parse_inputs
|
from flupdt.cli import parse_inputs
|
||||||
from flupdt.flake_eval import evaluate_output
|
from flupdt.flake_eval import evaluate_output
|
||||||
|
from flupdt.common import configure_logger
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
|
||||||
@ -12,7 +13,7 @@ def main() -> None:
|
|||||||
:returns: None
|
:returns: None
|
||||||
|
|
||||||
"""
|
"""
|
||||||
rd.configure_logger("INFO")
|
configure_logger("INFO")
|
||||||
args = parse_inputs()
|
args = parse_inputs()
|
||||||
flake_path = args.flake_path
|
flake_path = args.flake_path
|
||||||
derivations, hydra_jobs = rd.partition(
|
derivations, hydra_jobs = rd.partition(
|
||||||
|
1381
poetry.lock
generated
1381
poetry.lock
generated
File diff suppressed because it is too large
Load Diff
@ -14,14 +14,13 @@ packages = [{ include = "flupdt" }]
|
|||||||
[tool.poetry.dependencies]
|
[tool.poetry.dependencies]
|
||||||
python = "^3.11"
|
python = "^3.11"
|
||||||
sqlalchemy = "^2.0.31"
|
sqlalchemy = "^2.0.31"
|
||||||
rad_development_python = {git = "https://github.com/RAD-Development/rad-development-python", branch = "feature/nix"}
|
|
||||||
|
|
||||||
[tool.poetry.scripts]
|
[tool.poetry.scripts]
|
||||||
flupdt = "flupdt.main:main"
|
flupdt = "flupdt.main:main"
|
||||||
flake-update-diff = "flupdt.main:main"
|
flake-update-diff = "flupdt.main:main"
|
||||||
|
|
||||||
[tool.poetry.group.dev.dependencies]
|
[tool.poetry.group.dev.dependencies]
|
||||||
ruff = "0.5.5"
|
ruff = "0.5.1"
|
||||||
|
|
||||||
|
|
||||||
[build-system]
|
[build-system]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user