Merge pull request #2746 from ThomasWaldmann/issue-2718

fix borg import issue, add comment, fixes #2718

conftest.py

@@ -4,8 +4,6 @@ import sys
 
 import pytest
 
-import borg.cache
-
 # needed to get pretty assertion failures in unit tests:
 if hasattr(pytest, 'register_assert_rewrite'):
     pytest.register_assert_rewrite('borg.testsuite')
@@ -27,6 +25,9 @@ try:
 except ImportError:
     sys.path = original_path
 
+# note: if anything from borg needs to be imported, do it below this line.
+import borg.cache
+
 
 @pytest.fixture(autouse=True)
 def clean_env(tmpdir_factory, monkeypatch):

setup.py

@@ -270,8 +270,10 @@ setup(
             'borg = borg.archiver:main',
         ]
     },
+    include_package_data=True,
     package_data={
-        'borg': ['paperkey.html']
+        'borg': ['paperkey.html'],
+        'borg.testsuite': ['attic.tar.gz'],
     },
     cmdclass=cmdclass,
     ext_modules=ext_modules,