diff options
| -rw-r--r-- | .github/workflows/ci.yml | 6 | ||||
| -rw-r--r-- | docs/borg_theme/css/borg.css | 3 | ||||
| -rw-r--r-- | docs/installation.rst | 4 | ||||
| -rw-r--r-- | setup.py | 11 |
4 files changed, 15 insertions, 9 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7445fad5d..da5000990 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,7 +65,7 @@ jobs: env: # Configure pkg-config to use OpenSSL from Homebrew - PKG_CONFIG_PATH: "/usr/local/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH: "/opt/homebrew/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH" TOXENV: ${{ matrix.toxenv }} runs-on: ${{ matrix.os }} @@ -110,14 +110,14 @@ jobs: env: # we already have that in the global env, but something is broken and overwrites that. # so, set it here, again. - PKG_CONFIG_PATH: "/usr/local/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH: "/opt/homebrew/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH" run: | pip install -ve . - name: run pytest via tox env: # we already have that in the global env, but something is broken and overwrites that. # so, set it here, again. - PKG_CONFIG_PATH: "/usr/local/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH: "/opt/homebrew/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH" run: | # do not use fakeroot, but run as root. avoids the dreaded EISDIR sporadic failures. see #2482. #sudo -E bash -c "tox -e py" diff --git a/docs/borg_theme/css/borg.css b/docs/borg_theme/css/borg.css index f8f900b66..66712b418 100644 --- a/docs/borg_theme/css/borg.css +++ b/docs/borg_theme/css/borg.css @@ -52,8 +52,7 @@ h1 { } .container.experimental, -#debugging-facilities, -#borg-recreate { +#debugging-facilities { /* don't change text dimensions */ margin: 0 -30px; /* padding below + border width */ padding: 0 10px; /* 10 px visual margin between edge of text and the border */ diff --git a/docs/installation.rst b/docs/installation.rst index 3546f2739..df2156952 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -316,8 +316,8 @@ Cygwin Use the Cygwin installer to install the dependencies:: - python38 python38-devel python38-pkgconfig - python38-setuptools python38-pip python38-wheel python38-virtualenv + python39 python39-devel python39-pkgconfig + python39-setuptools python39-pip python39-wheel python39-virtualenv libssl-devel libxxhash-devel liblz4-devel libzstd-devel binutils gcc-g++ git make openssh @@ -16,8 +16,13 @@ from setuptools.command.sdist import sdist 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__)] @@ -79,7 +84,9 @@ else: 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) cmdclass = {"build_ext": build_ext, "sdist": Sdist} |