pantalaimon: refactor

- use default callPackage and consume python3Packages
- use pep517 builder
- relax matrix-nio constraint
- add missing cachetools dependency
- expose optional-dependencies
- use pytestCheckHook
This commit is contained in:
Martin Weinelt 2024-03-20 23:55:12 +01:00
parent 1ef89220b2
commit e9ee6bc61d
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
2 changed files with 38 additions and 34 deletions

View File

@ -1,31 +1,41 @@
{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder, { lib
attrs, aiohttp, appdirs, click, keyring, logbook, peewee, janus, , stdenv
prompt-toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3, , python3Packages
setuptools, installShellFiles, nixosTests, , fetchFromGitHub
, installShellFiles
pytest, faker, pytest-aiohttp, aioresponses, , nixosTests
, enableDbusUi ? true
enableDbusUi ? true
}: }:
buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "pantalaimon"; pname = "pantalaimon";
version = "0.10.5"; version = "0.10.5";
pyproject = true;
disabled = pythonOlder "3.6";
# pypi tarball miss tests # pypi tarball miss tests
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "matrix-org"; owner = "matrix-org";
repo = pname; repo = "pantalaimon";
rev = version; rev = version;
sha256 = "sha256-yMhE3wKRbFHoL0vdFR8gMkNU7Su4FHbAwKQYADaaWpk="; hash = "sha256-yMhE3wKRbFHoL0vdFR8gMkNU7Su4FHbAwKQYADaaWpk=";
}; };
propagatedBuildInputs = [ build-system = [
installShellFiles
] ++ (with python3Packages; [
setuptools
pythonRelaxDepsHook
]);
pythonRelaxDeps = [
"matrix-nio"
];
dependencies = with python3Packages; [
aiohttp aiohttp
appdirs appdirs
attrs attrs
cachetools
click click
janus janus
keyring keyring
@ -33,34 +43,28 @@ buildPythonApplication rec {
matrix-nio matrix-nio
peewee peewee
prompt-toolkit prompt-toolkit
setuptools
] ]
++ matrix-nio.optional-dependencies.e2e ++ matrix-nio.optional-dependencies.e2e
++ lib.optionals enableDbusUi [ ++ lib.optionals enableDbusUi optional-dependencies.ui;
dbus-python
notify2 optional-dependencies.ui = with python3Packages; [
pygobject3 dbus-python
pydbus notify2
pygobject3
pydbus
]; ];
nativeCheckInputs = [ nativeCheckInputs = with python3Packages; [
pytest aioresponses
faker faker
pytest-aiohttp pytest-aiohttp
aioresponses pytestCheckHook
]; ]
++ lib.flatten (lib.attrValues optional-dependencies);
nativeBuildInputs = [
installShellFiles
];
# darwin has difficulty communicating with server, fails some integration tests # darwin has difficulty communicating with server, fails some integration tests
doCheck = !stdenv.isDarwin; doCheck = !stdenv.isDarwin;
checkPhase = ''
pytest
'';
postInstall = '' postInstall = ''
installManPage docs/man/*.[1-9] installManPage docs/man/*.[1-9]
''; '';

View File

@ -34039,9 +34039,9 @@ with pkgs;
paprefs = callPackage ../applications/audio/paprefs { }; paprefs = callPackage ../applications/audio/paprefs { };
pantalaimon = python3Packages.callPackage ../applications/networking/instant-messengers/pantalaimon { }; pantalaimon = callPackage ../applications/networking/instant-messengers/pantalaimon { };
pantalaimon-headless = python3Packages.callPackage ../applications/networking/instant-messengers/pantalaimon { pantalaimon-headless = callPackage ../applications/networking/instant-messengers/pantalaimon {
enableDbusUi = false; enableDbusUi = false;
}; };