diff --git a/mmengine/version.py b/mmengine/version.py index dbf60e04c3..6a10718798 100644 --- a/mmengine/version.py +++ b/mmengine/version.py @@ -1,6 +1,6 @@ # Copyright (c) OpenMMLab. All rights reserved. -__version__ = '0.10.7' +__version__ = '0.11.0rc0' def parse_version_info(version_str): diff --git a/requirements/runtime_lite.txt b/requirements/runtime_lite.txt index 1c396a63d6..6ef260051b 100644 --- a/requirements/runtime_lite.txt +++ b/requirements/runtime_lite.txt @@ -1,5 +1,6 @@ addict numpy +opencv-python-headless pyyaml regex;sys_platform=='win32' rich diff --git a/setup.py b/setup.py index 4165915e46..5b1f7fc803 100644 --- a/setup.py +++ b/setup.py @@ -111,19 +111,6 @@ def gen_packages_items(): install_requires = parse_requirements('requirements/runtime_lite.txt') else: install_requires = parse_requirements() - try: - # OpenCV installed via conda. - import cv2 # NOQA: F401 - major, minor, *rest = cv2.__version__.split('.') - if int(major) < 3: - raise RuntimeError( - f'OpenCV >=3 is required but {cv2.__version__} is installed') - except ImportError: - # If first not installed install second package - CHOOSE_INSTALL_REQUIRES = [('opencv-python-headless>=3', - 'opencv-python>=3')] - for main, secondary in CHOOSE_INSTALL_REQUIRES: - install_requires.append(choose_requirement(main, secondary)) setup( name='mmengine'