#3 Work with click 8
Merged 2 years ago by frantisekz. Opened 2 years ago by churchyard.
rpms/ churchyard/python-celery click8  into  rawhide

file added
+32
@@ -0,0 +1,32 @@ 

+ diff --git a/celery/bin/base.py b/celery/bin/base.py

+ index 78d6371..4a69b7b 100644

+ --- a/celery/bin/base.py

+ +++ b/celery/bin/base.py

+ @@ -137,10 +137,10 @@ def handle_preload_options(f):

+  class CeleryOption(click.Option):

+      """Customized option for Celery."""

+  

+ -    def get_default(self, ctx):

+ +    def get_default(self, ctx, **kwargs):

+          if self.default_value_from_context:

+              self.default = ctx.obj[self.default_value_from_context]

+ -        return super().get_default(ctx)

+ +        return super().get_default(ctx, **kwargs)

+  

+      def __init__(self, *args, **kwargs):

+          """Initialize a Celery option."""

+ diff --git a/requirements/default.txt b/requirements/default.txt

+ index afa9d16..59f77b7 100644

+ --- a/requirements/default.txt

+ +++ b/requirements/default.txt

+ @@ -2,8 +2,8 @@ pytz>dev

+  billiard>=3.6.4.0,<4.0

+  kombu>=5.1.0,<6.0

+  vine>=5.0.0,<6.0

+ -click>=7.0,<8.0

+ +click>=7.0,<9.0

+  click-didyoumean>=0.0.3

+ -click-repl>=0.1.6

+ +click-repl>=0.2.0

+  click-plugins>=1.1.1

+  setuptools

file modified
+11 -2
@@ -1,6 +1,6 @@ 

  Name:           python-celery

  Version:        5.1.1

- Release:        1%{?dist}

+ Release:        2%{?dist}

  BuildArch:      noarch

  

  License:        BSD
@@ -10,6 +10,11 @@ 

  Source1:        pytest.ini

  Summary:        Distributed Task Queue

  

+ # Support click 8

+ # https://github.com/celery/celery/pull/6801

+ # https://github.com/celery/celery/pull/6801#issuecomment-871208651

+ Patch1:         click8.patch

+ 

  %description

  An open source asynchronous task queue/job queue based on

  distributed message passing. It is focused on real-time
@@ -68,7 +73,7 @@ 

  %{desc}

  

  %prep

- %autosetup -n celery-%{version}

+ %autosetup -p1 -n celery-%{version}

  

  %build

  %py3_build
@@ -120,6 +125,10 @@ 

  %{python3_sitelib}/celery

  

  %changelog

+ * Wed Jun 30 2021 Miro Hrončok <mhroncok@redhat.com> - 5.1.1-2

+ - Work with click 8

+ - Fixes rhbz#1977508

+ 

  * Wed Jun 23 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 5.1.1-1

  - Celery 5.1.1

  

This builds but I have not tested it manually in any way.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1977508

This seems a bit off, in the PR, click-didyoumean stays at the same version, click-repl gets bumped (ref. https://github.com/celery/celery/pull/6801/files#diff-8a5e2e65dfa49c67096312e68e6620b20055b720b11bcdf44aa003ff02103af2R7 )

Thanks, apart from that one inconsistency, it seems okay, I'll give it a try in the morning just to be sure.

rebased onto 4e4e40c

2 years ago

That was my bad manually applying the change on a wrong package :)

Thanks for noticing. Amended.

Gave it a quick testing with some basic cmdline params and oraculum. Works well, thanks!

(Tested with click 8 ofc, which still don't seem to have reached the repos or my mirror due to some Rawhide DOOMED status).

Pull-Request has been merged by frantisekz

2 years ago
Metadata