.gitlab-ci.yml

@@ -53,26 +53,20 @@ tests-fedora-28:
   image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:28-master-46405991
   <<: *tests
 
-tests-ubuntu-18.04:
-  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-ubuntu:18.04-master-46405991
+tests-fedora-29:
+  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:29-master-47052095
   <<: *tests
 
-tests-python-3.7-stretch:
-  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-python:3.7-stretch-master-46405991
+tests-ubuntu-18.04:
+  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-ubuntu:18.04-master-46405991
   <<: *tests
 
-  variables:
-    # Note that we explicitly specify TOXENV in this case because this
-    # image has both 3.6 and 3.7 versions. python3.6 cannot be removed because
-    # some of our base dependencies declare it as their runtime dependency.
-    TOXENV: py37
-
 tests-centos-7.6:
   <<: *tests
   image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-centos:7.6.1810-master-46405991
 
-overnight-fedora-28-aarch64:
-  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:aarch64-28-master-46405991
+overnight-fedora-29-aarch64:
+  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:aarch64-29-master-47052095
   tags:
     - aarch64
   <<: *tests
@@ -91,7 +85,7 @@ overnight-fedora-28-aarch64:
 tests-unix:
   # Use fedora here, to a) run a test on fedora and b) ensure that we
   # can get rid of ostree - this is not possible with debian-8
-  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:28-master-46405991
+  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:29-master-47052095
   <<: *tests
   variables:
     BST_FORCE_BACKEND: "unix"
@@ -109,7 +103,7 @@ tests-unix:
 
 tests-fedora-missing-deps:
   # Ensure that tests behave nicely while missing bwrap and ostree
-  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:28-master-46405991
+  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:29-master-47052095
   <<: *tests
 
   script:
@@ -128,7 +122,7 @@ tests-fedora-update-deps:
   # Check if the tests pass after updating requirements to their latest
   # allowed version.
   allow_failure: true
-  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:28-master-46405991
+  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:29-master-47052095
   <<: *tests
 
   script:
@@ -289,6 +283,7 @@ coverage:
   dependencies:
   - tests-debian-9
   - tests-fedora-28
+  - tests-fedora-29
   - tests-fedora-missing-deps
   - tests-ubuntu-18.04
   - tests-unix

NEWS

@@ -70,6 +70,9 @@ buildstream 1.3.1
     to avoid having to specify the dependency type for every entry in
     'depends'.
 
+  o Elements may now specify cross-junction dependencies as simple strings
+    using the format '{junction-name}:{element-name}'.
+
   o Source plugins may now request access access to previous during track and
     fetch by setting `BST_REQUIRES_PREVIOUS_SOURCES_TRACK` and/or
     `BST_REQUIRES_PREVIOUS_SOURCES_FETCH` attributes.

buildstream/_frontend/cli.py

@@ -440,6 +440,9 @@ def show(app, elements, deps, except_, order, format_):
         %{public}         Public domain data
         %{workspaced}     If the element is workspaced
         %{workspace-dirs} A list of workspace directories
+        %{deps}           A list of all dependencies
+        %{build-deps}     A list of build dependencies
+        %{runtime-deps}   A list of runtime dependencies
 
     The value of the %{symbol} without the leading '%' character is understood
     as a pythonic formatting string, so python formatting features apply,

buildstream/_frontend/widget.py

@@ -27,7 +27,7 @@ from ruamel import yaml
 import click
 
 from . import Profile
-from .. import Element, Consistency
+from .. import Element, Consistency, Scope
 from .. import _yaml
 from .. import __version__ as bst_version
 from .._exceptions import ImplError
@@ -435,6 +435,27 @@ class LogLine(Widget):
                     line = p.fmt_subst(
                         line, 'workspace-dirs', '')
 
+            # Dependencies
+            if "%{deps" in format_:
+                deps = [e.name for e in element.dependencies(Scope.ALL, recurse=False)]
+                line = p.fmt_subst(
+                    line, 'deps',
+                    yaml.safe_dump(deps, default_style=None).rstrip('\n'))
+
+            # Build Dependencies
+            if "%{build-deps" in format_:
+                build_deps = [e.name for e in element.dependencies(Scope.BUILD, recurse=False)]
+                line = p.fmt_subst(
+                    line, 'build-deps',
+                    yaml.safe_dump(build_deps, default_style=False).rstrip('\n'))
+
+            # Runtime Dependencies
+            if "%{runtime-deps" in format_:
+                runtime_deps = [e.name for e in element.dependencies(Scope.RUN, recurse=False)]
+                line = p.fmt_subst(
+                    line, 'runtime-deps',
+                    yaml.safe_dump(runtime_deps, default_style=False).rstrip('\n'))
+
             report += line + '\n'
 
         return report.rstrip('\n')

buildstream/_loader/types.py

@@ -17,6 +17,8 @@
 #  Authors:
 #        Tristan Van Berkom <tristan.vanberkom@codethink.co.uk>
 
+from .._exceptions import LoadError, LoadErrorReason
+
 
 # Symbol():
 #
@@ -56,8 +58,22 @@ class Symbol():
 #                             dependency was declared
 #
 class Dependency():
-    def __init__(self, name,
+    def __init__(self, filename,
                  dep_type=None, junction=None, provenance=None):
+        # Attempt to split name if no junction was specified explicitly
+        if not junction:
+            junction_path = filename.rsplit(":", 1)
+            name = junction_path[-1]
+            junction = None if len(junction_path) == 1 else junction_path[-2]
+        else:
+            name = filename
+
+        # Name of the element should not contain any `:` characters at this stage
+        if ':' in name:
+            raise LoadError(LoadErrorReason.INVALID_DATA,
+                            "Element {} contains `:` in its name. "
+                            "Recursive lookups for cross-junction elements is not allowed.".format(filename))
+
         self.name = name
         self.dep_type = dep_type
         self.junction = junction

buildstream/_versions.py

@@ -23,7 +23,7 @@
 # This version is bumped whenever enhancements are made
 # to the `project.conf` format or the core element format.
 #
-BST_FORMAT_VERSION = 21
+BST_FORMAT_VERSION = 22
 
 
 # The base BuildStream artifact version

doc/source/format_declaring.rst

@@ -401,6 +401,40 @@ Attributes:
      The ``junction`` attribute is available since :ref:`format version 1 <project_format_version>`
 
 
+Cross-junction dependencies
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+As mentioned above, cross-junction dependencies can be specified using the
+``junction`` attribute. They can also be expressed as simple strings as a
+convenience shorthand. You can refer to cross-junction elements using the
+syntax ``{junction-name}:{element-name}``.
+
+For example, the following is logically same as the example above:
+
+.. code:: yaml
+
+   build-depends:
+     - baseproject.bst:foo.bst
+
+Similarly, you can also refer to cross-junction elements via the ``filename``
+attribute, like so:
+
+.. code:: yaml
+
+   depends:
+     - filename: baseproject.bst:foo.bst
+       type: build
+
+.. note::
+
+   Recursive lookups are not allowed using this syntax. If a filename
+   contains more than one ``:`` (colon) character, BuildStream will raise
+   an error.
+
+.. note::
+
+   This shorthand is available since :ref:`format version 22 <project_format_version>`
+
+
 .. _format_dependencies_types:
 
 Dependency types

man/bst-artifact-checkout.1

-.TH "BST ARTIFACT CHECKOUT" "1" "24-Jan-2019" "" "bst artifact checkout Manual"
+.TH "BST ARTIFACT CHECKOUT" "1" "12-Feb-2019" "" "bst artifact checkout Manual"
 .SH NAME
 bst\-artifact\-checkout \- Checkout contents of an artifact
 .SH SYNOPSIS

man/bst-artifact-log.1

-.TH "BST ARTIFACT LOG" "1" "24-Jan-2019" "" "bst artifact log Manual"
+.TH "BST ARTIFACT LOG" "1" "12-Feb-2019" "" "bst artifact log Manual"
 .SH NAME
 bst\-artifact\-log \- Show logs of an artifact
 .SH SYNOPSIS

man/bst-artifact-pull.1

-.TH "BST ARTIFACT PULL" "1" "24-Jan-2019" "" "bst artifact pull Manual"
+.TH "BST ARTIFACT PULL" "1" "12-Feb-2019" "" "bst artifact pull Manual"
 .SH NAME
 bst\-artifact\-pull \- Pull a built artifact
 .SH SYNOPSIS

man/bst-artifact-push.1

-.TH "BST ARTIFACT PUSH" "1" "24-Jan-2019" "" "bst artifact push Manual"
+.TH "BST ARTIFACT PUSH" "1" "12-Feb-2019" "" "bst artifact push Manual"
 .SH NAME
 bst\-artifact\-push \- Push a built artifact
 .SH SYNOPSIS

man/bst-artifact-server.1

-.TH "BST-ARTIFACT-SERVER" "1" "24-Jan-2019" "" "bst-artifact-server Manual"
+.TH "BST-ARTIFACT-SERVER" "1" "12-Feb-2019" "" "bst-artifact-server Manual"
 .SH NAME
 bst-artifact-server \- CAS Artifact Server
 .SH SYNOPSIS

man/bst-artifact.1

-.TH "BST ARTIFACT" "1" "24-Jan-2019" "" "bst artifact Manual"
+.TH "BST ARTIFACT" "1" "12-Feb-2019" "" "bst artifact Manual"
 .SH NAME
 bst\-artifact \- Manipulate cached artifacts
 .SH SYNOPSIS

man/bst-build.1

-.TH "BST BUILD" "1" "24-Jan-2019" "" "bst build Manual"
+.TH "BST BUILD" "1" "12-Feb-2019" "" "bst build Manual"
 .SH NAME
 bst\-build \- Build elements in a pipeline
 .SH SYNOPSIS
@@ -32,3 +32,6 @@ Allow tracking to cross junction boundaries
 .TP
 \fB\-\-track\-save\fP
 Deprecated: This is ignored
+.TP
+\fB\-r,\fP \-\-remote TEXT
+The URL of the remote cache (defaults to the first configured cache)

man/bst-help.1

-.TH "BST HELP" "1" "24-Jan-2019" "" "bst help Manual"
+.TH "BST HELP" "1" "12-Feb-2019" "" "bst help Manual"
 .SH NAME
 bst\-help \- Print usage information
 .SH SYNOPSIS

man/bst-init.1

-.TH "BST INIT" "1" "24-Jan-2019" "" "bst init Manual"
+.TH "BST INIT" "1" "12-Feb-2019" "" "bst init Manual"
 .SH NAME
 bst\-init \- Initialize a new BuildStream project
 .SH SYNOPSIS

man/bst-shell.1

-.TH "BST SHELL" "1" "24-Jan-2019" "" "bst shell Manual"
+.TH "BST SHELL" "1" "12-Feb-2019" "" "bst shell Manual"
 .SH NAME
 bst\-shell \- Shell into an element's sandbox environment
 .SH SYNOPSIS

man/bst-show.1

-.TH "BST SHOW" "1" "24-Jan-2019" "" "bst show Manual"
+.TH "BST SHOW" "1" "12-Feb-2019" "" "bst show Manual"
 .SH NAME
 bst\-show \- Show elements in the pipeline
 .SH SYNOPSIS
@@ -43,6 +43,9 @@ the following symbols can be used in the format string:
     %{public}         Public domain data
     %{workspaced}     If the element is workspaced
     %{workspace-dirs} A list of workspace directories
+    %{deps}           A list of all dependencies
+    %{build-deps}     A list of build dependencies
+    %{runtime-deps}   A list of runtime dependencies
 .PP
 The value of the %{symbol} without the leading '%' character is understood
 as a pythonic formatting string, so python formatting features apply,

man/bst-source-checkout.1

-.TH "BST SOURCE CHECKOUT" "1" "24-Jan-2019" "" "bst source checkout Manual"
+.TH "BST SOURCE CHECKOUT" "1" "12-Feb-2019" "" "bst source checkout Manual"
 .SH NAME
 bst\-source\-checkout \- Checkout sources for an element
 .SH SYNOPSIS

man/bst-source-fetch.1

-.TH "BST SOURCE FETCH" "1" "24-Jan-2019" "" "bst source fetch Manual"
+.TH "BST SOURCE FETCH" "1" "12-Feb-2019" "" "bst source fetch Manual"
 .SH NAME
 bst\-source\-fetch \- Fetch sources in a pipeline
 .SH SYNOPSIS