Repository navigation
Commit 3fbbfd7
committed
Omit py_modules in setup
This removes the py_modules keyword argument in the call to setup,
and further shortens/simplifies setup.py by removing the now-unused
build_py_modules function.
The packages keyword argument already covers this, because we have
no loose modules that are included in the distribution, and the
call to find_packages:
- Omits everything in test/ because it is directed to do so in the
call.
- Omits the gitdb/ directory (currently existing as a git submodule,
not to be confused with Python submodules), because the ext/
directory that contains it does not itself directly contain an
__init__.py file, so it is not a traditional package, yet ext/
is contained and found inside the directory git/ that *is* a
traditional package, so the ext/ directory is not a namespace
package either.
- Includes all other modules, recursively, because they are all
in a recursive traditional package structure under git/ that
find_packages recognizes.
To verify that this includes the same files in the built wheel and
sdist distributions, I have listed the contents of the wheel with
"unzip -l" and the sdist .tar.gz file with "tar tf" both before and
after this change, verifying they list all the same entries.1 parent e8c3085 commit 3fbbfd7
1 file changed
Lines changed: 0 additions & 20 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -4,7 +4,6 @@ | |||
| 4 | 4 | from setuptools import setup, find_packages | |
| 5 | 5 | from setuptools.command.build_py import build_py as _build_py | |
| 6 | 6 | from setuptools.command.sdist import sdist as _sdist | |
| 7 | - import fnmatch | ||
| 8 | 7 | import os | |
| 9 | 8 | import sys | |
| 10 | 9 | ||
@@ -62,24 +61,6 @@ def _stamp_version(filename: str) -> None: | |||
| 62 | 61 | print("WARNING: Couldn't find version line in file %s" % filename, file=sys.stderr) | |
| 63 | 62 | ||
| 64 | 63 | ||
| 65 | - def build_py_modules(basedir: str, excludes: Sequence = ()) -> Sequence: | ||
| 66 | - # create list of py_modules from tree | ||
| 67 | - res = set() | ||
| 68 | - _prefix = os.path.basename(basedir) | ||
| 69 | - for root, _, files in os.walk(basedir): | ||
| 70 | - for f in files: | ||
| 71 | - _f, _ext = os.path.splitext(f) | ||
| 72 | - if _ext not in [".py"]: | ||
| 73 | - continue | ||
| 74 | - _f = os.path.join(root, _f) | ||
| 75 | - _f = os.path.relpath(_f, basedir) | ||
| 76 | - _f = "{}.{}".format(_prefix, _f.replace(os.sep, ".")) | ||
| 77 | - if any(fnmatch.fnmatch(_f, x) for x in excludes): | ||
| 78 | - continue | ||
| 79 | - res.add(_f) | ||
| 80 | - return list(res) | ||
| 81 | - | ||
| 82 | - | ||
| 83 | 64 | setup( | |
| 84 | 65 | name="GitPython", | |
| 85 | 66 | cmdclass={"build_py": build_py, "sdist": sdist}, | |
@@ -91,7 +72,6 @@ def build_py_modules(basedir: str, excludes: Sequence = ()) -> Sequence: | |||
| 91 | 72 | url="https://github.com/gitpython-developers/GitPython", | |
| 92 | 73 | packages=find_packages(exclude=["test", "test.*"]), | |
| 93 | 74 | include_package_data=True, | |
| 94 | - py_modules=build_py_modules("./git", excludes=["git.ext.*"]), | ||
| 95 | 75 | package_dir={"git": "git"}, | |
| 96 | 76 | python_requires=">=3.7", | |
| 97 | 77 | install_requires=requirements, | |
0 commit comments