Skip to content

Commit 47286d4

Browse files
committed
release: temporarily unpin kombu to unblock conda release
1 parent 07bbd33 commit 47286d4

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

setup.cfg

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ package_dir=
2424
=src
2525
packages = find:
2626
install_requires=
27-
kombu>=5.3.0a1
28-
celery>=5.3.0a1,<6
27+
celery>=5.2.0,<6
28+
kombu
2929
funcy>=1.17
3030
shortuuid>=1.0.8
3131
pywin32>=225; sys_platform == 'win32'
@@ -39,6 +39,7 @@ docs =
3939
mkdocstrings-python==0.7.0
4040
tests =
4141
flaky==3.7.0
42+
kombu>=5.3.0a1
4243
pytest==7.1.2
4344
pytest-sugar==0.9.4
4445
pytest-cov==3.0.0

src/dvc_task/app/filesystem.py

+14
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,24 @@
88
from kombu.utils.encoding import bytes_to_str
99
from kombu.utils.json import loads
1010

11+
from ..exceptions import DvcTaskError
1112
from ..utils import makedirs, remove, unc_path
1213

1314
logger = logging.getLogger(__name__)
1415

1516

17+
def _check_kombu_version():
18+
# pylint: disable=import-outside-toplevel
19+
from kombu import VERSION, __version__
20+
21+
# FSApp requires kombu >= 5.3.0
22+
if VERSION.major < 5 or (VERSION.major == 5 and VERSION.minor < 3):
23+
raise DvcTaskError(
24+
f"Unsupported Kombu version '{__version__}' found. "
25+
"dvc-task FSApp requires Kombu >=5.3.0."
26+
)
27+
28+
1629
def _get_fs_config(
1730
wdir: str,
1831
mkdir: bool = False,
@@ -78,6 +91,7 @@ def __init__(
7891
7992
Additional arguments will be passed into the Celery constructor.
8093
"""
94+
_check_kombu_version()
8195
super().__init__(*args, **kwargs)
8296
self.wdir = wdir or os.getcwd()
8397
self.conf.update(

0 commit comments

Comments
 (0)