Merge pull request #1031 from priv-kweihmann/move-test-2nd

[RFC/WIP] move tests and avoid packaging them

Author: Byron

Diff for: .deepsource.toml

@@ -1,7 +1,7 @@
 version = 1
 
 test_patterns = [
-  'git/test/**/test_*.py'
+  'test/**/test_*.py'
 ]
 
 exclude_patterns = [

Diff for: .gitattributes

@@ -1,2 +1,2 @@
-git/test/fixtures/* eol=lf
+test/fixtures/* eol=lf
 init-tests-after-clone.sh

Diff for: .github/workflows/pythonpackage.yml

@@ -40,7 +40,7 @@ jobs:
         git config --global user.name "Travis Runner"
         # If we rewrite the user's config by accident, we will mess it up
         # and cause subsequent tests to fail
-        cat git/test/fixtures/.gitconfig >> ~/.gitconfig
+        cat test/fixtures/.gitconfig >> ~/.gitconfig
     - name: Lint with flake8
       run: |
         set -x

Diff for: .travis.yml

@@ -36,7 +36,7 @@ script:
   # Make sure we limit open handles to see if we are leaking them
   - ulimit -n 128
   - ulimit -n
-  - coverage run --omit="git/test/*" -m unittest --buffer
+  - coverage run --omit="test/*" -m unittest --buffer
   - coverage report
   - if [ "$TRAVIS_PYTHON_VERSION" == '3.5' ]; then cd doc && make html; fi
   - if [ "$TRAVIS_PYTHON_VERSION" == '3.6' ]; then flake8 --ignore=W293,E265,E266,W503,W504,E731; fi

Diff for: MANIFEST.in

@@ -5,11 +5,8 @@ include AUTHORS
 include CONTRIBUTING.md
 include README.md
 include requirements.txt
-include test-requirements.txt
 
 recursive-include doc *
-
-graft git/test/fixtures
-graft git/test/performance
+recursive-exclude test *
 
 global-exclude __pycache__ *.pyc

Diff for: setup.py

@@ -9,6 +9,7 @@
 
 from distutils.command.build_py import build_py as _build_py
 from setuptools.command.sdist import sdist as _sdist
+import fnmatch
 import os
 import sys
 from os import path
@@ -66,6 +67,24 @@ def _stamp_version(filename):
         print("WARNING: Couldn't find version line in file %s" % filename, file=sys.stderr)
 
 
+def build_py_modules(basedir, excludes=[]):
+    # create list of py_modules from tree
+    res = set()
+    _prefix = os.path.basename(basedir)
+    for root, _, files in os.walk(basedir):
+        for f in files:
+            _f, _ext = os.path.splitext(f)
+            if _ext not in [".py"]:
+                continue
+            _f = os.path.join(root, _f)
+            _f = os.path.relpath(_f, basedir)
+            _f = "{}.{}".format(_prefix, _f.replace(os.sep, "."))
+            if any(fnmatch.fnmatch(_f, x) for x in excludes):
+                continue
+            res.add(_f)
+    return list(res)
+
+
 setup(
     name="GitPython",
     cmdclass={'build_py': build_py, 'sdist': sdist},
@@ -74,9 +93,9 @@ def _stamp_version(filename):
     author="Sebastian Thiel, Michael Trier",
     author_email="[email protected], [email protected]",
     url="https://github.com/gitpython-developers/GitPython",
-    packages=find_packages('.'),
-    py_modules=['git.' + f[:-3] for f in os.listdir('./git') if f.endswith('.py')],
-    package_data={'git.test': ['fixtures/*']},
+    packages=find_packages(exclude=("test.*")),
+    include_package_data=True,
+    py_modules=build_py_modules("./git", excludes=["git.ext.*"]),
     package_dir={'git': 'git'},
     python_requires='>=3.4',
     install_requires=requirements,

Diff for: test-requirements.txt

@@ -2,3 +2,4 @@ ddt>=1.1.1
 coverage
 flake8
 tox
+virtualenv

Diff for: git/test/__init__.py renamed to test/__init__.py

@@ -56,26 +56,26 @@ index f2233fbf40f3f69309ce5cc714e99fcbdcd33ec3..a88a777df3909a61be97f1a7b1194dad
 @@ -1 +1 @@
 -Subproject commit f2233fbf40f3f69309ce5cc714e99fcbdcd33ec3
 +Subproject commit a88a777df3909a61be97f1a7b1194dad6de25702-dirty
-diff --git a/git/test/fixtures/diff_patch_binary b/git/test/fixtures/diff_patch_binary
+diff --git a/test/fixtures/diff_patch_binary b/test/fixtures/diff_patch_binary
 new file mode 100644
 index 0000000000000000000000000000000000000000..c92ccd6ebc92a871d38ad7cb8a48bcdb1a5dbc33
 --- /dev/null
-+++ b/git/test/fixtures/diff_patch_binary
++++ b/test/fixtures/diff_patch_binary
 @@ -0,0 +1,3 @@
 +diff --git a/rps b/rps
 +index f4567df37451b230b1381b1bc9c2bcad76e08a3c..736bd596a36924d30b480942e9475ce0d734fa0d 100755
 +Binary files a/rps and b/rps differ
-diff --git a/git/test/fixtures/diff_raw_binary b/git/test/fixtures/diff_raw_binary
+diff --git a/test/fixtures/diff_raw_binary b/test/fixtures/diff_raw_binary
 new file mode 100644
 index 0000000000000000000000000000000000000000..d4673fa41ee8413384167fc7b9f25e4daf18a53a
 --- /dev/null
-+++ b/git/test/fixtures/diff_raw_binary
++++ b/test/fixtures/diff_raw_binary
 @@ -0,0 +1 @@
 +:100755 100755 f4567df37451b230b1381b1bc9c2bcad76e08a3c 736bd596a36924d30b480942e9475ce0d734fa0d M	rps
-diff --git a/git/test/test_diff.py b/git/test/test_diff.py
+diff --git a/test/test_diff.py b/test/test_diff.py
 index ce0f64f2261bd8de063233108caac1f26742c1fd..4de26f8884fd048ac7f10007f2bf7c7fa3fa60f4 100644
---- a/git/test/test_diff.py
-+++ b/git/test/test_diff.py
+--- a/test/test_diff.py
++++ b/test/test_diff.py
 @@ -65,6 +65,21 @@ class TestDiff(TestBase):
          assert diff.rename_to == 'that'
          assert len(list(diffs.iter_change_type('R'))) == 1

Diff for: git/test/fixtures/.gitconfig renamed to test/fixtures/.gitconfig

@@ -29,7 +29,7 @@
 
 ospd = osp.dirname
 
-GIT_REPO = os.environ.get("GIT_PYTHON_TEST_GIT_REPO_BASE", ospd(ospd(ospd(ospd(__file__)))))
+GIT_REPO = os.environ.get("GIT_PYTHON_TEST_GIT_REPO_BASE", ospd(ospd(ospd(__file__))))
 GIT_DAEMON_PORT = os.environ.get("GIT_PYTHON_TEST_GIT_DAEMON_PORT", "19418")
 
 __all__ = (

Diff for: git/test/fixtures/blame renamed to test/fixtures/blame

@@ -10,7 +10,7 @@
     GitCmdObjectDB,
     GitDB
 )
-from git.test.lib import (
+from test.lib import (
     TestBase
 )
 from git.util import rmtree

Diff for: git/test/fixtures/blame_binary renamed to test/fixtures/blame_binary

@@ -11,7 +11,7 @@
 from .lib import TestBigRepoRW
 from git import Commit
 from gitdb import IStream
-from git.test.test_commit import TestCommitSerialization
+from test.test_commit import TestCommitSerialization
 
 
 class TestPerformance(TestBigRepoRW, TestCommitSerialization):

Diff for: git/test/fixtures/blame_complex_revision renamed to test/fixtures/blame_complex_revision

@@ -6,7 +6,7 @@
 import sys
 from time import time
 
-from git.test.lib import (
+from test.lib import (
     with_rw_repo
 )
 from git.util import bin_to_hex

Diff for: git/test/fixtures/blame_incremental renamed to test/fixtures/blame_incremental

@@ -4,7 +4,7 @@
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
-from git.test.lib import TestBase
+from test.lib import TestBase
 from git import Actor
 
 

Diff for: git/test/fixtures/blame_incremental_2.11.1_plus renamed to test/fixtures/blame_incremental_2.11.1_plus

@@ -17,7 +17,7 @@
 )
 from git.compat import is_win
 from git.objects.util import get_object_type_by_name
-from git.test.lib import (
+from test.lib import (
     TestBase,
     with_rw_repo,
     with_rw_and_rw_remote_repo

Diff for: git/test/fixtures/cat_file.py renamed to test/fixtures/cat_file.py

@@ -4,7 +4,7 @@
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
-from git.test.lib import TestBase
+from test.lib import TestBase
 from git import Blob
 
 

Diff for: git/test/fixtures/cat_file_blob renamed to test/fixtures/cat_file_blob

@@ -20,13 +20,13 @@
 from git import Repo
 from git.objects.util import tzoffset, utc
 from git.repo.fun import touch
-from git.test.lib import (
+from test.lib import (
     TestBase,
     with_rw_repo,
     fixture_path,
     StringProcessAdapter
 )
-from git.test.lib import with_rw_directory
+from test.lib import with_rw_directory
 from gitdb import IStream
 
 import os.path as osp

Diff for: git/test/fixtures/cat_file_blob_nl renamed to test/fixtures/cat_file_blob_nl

@@ -11,12 +11,12 @@
     GitConfigParser
 )
 from git.config import _OMD, cp
-from git.test.lib import (
+from test.lib import (
     TestCase,
     fixture_path,
     SkipTest,
 )
-from git.test.lib import with_rw_directory
+from test.lib import with_rw_directory
 
 import os.path as osp
 from git.util import rmfile

Diff for: git/test/fixtures/cat_file_blob_size renamed to test/fixtures/cat_file_blob_size

@@ -5,7 +5,7 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 from git.db import GitCmdObjectDB
 from git.exc import BadObject
-from git.test.lib import TestBase
+from test.lib import TestBase
 from git.util import bin_to_hex
 
 import os.path as osp

Diff for: git/test/fixtures/commit_invalid_data renamed to test/fixtures/commit_invalid_data

@@ -16,12 +16,12 @@
     Submodule,
 )
 from git.cmd import Git
-from git.test.lib import (
+from test.lib import (
     TestBase,
     StringProcessAdapter,
     fixture,
 )
-from git.test.lib import with_rw_directory
+from test.lib import with_rw_directory
 
 import os.path as osp
 

Diff for: git/test/fixtures/commit_with_gpgsig renamed to test/fixtures/commit_with_gpgsig

@@ -6,8 +6,8 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 import os
 
-from git.test.lib import TestBase
-from git.test.lib.helper import with_rw_directory
+from test.lib import TestBase
+from test.lib.helper import with_rw_directory
 
 import os.path
 

Diff for: git/test/fixtures/diff_2 renamed to test/fixtures/diff_2

@@ -22,7 +22,7 @@
     HookExecutionError,
     RepositoryDirtyError,
 )
-from git.test.lib import TestBase
+from test.lib import TestBase
 
 import itertools as itt
 

Diff for: git/test/fixtures/diff_2f renamed to test/fixtures/diff_2f

@@ -18,7 +18,7 @@
 from git.repo.fun import (
     find_worktree_git_dir
 )
-from git.test.lib import (
+from test.lib import (
     TestBase,
     with_rw_repo,
     with_rw_directory

Diff for: git/test/fixtures/diff_abbrev-40_full-index_M_raw_no-color renamed to test/fixtures/diff_abbrev-40_full-index_M_raw_no-color

@@ -19,11 +19,11 @@
     cmd
 )
 from git.compat import is_darwin
-from git.test.lib import (
+from test.lib import (
     TestBase,
     fixture_path
 )
-from git.test.lib import with_rw_directory
+from test.lib import with_rw_directory
 from git.util import finalize_process
 
 import os.path as osp

Diff for: git/test/fixtures/diff_change_in_type renamed to test/fixtures/diff_change_in_type

@@ -36,13 +36,13 @@
     IndexEntry
 )
 from git.objects import Blob
-from git.test.lib import (
+from test.lib import (
     TestBase,
     fixture_path,
     fixture,
     with_rw_repo
 )
-from git.test.lib import with_rw_directory
+from test.lib import with_rw_directory
 from git.util import Actor, rmtree
 from git.util import HIDE_WINDOWS_KNOWN_ERRORS, hex_to_bin
 from gitdb.base import IStream

Diff for: git/test/fixtures/diff_change_in_type_raw renamed to test/fixtures/diff_change_in_type_raw

@@ -0,0 +1,29 @@
+# This module is part of GitPython and is released under
+# the BSD License: http://www.opensource.org/licenses/bsd-license.php
+
+import os
+import subprocess
+from test.lib import TestBase
+from test.lib.helper import with_rw_directory
+
+
+class TestInstallation(TestBase):
+    def setUp_venv(self, rw_dir):
+        self.venv = rw_dir
+        subprocess.run(['virtualenv', self.venv], stdout=subprocess.PIPE)
+        self.python = os.path.join(self.venv, 'bin/python3')
+        self.pip = os.path.join(self.venv, 'bin/pip3')
+        self.sources = os.path.join(self.venv, "src")
+        self.cwd = os.path.dirname(os.path.dirname(__file__))
+        os.symlink(self.cwd, self.sources, target_is_directory=True)
+
+    @with_rw_directory
+    def test_installation(self, rw_dir):
+        self.setUp_venv(rw_dir)
+        result = subprocess.run([self.pip, 'install', '-r', 'requirements.txt'],
+                                stdout=subprocess.PIPE, cwd=self.sources)
+        self.assertEqual(0, result.returncode, msg=result.stderr or result.stdout or "Can't install requirements")
+        result = subprocess.run([self.python, 'setup.py', 'install'], stdout=subprocess.PIPE, cwd=self.sources)
+        self.assertEqual(0, result.returncode, msg=result.stderr or result.stdout or "Can't build - setup.py failed")
+        result = subprocess.run([self.python, '-c', 'import git'], stdout=subprocess.PIPE, cwd=self.sources)
+        self.assertEqual(0, result.returncode, msg=result.stderr or result.stdout or "Selftest failed")

Diff for: git/test/fixtures/diff_copied_mode renamed to test/fixtures/diff_copied_mode

@@ -6,7 +6,7 @@
     RefLogEntry,
     RefLog
 )
-from git.test.lib import (
+from test.lib import (
     TestBase,
     fixture_path
 )

Diff for: git/test/fixtures/diff_copied_mode_raw renamed to test/fixtures/diff_copied_mode_raw

@@ -17,7 +17,7 @@
     RefLog
 )
 from git.objects.tag import TagObject
-from git.test.lib import (
+from test.lib import (
     TestBase,
     with_rw_repo
 )

Diff for: git/test/fixtures/diff_f renamed to test/fixtures/diff_f

@@ -22,7 +22,7 @@
     GitCommandError
 )
 from git.cmd import Git
-from git.test.lib import (
+from test.lib import (
     TestBase,
     with_rw_repo,
     with_rw_and_rw_remote_repo,

Diff for: git/test/fixtures/diff_file_with_spaces renamed to test/fixtures/diff_file_with_spaces

@@ -36,13 +36,13 @@
     BadObject,
 )
 from git.repo.fun import touch
-from git.test.lib import (
+from test.lib import (
     TestBase,
     with_rw_repo,
     fixture
 )
 from git.util import HIDE_WINDOWS_KNOWN_ERRORS, cygpath
-from git.test.lib import with_rw_directory
+from test.lib import with_rw_directory
 from git.util import join_path_native, rmtree, rmfile, bin_to_hex
 
 import os.path as osp
@@ -865,7 +865,7 @@ def last_commit(repo, rev, path):
         for _ in range(64):
             for repo_type in (GitCmdObjectDB, GitDB):
                 repo = Repo(self.rorepo.working_tree_dir, odbt=repo_type)
-                last_commit(repo, 'master', 'git/test/test_base.py')
+                last_commit(repo, 'master', 'test/test_base.py')
             # end for each repository type
         # end for each iteration
 

Diff for: git/test/fixtures/diff_i renamed to test/fixtures/diff_i

@@ -4,7 +4,7 @@
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
-from git.test.lib import (
+from test.lib import (
     TestBase,
     fixture
 )