You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildstream.apache.org by no...@apache.org on 2020/12/29 12:50:46 UTC
[buildstream] branch coldtom/move-distutils created (now 9d82b94)
This is an automated email from the ASF dual-hosted git repository.
not-in-ldap pushed a change to branch coldtom/move-distutils
in repository https://gitbox.apache.org/repos/asf/buildstream.git.
at 9d82b94 Move distutils to bst-plugins-experimental
This branch includes the following new commits:
new 9d82b94 Move distutils to bst-plugins-experimental
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[buildstream] 01/01: Move distutils to bst-plugins-experimental
Posted by no...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
not-in-ldap pushed a commit to branch coldtom/move-distutils
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 9d82b9484e2e5af658bf5d30a4bc1c52b6249da4
Author: Thomas Coldrick <ot...@gmail.com>
AuthorDate: Wed Aug 14 16:19:39 2019 +0100
Move distutils to 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(-)
diff --git a/doc/source/core_plugins.rst b/doc/source/core_plugins.rst
index 2474f90..88b90a7 100644
--- a/doc/source/core_plugins.rst
+++ b/doc/source/core_plugins.rst
@@ -33,7 +33,6 @@ Build elements
elements/manual
elements/autotools
elements/qmake
- 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 4b2c1e2..0000000
--- 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 <http://www.gnu.org/licenses/>.
-#
-# Authors:
-# Tristan Van Berkom <tr...@codethink.co.uk>
-
-"""
-distutils - Python distutils element
-====================================
-A :mod:`BuildElement <buildstream.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 <core_buildelement_builtins>` 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 cec7da6..0000000
--- 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 9d38bfe..8068f75 100644
--- a/tests/format/variables/defaults/project.conf
+++ b/tests/format/variables/defaults/project.conf
@@ -7,5 +7,6 @@ plugins:
package-name: bst-plugins-experimental
elements:
cmake: 0
+ distutils: 0
makemaker: 0
modulebuild: 0
diff --git a/tests/format/variables/overrides/project.conf b/tests/format/variables/overrides/project.conf
index 476dff4..2a9a5d4 100644
--- a/tests/format/variables/overrides/project.conf
+++ b/tests/format/variables/overrides/project.conf
@@ -6,5 +6,6 @@ plugins:
package-name: bst-plugins-experimental
elements:
cmake: 0
+ distutils: 0
makemaker: 0
modulebuild: 0
diff --git a/tox.ini b/tox.ini
index 150d176..c520757 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@56bfe6af41469d5264bead5f7d78b24ead8faaf9
+ git+https://gitlab.com/BuildStream/bst-plugins-experimental.git@coldtom/move-distutils
# Only require coverage and pytest-cov when using it
!nocover: -rrequirements/cov-requirements.txt