diff options
| -rw-r--r-- | aux-files/python-bugwarrior/gitea-support.patch | 149 | ||||
| -rw-r--r-- | bugwarrior.scm | 17 | ||||
| -rw-r--r-- | machinelearning.scm | 105 | ||||
| -rw-r--r-- | unlustig.scm | 2 |
4 files changed, 202 insertions, 71 deletions
diff --git a/aux-files/python-bugwarrior/gitea-support.patch b/aux-files/python-bugwarrior/gitea-support.patch index 6c2c331..80ccb4b 100644 --- a/aux-files/python-bugwarrior/gitea-support.patch +++ b/aux-files/python-bugwarrior/gitea-support.patch @@ -1,7 +1,7 @@ From 6d7e50b5d1f7e79a685b08045cd91ea0b24f2154 Mon Sep 17 00:00:00 2001 From: wamsachel <wamsachel@gmail.com> Date: Wed, 1 Apr 2020 22:27:52 +0000 -Subject: [PATCH 1/2] (WIP) Adding service support for Gitea +Subject: [PATCH 1/8] (WIP) Adding service support for Gitea Imported from https://github.com/GothenburgBitFactory/bugwarrior/pull/720 --- @@ -568,7 +568,7 @@ index c761a231..b5306da5 100644 From 80cd03d1ff85244f8a2c2beb37eab16af11e1adf Mon Sep 17 00:00:00 2001 From: msglm <msglm@techchud.xyz> Date: Tue, 21 May 2024 04:21:35 -0500 -Subject: [PATCH 2/2] Add basic Gitea support +Subject: [PATCH 2/8] Add basic Gitea support Builds off PR #720 to add gitea integration to bugwarrior. --- @@ -844,7 +844,7 @@ index a4c174c8..445846ff 100644 From 81b3fa0b47db93fb83a54c6727f5ee3c408797c5 Mon Sep 17 00:00:00 2001 From: msglm <msglm@techchud.xyz> Date: Wed, 22 May 2024 20:59:54 -0500 -Subject: [PATCH 3/4] Add basic documentation +Subject: [PATCH 3/8] Add basic documentation mish-mash between the github and gitlab documentation with everything I don't think is supported removed. @@ -987,7 +987,7 @@ index 00000000..6ccf2308 From 1626a36c15013fc42e369cdc9ef98c23e10845c2 Mon Sep 17 00:00:00 2001 From: msglm <msglm@techchud.xyz> Date: Wed, 22 May 2024 21:00:20 -0500 -Subject: [PATCH 4/4] Remove Six usage and clean the codebase +Subject: [PATCH 4/8] Remove Six usage and clean the codebase Suggestions from here are implemented https://github.com/GothenburgBitFactory/bugwarrior/pull/1048#pullrequestreview-2070021239 @@ -1057,7 +1057,7 @@ index 445846ff..341ec617 100644 From 17b725774281e9742b786dbcbcf791f7f3dacf61 Mon Sep 17 00:00:00 2001 From: msglm <msglm@techchud.xyz> Date: Thu, 23 May 2024 05:03:39 -0500 -Subject: [PATCH 5/6] Intake Critique and simplify +Subject: [PATCH 5/8] Intake Critique and simplify Remove user+pass auth, token only now. Added issue API Querying for writing custom queries @@ -1367,7 +1367,7 @@ index 341ec617..28a92e96 100644 From 3eb6e743c7ee4c7892525c05d880f5d05d3f8600 Mon Sep 17 00:00:00 2001 From: msglm <msglm@techchud.xyz> Date: Thu, 23 May 2024 05:13:33 -0500 -Subject: [PATCH 6/6] Documentation for previous commit +Subject: [PATCH 6/8] Documentation for previous commit --- bugwarrior/docs/services/gitea.rst | 31 +++++++++++++++++++++++++++--- @@ -1424,3 +1424,140 @@ index 6ccf2308..19e0930a 100644 Provided UDA Fields ------------------- + +From 439c3f02338a43dcd0309fe297a706f0232a6138 Mon Sep 17 00:00:00 2001 +From: msglm <msglm@techchud.xyz> +Date: Wed, 19 Feb 2025 03:32:02 -0600 +Subject: [PATCH 7/8] Update to modern standards + +--- + bugwarrior/services/gitea.py | 37 +++++++++++++++--------------------- + 1 file changed, 15 insertions(+), 22 deletions(-) + +diff --git a/bugwarrior/services/gitea.py b/bugwarrior/services/gitea.py +index 28a92e96..8814633a 100644 +--- a/bugwarrior/services/gitea.py ++++ b/bugwarrior/services/gitea.py +@@ -3,9 +3,9 @@ + """Bugwarrior service support class for Gitea + + Available classes: +-- GiteaClient(ServiceClient): Constructs Gitea API strings ++- GiteaClient(Service): Constructs Gitea API strings + - GiteaIssue(Issue): TaskWarrior Interface +-- GiteaService(IssueService): Engine for firing off requests ++- GiteaService(Issue): Engine for firing off requests + + Todo: + * Add token support +@@ -25,7 +25,7 @@ + from jinja2 import Template + + from bugwarrior import config +-from bugwarrior.services import IssueService, Issue, ServiceClient ++from bugwarrior.services import Issue, Service, Client + + log = logging.getLogger(__name__) # pylint: disable-msg=C0103 + +@@ -62,7 +62,7 @@ def get(self, key, default=None, to_type=None): + return default + + +-class GiteaClient(ServiceClient): ++class GiteaClient(Client): + """Builds Gitea API strings + Args: + host (str): remote gitea server +@@ -263,8 +263,11 @@ class GiteaIssue(Issue): + @staticmethod + def _normalize_label_to_tag(label): + return re.sub(r'[^a-zA-Z0-9]', '_', label) ++ def get_tags(self): ++ labels = [label['name'] for label in self.record.get('labels', [])] ++ return self.get_tags_from_labels(labels) + +- def to_taskwarrior(self): ++ def to_taskwarrior(self) -> dict: + milestone = self.record['milestone'] + if milestone: + milestone = milestone['title'] +@@ -302,31 +305,18 @@ def to_taskwarrior(self): + self.NAMESPACE: self.extra['namespace'], + self.STATE: self.record.get('state', '') + } +- def get_tags(self): +- labels = [label['name'] for label in self.record.get('labels', [])] +- return self.get_tags_from_labels(labels) +- +- def get_default_description(self): +- log.info('In get_default_description') +- return self.build_default_description( +- title=self.record['title'], +- url=self.get_processed_url(self.record['url']), +- number=self.record['number'], +- cls=self.extra['type'], +- ) +- + + def get_default_description(self): + log.info('In get_default_description') + return self.build_default_description( + title=self.record['title'], +- url=self.get_processed_url(self.record['url']), ++ url=self.record['url'], + number=self.record['number'], + cls=self.extra['type'], + ) + + +-class GiteaService(IssueService): ++class GiteaService(Service): + ISSUE_CLASS = GiteaIssue + CONFIG_SCHEMA = GiteaConfig + CONFIG_PREFIX = 'gitea' +@@ -455,7 +445,7 @@ def annotations(self, tag, issue, issue_obj): + ) for c in comments) + annotations_result = self.build_annotations( + annotations, +- issue_obj.get_processed_url(url)) ++ url) + log.info('annotations: {}'.format(annotations_result)) + return annotations_result + +@@ -573,6 +563,9 @@ def issues(self): + 'annotations': [issue['body']], + 'namespace': self.username, + } +- issue_obj.update_extra(extra) ++ issue_obj.extra.update(extra) + yield issue_obj + ++ ++ ++ + +From db4c47837d15cb126cb97a97f72db061052db5ab Mon Sep 17 00:00:00 2001 +From: msglm <msglm@techchud.xyz> +Date: Wed, 19 Feb 2025 03:34:16 -0600 +Subject: [PATCH 8/8] Do not yield on AttributeError + +Previously, when there is an AttributeError in a service, the service +will return its issue object instead of a dictionary representation of +the issue. This fixes it by raising an error if this happens. +--- + bugwarrior/collect.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bugwarrior/collect.py b/bugwarrior/collect.py +index 8d435461..34af838a 100644 +--- a/bugwarrior/collect.py ++++ b/bugwarrior/collect.py +@@ -100,7 +100,7 @@ def aggregate_issues(conf, main_section, debug): + log.error(f"Aborted [{target}] due to critical error.") + yield ('SERVICE FAILED', target) + continue +- yield issue ++ raise + + log.info("Done aggregating remote issues.") + diff --git a/bugwarrior.scm b/bugwarrior.scm index 727fde1..bb1c827 100644 --- a/bugwarrior.scm +++ b/bugwarrior.scm @@ -55,7 +55,7 @@ mechanism of @code{dogpile}.") (define-public python-bugwarrior (package (name "python-bugwarrior") - (version "1bef94c3ec29c7d1b33035dc795544da6a49fb3b") + (version "ce92e3a4f05f5d78e13d2924c27d8743813fb2f9") (source (origin (method git-fetch) @@ -63,7 +63,7 @@ mechanism of @code{dogpile}.") (url "https://github.com/GothenburgBitFactory/bugwarrior.git") (commit version))) (sha256 - (base32 "1y7qkyzd53yg472d2gl7kxgw2yrikmd17iw31zwvidfsf01p3hwh")) + (base32 "0v96zg2ga8cw84zx12dvh3m995adf5k40x9cs53waxranxvm4k0a")) (modules '((guix build utils))) (patches (search-patches "aux-files/python-bugwarrior/gitea-support.patch")) @@ -88,7 +88,9 @@ mechanism of @code{dogpile}.") python-tomli python-pygobject python-notify2 - python-pydantic-2.7.1 + python-pydantic-2 + python-google-api-client + python-google-auth-oauthlib )) (native-inputs (list python-email-validator-2.1.1)) (home-page "http://github.com/ralphbean/bugwarrior") @@ -122,15 +124,6 @@ mechanism of @code{dogpile}.") validation library.") (license license:unlicense))) - (define-public python-pydantic-2.7.1 - (package - (inherit python-pydantic) - (name "python-email-validator") - (inputs (modify-inputs (package-inputs python-pydantic) - (prepend python-email-validator-2.1.1))) - (version "2.1.1") - )) - (define-public python-taskw (package (name "python-taskw") diff --git a/machinelearning.scm b/machinelearning.scm index 52d5bf0..da20980 100644 --- a/machinelearning.scm +++ b/machinelearning.scm @@ -194,7 +194,7 @@ (define-public stable-diffusion-cpp (package (name "stable-diffusion-cpp") - (version "5eb15ef4d022bef4a391de4f5f6556e81fbb5024") + (version "10feacf031cccc19b7f1257048ec32b778a01dbf") (source (origin (method git-fetch) @@ -205,9 +205,9 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0q6nmp1dqrlw56b9z887fdnim54vwpn3sw0l057ikmf4ffwdjs8v")))) + "1l66r2xxcrlfqkl9dl8xw30rv99nlvzdzfyg4n4zlx6xmbbr5d9f")))) (build-system cmake-build-system) - (inputs (list openblas)) + (inputs (list openblas git-minimal )) (arguments '( #:tests? #f @@ -235,56 +235,57 @@ (let ((bin (string-append (assoc-ref outputs "out") "/bin/sd"))) (when (file-exists? bin) (rename-file bin (string-append (dirname bin) "/sd-vulkan"))))))))) - (inputs (list vulkan-headers vulkan-loader shaderc libomp)))) + (inputs (list vulkan-headers vulkan-loader shaderc libomp git-minimal)) + )) (define-public exiv2-staticlibs (package (inherit exiv2) - (arguments - `(#:test-target "tests" - #:configure-flags (list "-DEXIV2_BUILD_UNIT_TESTS=ON" - ;; darktable needs BMFF to support - ;; CR3 files. - "-DEXIV2_ENABLE_BMFF=ON") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-gcc-reference - (lambda _ - ;; _GLIBCXX_ASSERTIONS brings reference to GCC. - (substitute* "cmake/compilerFlags.cmake" - (("add_compile_options[(]-Wp,-D_GLIBCXX_ASSERTIONS[)]") - "")))) + (arguments + `(#:test-target "tests" + #:configure-flags (list "-DEXIV2_BUILD_UNIT_TESTS=ON" + ;; darktable needs BMFF to support + ;; CR3 files. + "-DEXIV2_ENABLE_BMFF=ON") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-gcc-reference + (lambda _ + ;; _GLIBCXX_ASSERTIONS brings reference to GCC. + (substitute* "cmake/compilerFlags.cmake" + (("add_compile_options[(]-Wp,-D_GLIBCXX_ASSERTIONS[)]") + "")))) - ,@(if (or (target-ppc64le?) - (target-aarch64?) - (target-riscv64?)) - '((add-after 'unpack 'adjust-tests - (lambda _ - ;; Adjust test on ppc64 and aarch64, where no exception - ;; is raised and thus the return value is different. See - ;; <https://github.com/Exiv2/exiv2/issues/365> and - ;; <https://github.com/Exiv2/exiv2/issues/933>. - (substitute* "tests/bugfixes/github/test_CVE_2018_12265.py" - (("\\$uncaught_exception \\$addition_overflow_message\n") "") - (("retval = \\[1\\]") "retval = [0]"))))) - '())))) + ,@(if (or (target-ppc64le?) + (target-aarch64?) + (target-riscv64?)) + '((add-after 'unpack 'adjust-tests + (lambda _ + ;; Adjust test on ppc64 and aarch64, where no exception + ;; is raised and thus the return value is different. See + ;; <https://github.com/Exiv2/exiv2/issues/365> and + ;; <https://github.com/Exiv2/exiv2/issues/933>. + (substitute* "tests/bugfixes/github/test_CVE_2018_12265.py" + (("\\$uncaught_exception \\$addition_overflow_message\n") "") + (("retval = \\[1\\]") "retval = [0]"))))) + '())))) )) (define-public stable-diffusion-cpp-gui-wx (package - (name "stable-diffusion-cpp-gui-wx") - (version "6f604f836961002fbce72a205c1e6cc6d6a531e9") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/fszontagh/sd.cpp.gui.wx") - (recursive? #t) - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "035zqhjnwdb07ag4chj9zijl70wk81kinqwlnvs9ixb2fzl1z374")))) + (name "stable-diffusion-cpp-gui-wx") + (version "6f604f836961002fbce72a205c1e6cc6d6a531e9") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fszontagh/sd.cpp.gui.wx") + (recursive? #t) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "035zqhjnwdb07ag4chj9zijl70wk81kinqwlnvs9ixb2fzl1z374")))) (build-system cmake-build-system) (arguments '( @@ -294,17 +295,17 @@ "-DSD_AVX=ON" "-DWXWIDGETS_VERSION=3.2.5" (string-append "-DWXWIDGETS_EXTRA_PATH=" (assoc-ref %build-inputs "wxwidgets")) - ) + ) #:substitutable? #f ) ) - (native-inputs (list pkg-config)) - (inputs (list openblas openssl curl exiv2-staticlibs wxwidgets gtk+ pangomm git stable-diffusion-cpp)) - (synopsis "cross-platform GUI for Stable Diffusion C++") - (description "A cross-platform GUI for Stable Diffusion C++, built using wxWidgets.") - (home-page "https://stable-diffusion.fsociety.hu") - (license license:expat) - )) + (native-inputs (list pkg-config)) + (inputs (list openblas openssl curl exiv2-staticlibs wxwidgets gtk+ pangomm git stable-diffusion-cpp)) + (synopsis "cross-platform GUI for Stable Diffusion C++") + (description "A cross-platform GUI for Stable Diffusion C++, built using wxWidgets.") + (home-page "https://stable-diffusion.fsociety.hu") + (license license:expat) + )) (define-public bark-cpp (package diff --git a/unlustig.scm b/unlustig.scm index 549dde4..ba83092 100644 --- a/unlustig.scm +++ b/unlustig.scm @@ -2167,7 +2167,7 @@ See winapi for types and constants.") (description "This package provides tools for concurrent programming.") (license (list license:asl2.0 license:expat)))) -(define-public rust-xml-rs-0.3.8-yanked +(define-public rust-xml-rs-0.3 (package (name "rust-xml-rs") (version "0.3.8") ; This version was yanked! |