Commit3fbbfd7

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-unusedbuild_py_modules function.The packages keyword argument already covers this, because we haveno loose modules that are included in the distribution, and thecall 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 andsdist distributions, I have listed the contents of the wheel with"unzip -l" and the sdist .tar.gz file with "tar tf" both before andafter this change, verifying they list all the same entries.

1 parente8c3085 commit3fbbfd7Copy full SHA for 3fbbfd7

File tree

1 file changed

-20

lines changed

setup.py

1 file changed

-20

lines changed

`‎setup.py`

Lines changed: 0 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`fromsetuptoolsimportsetup,find_packages`
`5`	`5`	`fromsetuptools.command.build_pyimportbuild_pyas_build_py`
`6`	`6`	`fromsetuptools.command.sdistimportsdistas_sdist`
`7`		`-importfnmatch`
`8`	`7`	`importos`
`9`	`8`	`importsys`
`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`		`-defbuild_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`		`-forroot,_,filesinos.walk(basedir):`
`70`		`-forfinfiles:`
`71`		`-_f,_ext=os.path.splitext(f)`
`72`		`-if_extnotin [".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`		`-ifany(fnmatch.fnmatch(_f,x)forxinexcludes):`
`78`		`-continue`
`79`		`-res.add(_f)`
`80`		`-returnlist(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

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit3fbbfd7

File tree

1 file changed

1 file changed

`‎setup.py`

0 commit comments