apio: 0.8.1 -> 0.9.5

https://github.com/FPGAwars/apio/releases/tag/v0.9.5

Also:
- Enable `strictDeps`
- Disable failing test
- Use `pyproject = true` instead of `format = "pyproject"`
- Use `--replace-fail` instead of `--replace`
- Minor improvements
This commit is contained in:
Luflosi
2024-06-22 13:54:48 +02:00
parent 0a548fc62e
commit a52dfe8145
@@ -16,26 +16,27 @@
buildPythonApplication rec {
pname = "apio";
version = "0.8.1";
format = "pyproject";
version = "0.9.5";
pyproject = true;
src = fetchFromGitHub {
owner = "FPGAwars";
repo = "apio";
rev = "v${version}";
sha256 = "sha256-04qAGTzusMT3GsaRxDoXNJK1Mslzxu+ugQclBJx8xzE=";
hash = "sha256-VU4tOszGkw20DWW2SerFsnjFiSkrSwqBcwosGnHJfU8=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'scons==4.2.0' 'scons' \
--replace '==' '>='
--replace-fail 'scons==4.2.0' 'scons' \
--replace-fail '==' '>='
substituteInPlace apio/managers/scons.py --replace \
substituteInPlace apio/managers/scons.py --replace-fail \
'return "tinyprog --libusb --program"' \
'return "${tinyprog}/bin/tinyprog --libusb --program"'
substituteInPlace apio/util.py --replace \
'_command = join(get_bin_dir(), "tinyprog")' \
substituteInPlace apio/util.py --replace-fail \
'_command = apio_bin_dir / "tinyprog"' \
'_command = "${tinyprog}/bin/tinyprog"'
# semantic-version seems to not support version numbers like the one of tinyprog in Nixpkgs (1.0.24.dev114+gxxxxxxx).
@@ -43,7 +44,7 @@ buildPythonApplication rec {
# This leads to an error like "Error: Invalid version string: '1.0.24.dev114+g97f6353'"
# when executing "apio upload" for a TinyFPGA.
# Replace the dot with a dash to work around this problem.
substituteInPlace apio/managers/scons.py --replace \
substituteInPlace apio/managers/scons.py --replace-fail \
'version = semantic_version.Version(pkg_version)' \
'version = semantic_version.Version(pkg_version.replace(".dev", "-dev"))'
'';
@@ -69,8 +70,15 @@ buildPythonApplication rec {
pytestCheckHook
];
disabledTestPaths = [
# This test fails and is also not executed in upstream's CI
"test2"
];
pytestFlagsArray = [ "--offline" ];
strictDeps = true;
meta = with lib; {
description = "Open source ecosystem for open FPGA boards";
mainProgram = "apio";