From baafc5d6b882e2b1767ead728c5758289374fc4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2026 10:02:54 +0000 Subject: [PATCH 1/2] chore(deps-dev): bump jira from 2.0.0 to 3.10.5 Bumps [jira](https://github.com/pycontribs/jira) from 2.0.0 to 3.10.5. - [Release notes](https://github.com/pycontribs/jira/releases) - [Changelog](https://github.com/pycontribs/jira/blob/main/RELEASE.md) - [Commits](https://github.com/pycontribs/jira/compare/2.0.0...3.10.5) --- updated-dependencies: - dependency-name: jira dependency-version: 3.10.5 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c4d9257..b341e84 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ ], "jira": [ "gitpython==3.1.37", - "jira==2.0.0", + "jira==3.10.5", "unidecode==1.4.0", ], "toggle": [ From 9a0510565a9eeb39faab21eeeef53f7dfa7e89a8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 6 Oct 2026 08:36:01 +0000 Subject: [PATCH 2/2] Resolve setup.py merge conflict markers Co-authored-by: matllubos <424409+matllubos@users.noreply.github.com> --- setup.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/setup.py b/setup.py index b320194..35f1784 100644 --- a/setup.py +++ b/setup.py @@ -51,13 +51,8 @@ "gitpython==3.1.62", ], "jira": [ -<<<<<<< HEAD - "gitpython==3.1.37", - "jira==3.10.5", -======= "gitpython==3.1.62", - "jira==2.0.0", ->>>>>>> origin/master + "jira==3.10.5", "unidecode==1.4.0", ], "toggle": [