diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix index 08426ae4bccb..e2500448837a 100644 --- a/pkgs/by-name/fi/fittrackee/package.nix +++ b/pkgs/by-name/fi/fittrackee/package.nix @@ -8,14 +8,14 @@ }: python3Packages.buildPythonApplication rec { pname = "fittrackee"; - version = "0.9.10"; + version = "0.10.2"; pyproject = true; src = fetchFromGitHub { owner = "SamR1"; repo = "FitTrackee"; tag = "v${version}"; - hash = "sha256-004M7Uhsl0K8BX19eVU4NrvBeAyUJx/mBlC/R27y9jg="; + hash = "sha256-ZCQ4Ft2TSjS62DmGDpQ7gG5Spnf82v82i5nnZtg1UmA="; }; build-system = [ @@ -24,9 +24,11 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = [ "authlib" + "flask" "flask-limiter" "flask-migrate" "nh3" + "lxml" "pyopenssl" "pytz" "sqlalchemy" @@ -39,6 +41,8 @@ python3Packages.buildPythonApplication rec { babel click dramatiq + dramatiq-abort + fitdecode flask flask-bcrypt flask-dramatiq @@ -56,8 +60,9 @@ python3Packages.buildPythonApplication rec { pytz shortuuid sqlalchemy - staticmap + staticmap3 ua-parser + xmltodict ] ++ dramatiq.optional-dependencies.redis ++ flask-limiter.optional-dependencies.redis; @@ -92,6 +97,9 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/SamR1/FitTrackee"; changelog = "https://github.com/SamR1/FitTrackee/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ traxys ]; + maintainers = with lib.maintainers; [ + tebriel + traxys + ]; }; } diff --git a/pkgs/development/python-modules/dramatiq-abort/default.nix b/pkgs/development/python-modules/dramatiq-abort/default.nix new file mode 100644 index 000000000000..165a209f21ee --- /dev/null +++ b/pkgs/development/python-modules/dramatiq-abort/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + gevent, + pytestCheckHook, + pytest-cov, + dramatiq, + redis, + setuptools, +}: + +buildPythonPackage rec { + pname = "dramatiq-abort"; + version = "1.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Flared"; + repo = "dramatiq-abort"; + tag = "v${version}"; + hash = "sha256-i5vL9yjQQambG8m6RDByr7/j8+PhDdLsai3pDrH1A4Q="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + dramatiq + ]; + + optional-dependencies = { + all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies)); + gevent = [ gevent ]; + redis = [ redis ]; + }; + + nativeCheckInputs = [ + redis + pytestCheckHook + pytest-cov + ]; + + pythonImportsCheck = [ "dramatiq_abort" ]; + + meta = { + changelog = "https://github.com/Flared/dramatiq-abort/releases/tag/v${version}"; + description = "Dramatiq extension to abort message"; + homepage = "https://github.com/Flared/dramatiq-abort"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ tebriel ]; + }; +} diff --git a/pkgs/development/python-modules/fitdecode/default.nix b/pkgs/development/python-modules/fitdecode/default.nix new file mode 100644 index 000000000000..26897582c6fa --- /dev/null +++ b/pkgs/development/python-modules/fitdecode/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "fitdecode"; + version = "0.10.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "polyvertex"; + repo = "fitdecode"; + tag = "v${version}"; + hash = "sha256-pW1PgJGqFL2reOYYfpGnQ4WoYFKGMNY8iQJzyHYOly8="; + }; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "fitdecode" ]; + + meta = { + changelog = "https://github.com/polyvertex/fitdecode/blob/${src.tag}/HISTORY.rst"; + description = "FIT file parsing and decoding library written in Python3"; + license = lib.licenses.mit; + homepage = "https://github.com/polyvertex/fitdecode"; + maintainers = with lib.maintainers; [ tebriel ]; + }; +} diff --git a/pkgs/development/python-modules/staticmap3/default.nix b/pkgs/development/python-modules/staticmap3/default.nix new file mode 100644 index 000000000000..765b2ddc2d87 --- /dev/null +++ b/pkgs/development/python-modules/staticmap3/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + cachecontrol, + filelock, + mypy, + pillow, + poetry-core, + requests, + ruff, + types-requests, + unittestCheckHook, +}: + +buildPythonPackage rec { + pname = "staticmap3"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "SamR1"; + repo = "staticmap"; + tag = "v${version}"; + hash = "sha256-SMy4yxHA9Z3BFW6kX8vC7WfsmuZMNqocJ9+dJB6zwSs="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + cachecontrol + requests + pillow + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + optional-dependencies = { + filecache = [ filelock ]; + dev = [ + mypy + ruff + types-requests + ]; + }; + + pythonImportsCheck = [ "staticmap3" ]; + + meta = { + description = "Small, python-based library for creating map images with lines and markers"; + homepage = "https://github.com/SamR1/staticmap"; + changelog = "https://github.com/SamR1/staticmap/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ tebriel ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 351b9605b2c3..120419879471 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4207,6 +4207,8 @@ self: super: with self; { dramatiq = callPackage ../development/python-modules/dramatiq { }; + dramatiq-abort = callPackage ../development/python-modules/dramatiq-abort { }; + drawille = callPackage ../development/python-modules/drawille { }; drawilleplot = callPackage ../development/python-modules/drawilleplot { }; @@ -5025,6 +5027,8 @@ self: super: with self; { fitbit = callPackage ../development/python-modules/fitbit { }; + fitdecode = callPackage ../development/python-modules/fitdecode { }; + fitfile = callPackage ../development/python-modules/fitfile { }; fivem-api = callPackage ../development/python-modules/fivem-api { }; @@ -16850,6 +16854,8 @@ self: super: with self; { staticmap = callPackage ../development/python-modules/staticmap { }; + staticmap3 = callPackage ../development/python-modules/staticmap3 { }; + staticvectors = callPackage ../development/python-modules/staticvectors { }; statistics = callPackage ../development/python-modules/statistics { };