Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

setup.py: fix import error reporting for cythonize import, see #8208 #8211

Merged
merged 2 commits into from
May 12, 2024
Merged

setup.py: fix import error reporting for cythonize import, see #8208 #8211

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29006f7
setup.py: fix import error reporting for cythonize import, see #8208
ThomasWaldmann May 12, 2024
8470730
setup.py: detect noexec build fs issue, see #8208
ThomasWaldmann May 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,13 @@

try:
from Cython.Build import cythonize
except ImportError:
cythonize_import_error_msg = None
except ImportError as exc:
# either there is no Cython installed or there is some issue with it.
cythonize = None
cythonize_import_error_msg = "ImportError: " + str(exc)
if "failed to map segment from shared object" in cythonize_import_error_msg:
cythonize_import_error_msg += " Check if the borg build uses a +exec filesystem."

sys.path += [os.path.dirname(__file__)]
import setup_checksums
Expand Down Expand Up @@ -134,7 +139,9 @@ def __init__(self, *args, **kwargs):

cython_c_files = [fn.replace('.pyx', '.c') for fn in cython_sources]
if not on_rtd and not all(os.path.exists(path) for path in cython_c_files):
raise ImportError('The GIT version of Borg needs Cython. Install Cython or use a released version.')
raise ImportError("The GIT version of Borg needs a working Cython. " +
"Install or fix Cython or use a released borg version. " +
"Importing cythonize failed with: " + cythonize_import_error_msg)


def rm(file):
Expand Down
Loading