mirror of
https://github.com/borgbackup/borg.git
synced 2024-12-23 16:26:29 +00:00
remove conftest sys.path hack, fixes #1072
not needed any more as the code is now below src/.
This commit is contained in:
parent
3ce35f6843
commit
24204b181b
1 changed files with 0 additions and 21 deletions
21
conftest.py
21
conftest.py
|
@ -1,24 +1,3 @@
|
||||||
import sys
|
|
||||||
|
|
||||||
# This is a hack to fix path problems because "borg" (the package) is in the source root.
|
|
||||||
# When importing the conftest an "import borg" can incorrectly import the borg from the
|
|
||||||
# source root instead of the one installed in the environment.
|
|
||||||
# The workaround is to remove entries pointing there from the path and check whether "borg"
|
|
||||||
# is still importable. If it is not, then it has not been installed in the environment
|
|
||||||
# and the entries are put back.
|
|
||||||
#
|
|
||||||
# TODO: After moving the package to src/: remove this.
|
|
||||||
|
|
||||||
original_path = list(sys.path)
|
|
||||||
for entry in original_path:
|
|
||||||
if entry == '' or entry.endswith('/borg'):
|
|
||||||
sys.path.remove(entry)
|
|
||||||
|
|
||||||
try:
|
|
||||||
import borg
|
|
||||||
except ImportError:
|
|
||||||
sys.path = original_path
|
|
||||||
|
|
||||||
from borg.logger import setup_logging
|
from borg.logger import setup_logging
|
||||||
|
|
||||||
# Ensure that the loggers exist for all tests
|
# Ensure that the loggers exist for all tests
|
||||||
|
|
Loading…
Reference in a new issue