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

[RFC/WIP] move tests and avoid packaging them

Author: Byron

.deepsource.toml

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

.gitattributes

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

.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

.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

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

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="byronimo@gmail.com, mtrier@gmail.com",
     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,

test-requirements.txt

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