From 09f38c0cff69224db13b5eb584fec9bc8478edb0 Mon Sep 17 00:00:00 2001 From: Tristan Maat Date: Wed, 12 Jun 2019 17:33:43 +0100 Subject: fixup! WIP: Use freedesktop-sdk as a base for tutorials as much as possible --- .../advanced-junctions/autotools/elements/freedesktop-sdk.bst | 4 ++-- doc/examples/advanced-junctions/elements/freedesktop-sdk.bst | 4 ++-- doc/examples/autotools/elements/freedesktop-sdk.bst | 4 ++-- doc/examples/integration-commands/elements/freedesktop-sdk.bst | 4 ++-- doc/examples/junctions/elements/freedesktop-sdk.bst | 4 ++-- tox.ini | 5 +++++ 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/doc/examples/advanced-junctions/autotools/elements/freedesktop-sdk.bst b/doc/examples/advanced-junctions/autotools/elements/freedesktop-sdk.bst index 9fe54d428..19524ab8f 100644 --- a/doc/examples/advanced-junctions/autotools/elements/freedesktop-sdk.bst +++ b/doc/examples/advanced-junctions/autotools/elements/freedesktop-sdk.bst @@ -2,8 +2,8 @@ kind: junction sources: - kind: git url: https://gitlab.com/freedesktop-sdk/freedesktop-sdk/ - track: '18.08' - ref: ddde36212f574fbdb66b5cca3d4b411aec22ee82 + track: 'freedesktop-sdk-18.08.31.1-bst2' + ref: 5c639b8d553016ea6c28ea160a572da2e189745e config: options: target_arch: '%{arch}' diff --git a/doc/examples/advanced-junctions/elements/freedesktop-sdk.bst b/doc/examples/advanced-junctions/elements/freedesktop-sdk.bst index 9fe54d428..19524ab8f 100644 --- a/doc/examples/advanced-junctions/elements/freedesktop-sdk.bst +++ b/doc/examples/advanced-junctions/elements/freedesktop-sdk.bst @@ -2,8 +2,8 @@ kind: junction sources: - kind: git url: https://gitlab.com/freedesktop-sdk/freedesktop-sdk/ - track: '18.08' - ref: ddde36212f574fbdb66b5cca3d4b411aec22ee82 + track: 'freedesktop-sdk-18.08.31.1-bst2' + ref: 5c639b8d553016ea6c28ea160a572da2e189745e config: options: target_arch: '%{arch}' diff --git a/doc/examples/autotools/elements/freedesktop-sdk.bst b/doc/examples/autotools/elements/freedesktop-sdk.bst index 9fe54d428..19524ab8f 100644 --- a/doc/examples/autotools/elements/freedesktop-sdk.bst +++ b/doc/examples/autotools/elements/freedesktop-sdk.bst @@ -2,8 +2,8 @@ kind: junction sources: - kind: git url: https://gitlab.com/freedesktop-sdk/freedesktop-sdk/ - track: '18.08' - ref: ddde36212f574fbdb66b5cca3d4b411aec22ee82 + track: 'freedesktop-sdk-18.08.31.1-bst2' + ref: 5c639b8d553016ea6c28ea160a572da2e189745e config: options: target_arch: '%{arch}' diff --git a/doc/examples/integration-commands/elements/freedesktop-sdk.bst b/doc/examples/integration-commands/elements/freedesktop-sdk.bst index 9fe54d428..19524ab8f 100644 --- a/doc/examples/integration-commands/elements/freedesktop-sdk.bst +++ b/doc/examples/integration-commands/elements/freedesktop-sdk.bst @@ -2,8 +2,8 @@ kind: junction sources: - kind: git url: https://gitlab.com/freedesktop-sdk/freedesktop-sdk/ - track: '18.08' - ref: ddde36212f574fbdb66b5cca3d4b411aec22ee82 + track: 'freedesktop-sdk-18.08.31.1-bst2' + ref: 5c639b8d553016ea6c28ea160a572da2e189745e config: options: target_arch: '%{arch}' diff --git a/doc/examples/junctions/elements/freedesktop-sdk.bst b/doc/examples/junctions/elements/freedesktop-sdk.bst index 9fe54d428..19524ab8f 100644 --- a/doc/examples/junctions/elements/freedesktop-sdk.bst +++ b/doc/examples/junctions/elements/freedesktop-sdk.bst @@ -2,8 +2,8 @@ kind: junction sources: - kind: git url: https://gitlab.com/freedesktop-sdk/freedesktop-sdk/ - track: '18.08' - ref: ddde36212f574fbdb66b5cca3d4b411aec22ee82 + track: 'freedesktop-sdk-18.08.31.1-bst2' + ref: 5c639b8d553016ea6c28ea160a572da2e189745e config: options: target_arch: '%{arch}' diff --git a/tox.ini b/tox.ini index 94e96d9b0..d27d81cd7 100644 --- a/tox.ini +++ b/tox.ini @@ -30,6 +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 + py{35,36,37}: git+https://gitlab.com/buildstream/bst-plugins-experimental # Only require coverage and pytest-cov when using it !nocover: -rrequirements/cov-requirements.txt @@ -48,6 +49,8 @@ passenv = SOURCE_CACHE_SERVICE SSL_CERT_FILE +sitepackages = True + # # These keys are not inherited by any other sections # @@ -139,7 +142,9 @@ deps = -rrequirements/requirements.txt -rrequirements/dev-requirements.txt -rrequirements/plugin-requirements.txt + git+https://gitlab.com/buildstream/bst-plugins-experimental whitelist_externals = * +sitepackages = True # -- cgit v1.2.1