From 6da274af02af03c6e19700192269c5d8befe4bfc Mon Sep 17 00:00:00 2001 From: jacobowitz Date: Tue, 25 Jan 2022 19:18:16 +0100 Subject: [PATCH] Revert "fix: rescue docarray in setup" This reverts commit 20d28a8b28533f45bef0dd21a4eda4b48265ae1b. --- setup.py | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/setup.py b/setup.py index 1b3e03f55394b..78d42c6735fc2 100644 --- a/setup.py +++ b/setup.py @@ -74,32 +74,11 @@ def add_ac(k, v): pass -def rescue_docarray(): - """Upgrading from 2.x to 3.x is broken (https://github.com/jina-ai/jina/issues/4194) - This function checks if docarray is broken and if so attempts to rescue it - """ - try: - import docarray as docarray - - __docarray_version__ = docarray.__version__ - - except AttributeError: - # Being here means docarray is not installed correctly, attempt to reinstall it - # as recommended by pip https://pip.pypa.io/en/latest/user_guide/#using-pip-from-your-program - import subprocess - - subprocess.check_call( - [sys.executable, '-m', 'pip', 'uninstall', '--yes', 'docarray'] - ) - subprocess.check_call([sys.executable, '-m', 'pip', 'install', 'docarray']) - - class PostDevelopCommand(develop): """Post-installation for development mode.""" def run(self): develop.run(self) - rescue_docarray() register_ac() @@ -108,7 +87,6 @@ class PostInstallCommand(install): def run(self): install.run(self) - rescue_docarray() register_ac()