From d61992026d40d80a1ca3e4876eeaa4462a007dc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 11 Sep 2019 21:07:02 +0100 Subject: Use distutils plugin from bst-plugins-experimental --- doc/source/core_plugins.rst | 1 - src/buildstream/plugins/elements/distutils.py | 51 ------------------------- src/buildstream/plugins/elements/distutils.yaml | 49 ------------------------ tests/format/variables/defaults/project.conf | 1 + tests/format/variables/overrides/project.conf | 1 + tox.ini | 2 +- 6 files changed, 3 insertions(+), 102 deletions(-) delete mode 100644 src/buildstream/plugins/elements/distutils.py delete mode 100644 src/buildstream/plugins/elements/distutils.yaml diff --git a/doc/source/core_plugins.rst b/doc/source/core_plugins.rst index f69602479..00d7c7f6d 100644 --- a/doc/source/core_plugins.rst +++ b/doc/source/core_plugins.rst @@ -32,7 +32,6 @@ Build elements elements/manual elements/autotools - elements/distutils elements/pip diff --git a/src/buildstream/plugins/elements/distutils.py b/src/buildstream/plugins/elements/distutils.py deleted file mode 100644 index 4b2c1e2f4..000000000 --- a/src/buildstream/plugins/elements/distutils.py +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (C) 2016 Codethink Limited -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library. If not, see . -# -# Authors: -# Tristan Van Berkom - -""" -distutils - Python distutils element -==================================== -A :mod:`BuildElement ` implementation for using -python distutils - -The distutils default configuration: - .. literalinclude:: ../../../src/buildstream/plugins/elements/distutils.yaml - :language: yaml - -See :ref:`built-in functionality documentation ` for -details on common configuration options for build elements. -""" - -from buildstream import BuildElement, SandboxFlags - - -# Element implementation for the python 'distutils' kind. -class DistutilsElement(BuildElement): - # Supports virtual directories (required for remote execution) - BST_VIRTUAL_DIRECTORY = True - - # Enable command batching across prepare() and assemble() - def configure_sandbox(self, sandbox): - super().configure_sandbox(sandbox) - self.batch_prepare_assemble(SandboxFlags.ROOT_READ_ONLY, - collect=self.get_variable('install-root')) - - -# Plugin entry point -def setup(): - return DistutilsElement diff --git a/src/buildstream/plugins/elements/distutils.yaml b/src/buildstream/plugins/elements/distutils.yaml deleted file mode 100644 index cec7da6e9..000000000 --- a/src/buildstream/plugins/elements/distutils.yaml +++ /dev/null @@ -1,49 +0,0 @@ -# Default python distutils configuration - -variables: - - # When building for python2 distutils, simply - # override this in the element declaration - python: python3 - - python-build: | - - %{python} %{conf-root}/setup.py build - - install-args: | - - --prefix "%{prefix}" \ - --root "%{install-root}" - - python-install: | - - %{python} %{conf-root}/setup.py install %{install-args} - - -config: - - # Commands for configuring the software - # - configure-commands: [] - - # Commands for building the software - # - build-commands: - - | - %{python-build} - - # Commands for installing the software into a - # destination folder - # - install-commands: - - | - %{python-install} - - # Commands for stripping debugging information out of - # installed binaries - # - strip-commands: - - | - %{strip-binaries} - - | - %{fix-pyc-timestamps} diff --git a/tests/format/variables/defaults/project.conf b/tests/format/variables/defaults/project.conf index 9cf530d7c..029f07c3a 100644 --- a/tests/format/variables/defaults/project.conf +++ b/tests/format/variables/defaults/project.conf @@ -7,6 +7,7 @@ plugins: package-name: bst-plugins-experimental elements: cmake: 0 + distutils: 0 makemaker: 0 modulebuild: 0 qmake: 0 diff --git a/tests/format/variables/overrides/project.conf b/tests/format/variables/overrides/project.conf index 9d4331e72..e4854a646 100644 --- a/tests/format/variables/overrides/project.conf +++ b/tests/format/variables/overrides/project.conf @@ -6,6 +6,7 @@ plugins: package-name: bst-plugins-experimental elements: cmake: 0 + distutils: 0 makemaker: 0 modulebuild: 0 qmake: 0 diff --git a/tox.ini b/tox.ini index c1a04dda5..66782e1c4 100644 --- a/tox.ini +++ b/tox.ini @@ -30,7 +30,7 @@ deps = py{35,36,37}: -rrequirements/requirements.txt py{35,36,37}: -rrequirements/dev-requirements.txt py{35,36,37}: -rrequirements/plugin-requirements.txt - git+https://gitlab.com/BuildStream/bst-plugins-experimental.git@effd6be61b6ed5983694da7496adf872d81eddcc + git+https://gitlab.com/BuildStream/bst-plugins-experimental.git@5b004e5850ab0e987c00c681b2c768f6ae02586b # Only require coverage and pytest-cov when using it !nocover: -rrequirements/cov-requirements.txt -- cgit v1.2.1