From: Oto Šťáva Date: Mon, 5 Feb 2024 16:03:44 +0000 (+0100) Subject: manager: move `build.py` to `build_c_extensions.py` X-Git-Tag: v6.0.7~22^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=807d40032f1d2115037f39b247ef7a5ce27890e0;p=thirdparty%2Fknot-resolver.git manager: move `build.py` to `build_c_extensions.py` This fixes a problem on some systems, where the `build.py` file conflicts with the `build` module required by Poetry. See . --- diff --git a/manager/build.py b/manager/build_c_extensions.py similarity index 100% rename from manager/build.py rename to manager/build_c_extensions.py diff --git a/manager/pyproject.toml b/manager/pyproject.toml index e9615b7dc..4d220a7bd 100644 --- a/manager/pyproject.toml +++ b/manager/pyproject.toml @@ -10,7 +10,7 @@ authors = [ # See currently open issue about building C extensions here: # https://github.com/python-poetry/poetry/issues/2740 [tool.poetry.build] -script = "build.py" +script = "build_c_extensions.py" generate-setup-file = true [tool.poetry.dependencies] @@ -64,7 +64,7 @@ run-debug = { cmd = "scripts/run-debug", help = "Run the manager under debugger" docs = { cmd = "scripts/docs", help = "Create HTML documentation" } test = { shell = "env PYTHONPATH=. pytest --junitxml=unit.junit.xml --cov=knot_resolver_manager --show-capture=all tests/unit/", help = "Run tests" } check = { cmd = "scripts/codecheck", help = "Run static code analysis" } -format = { shell = "black knot_resolver_manager/ tests/ scripts/ build.py; isort -rc .", help = "Run code formatter" } +format = { shell = "black knot_resolver_manager/ tests/ scripts/ build_c_extensions.py; isort -rc .", help = "Run code formatter" } fixdeps = { shell = "poetry install; npm install; npm update", help = "Install/update dependencies according to configuration files"} commit = { shell = "scripts/commit", help = "Invoke every single check before commiting" } container = { cmd = "scripts/container.py", help = "Manage containers" } diff --git a/manager/setup.py b/manager/setup.py index 09d6d8810..411951a6a 100644 --- a/manager/setup.py +++ b/manager/setup.py @@ -46,7 +46,7 @@ setup_kwargs = { 'entry_points': entry_points, 'python_requires': '>=3.7,<4.0', } -from build import * +from build_c_extensions import * build(setup_kwargs) setup(**setup_kwargs) diff --git a/manager/tests/packaging/dependencies.py b/manager/tests/packaging/dependencies.py index 4a426b6e5..d92be71a9 100755 --- a/manager/tests/packaging/dependencies.py +++ b/manager/tests/packaging/dependencies.py @@ -12,7 +12,7 @@ dummy = ModuleType("dummy") dummy.__dict__["setup"] = lambda *args, **kwargs: None dummy.__dict__["build"] = lambda *args, **kwargs: None sys.modules["setuptools"] = dummy -sys.modules["build"] = dummy +sys.modules["build_c_extensions"] = dummy # load install_requires array from setup.py spec = importlib.util.spec_from_file_location("setup", sys.argv[1] if len(sys.argv) == 2 else "manager/setup.py")