From 28e6aa779bfdd82da9246b9fc7838d5b721d8b67 Mon Sep 17 00:00:00 2001 From: Dominic Date: Sat, 24 Jul 2021 09:52:52 +0100 Subject: [PATCH 1/3] fix find_packages() Make exclude arg a sequence -> find_packages(exclude=["test", "test.*"]) --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 5f2d8e4f6..d87f79ec5 100755 --- a/setup.py +++ b/setup.py @@ -93,8 +93,7 @@ def build_py_modules(basedir, excludes=()): author_email="byronimo@gmail.com, mtrier@gmail.com", license="BSD", url="https://github.com/gitpython-developers/GitPython", - packages=find_packages(exclude=("test.*")), - package_data={'git': ['**/*.pyi', 'py.typed']}, + packages=find_packages(exclude=["test", "test.*"]), include_package_data=True, py_modules=build_py_modules("./git", excludes=["git.ext.*"]), package_dir={'git': 'git'}, From 2df0381718a4ba18394e68b40e352fa7528e9018 Mon Sep 17 00:00:00 2001 From: Dominic Date: Sat, 24 Jul 2021 09:54:12 +0100 Subject: [PATCH 2/3] Rmv EZ_setup from setup.py Build tools now specified in pyproject.toml, so can be sure setuptools is installed --- setup.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/setup.py b/setup.py index d87f79ec5..215590710 100755 --- a/setup.py +++ b/setup.py @@ -1,11 +1,4 @@ -#!/usr/bin/env python -try: - from setuptools import setup, find_packages -except ImportError: - from ez_setup import use_setuptools # type: ignore[Pylance] - use_setuptools() - from setuptools import setup, find_packages - +from setuptools import setup, find_packages from setuptools.command.build_py import build_py as _build_py from setuptools.command.sdist import sdist as _sdist import fnmatch From fb21782089dbbb43b2f8cf36ce3e732558032aff Mon Sep 17 00:00:00 2001 From: Dominic Date: Sat, 24 Jul 2021 09:55:53 +0100 Subject: [PATCH 3/3] Add build system to pyproject.toml --- pyproject.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 79e628404..94f74793d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,7 @@ +[build-system] +requires = ["setuptools", "wheel"] +build-backend = "setuptools.build_meta" + [tool.pytest.ini_options] python_files = 'test_*.py' testpaths = 'test' # space seperated list of paths from root e.g test tests doc/testing