Skip to content

Fix pyproject dependency setup #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix pyproject dependency setup #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ let
});
in pkgs.python3Packages.buildPythonPackage rec {
pname = "tockloader";
pyproject = true;
version = let
pattern = "^__version__ = ['\"]([^'\"]*)['\"]\n";
in elemAt (match pattern (readFile ./tockloader/_version.py)) 0;
Expand All @@ -90,6 +91,7 @@ in pkgs.python3Packages.buildPythonPackage rec {
pycrypto
siphash
ecdsa
flit-core
] ++ (lib.optional withUnfreePkgs pynrfjprog);

src = ./.;
Expand All @@ -98,8 +100,7 @@ in pkgs.python3Packages.buildPythonPackage rec {
doCheck = withUnfreePkgs;

# Make other dependencies explicitly available as passthru attributes
passthru = {
inherit nrf-command-line-tools;
pynrfjprog = python3Packages.pynrfjprog;
};
passthru = if withUnfreePkgs then {
inherit pynrfjprog nrf-command-line-tools;
} else { };
}
4 changes: 3 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,16 @@ dependencies = [
"crcmod >= 1.7",
"ecdsa >= 0.19.1",
"pycryptodome >= 3.15.0",
"pynrfjprog == 10.19.0",
"pyserial >= 3.0.1",
"siphash >= 0.0.1",
"six >= 1.9.0",
"toml >= 0.10.2",
"tqdm >= 4.45.0 ",
"questionary >= 1.10.0",
]
optional-delendencies = [
"pynrfjprog == 10.22.1",
]

[project.urls]
Home = "https://github.com/tock/tockloader"
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ colorama==0.4.6
crcmod==1.7
ecdsa==0.19.1
pycryptodome==3.22.0
pynrfjprog==10.19.0
pynrfjprog==10.22.1
pyserial==3.5
questionary==2.1.0
setuptools==78.1.1
Expand Down