From 97d28e070d09ac9be0602a349f0d2d4f6f4b1939 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 14 Jan 2026 22:17:50 +0000
Subject: [PATCH] python3Packages.bugwarrior: 2.0.0 -> 2.1.0

Diff: https://github.com/GothenburgBitFactory/bugwarrior/compare/2.0.0...2.1.0

Changelog: https://github.com/GothenburgBitFactory/bugwarrior/blob/2.1.0/CHANGELOG.rst
---
 .../python-modules/bugwarrior/default.nix     | 60 ++++++++++++-------
 1 file changed, 40 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix
index 93ad071decff..308f66c73e7c 100644
--- a/pkgs/development/python-modules/bugwarrior/default.nix
+++ b/pkgs/development/python-modules/bugwarrior/default.nix
@@ -1,47 +1,60 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  taskwarrior3,
-  versionCheckHook,
-  writableTmpDirAsHomeHook,
+
+  # build-system
   setuptools,
+
+  # dependencies
   click,
   dogpile-cache,
-  importlib-metadata,
   jinja2,
   lockfile,
   pydantic,
   python-dateutil,
-  pytz,
   requests,
   taskw,
+
+  # optional-dependencies
+  # bts
   debianbts,
+  # bugzilla
   python-bugzilla,
+  # gmail
   google-api-python-client,
   google-auth-oauthlib,
+  # jira
   jira,
+  # keyring
   keyring,
+  # trac
   offtrac,
-  pytestCheckHook,
+
+  # tests
   docutils,
   pytest-subtests,
+  pytestCheckHook,
   responses,
   sphinx,
   sphinx-click,
   sphinx-inline-tabs,
+  taskwarrior3,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "bugwarrior";
-  version = "2.0.0";
+  version = "2.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "GothenburgBitFactory";
     repo = "bugwarrior";
-    tag = version;
-    hash = "sha256-VuHTrkxLZmQOxyig2krVU9UZDDbLY08MfB9si08lh3E=";
+    tag = finalAttrs.version;
+    hash = "sha256-Px0yOIdXalIJdXMmjMnpl74aaUzaptS8Esy21NMZH98=";
   };
 
   build-system = [ setuptools ];
@@ -49,17 +62,14 @@ buildPythonPackage rec {
   dependencies = [
     click
     dogpile-cache
-    importlib-metadata
     jinja2
     lockfile
     pydantic
     python-dateutil
-    pytz
     requests
     taskw
   ]
   ++ pydantic.optional-dependencies.email;
-  pythonRemoveDeps = [ "tomli" ];
 
   optional-dependencies = {
     bts = [ debianbts ];
@@ -74,18 +84,18 @@ buildPythonPackage rec {
   };
 
   nativeCheckInputs = [
-    taskwarrior3
-    versionCheckHook
-    writableTmpDirAsHomeHook
-    pytestCheckHook
     docutils
     pytest-subtests
+    pytestCheckHook
     responses
     sphinx
     sphinx-click
     sphinx-inline-tabs
+    taskwarrior3
+    versionCheckHook
+    writableTmpDirAsHomeHook
   ]
-  ++ lib.concatAttrValues optional-dependencies;
+  ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
   disabledTestPaths = [
     # Optional dependencies for these services aren't packaged.
     "tests/test_kanboard.py"
@@ -99,6 +109,16 @@ buildPythonPackage rec {
     "TestValidation"
     "ExampleTest"
     "TestServices"
+
+    # Remove test that depend on ruff to prevent it from having too many consumers
+    "test_ruff_check"
+    "test_ruff_format"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # sphinx.errors.ExtensionError: Could not import extension config
+    # (exception: No module named 'ini2toml')
+    "test_docs_build_without_warning"
+    "test_manpage_build_without_warning"
   ];
 
   pythonImportsCheck = [ "bugwarrior" ];
@@ -106,7 +126,7 @@ buildPythonPackage rec {
   meta = {
     homepage = "https://github.com/GothenburgBitFactory/bugwarrior";
     description = "Sync github, bitbucket, bugzilla, and trac issues with taskwarrior";
-    changelog = "https://github.com/GothenburgBitFactory/bugwarrior/blob/${src.tag}/CHANGELOG.rst";
+    changelog = "https://github.com/GothenburgBitFactory/bugwarrior/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.all;
     mainProgram = "bugwarrior";
@@ -115,4 +135,4 @@ buildPythonPackage rec {
       ryneeverett
     ];
   };
-}
+})