BuildStream 2.1.0.dev0__tar.gz → 2.2.0.dev3__tar.gz

{BuildStream-2.1.0.dev0 → buildstream-2.2.0.dev3}/NEWS

@@ -12,8 +12,7 @@ buildstream 2.1.0
 
   o Fix parsing remotes specified on the command line (#1850)
 
-  o Fix bug when tracking ref-less sources (like local sources) when
-    using project.refs (#1858)
+  o Fix bug when tracking ref-less sources (like local sources) when using project.refs (#1858)
 
   o Follow semantic versioning more strictly (#1854)
 

{BuildStream-2.1.0.dev0 → buildstream-2.2.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: BuildStream
-Version: 2.1.0.dev0
+Version: 2.2.0.dev3
 Summary: A framework for modelling build pipelines in YAML
 Home-page: https://buildstream.build
 Author: The Apache Software Foundation

{BuildStream-2.1.0.dev0 → buildstream-2.2.0.dev3}/doc/source/core_framework.rst

@@ -29,6 +29,7 @@ useful for working on BuildStream itself.
    buildstream.node
    buildstream.plugin
    buildstream.source
+   buildstream.sourcemirror
    buildstream.downloadablefilesource
    buildstream.element
    buildstream.buildelement

{BuildStream-2.1.0.dev0 → buildstream-2.2.0.dev3}/doc/source/format_project.rst

@@ -204,6 +204,9 @@ URLs which are to be used in the individual ``.bst`` files.
      foo: git://git.foo.org/
      bar: http://bar.com/downloads/
 
+If you want this project's alias definitions to also be used for subprojects,
+see :ref:`Mapping source aliases of subprojects <project_junctions_source_aliases>`.
+
 
 Sandbox options
 ~~~~~~~~~~~~~~~
@@ -319,6 +322,9 @@ The mirrors can be overridden on a per project basis using
 be used first in the :ref:`user configuration <config_default_mirror>`, or using
 the  :ref:`--default-mirror <invoking_bst>` command-line argument.
 
+If you want this project's mirrors to also be used for subprojects,
+see :ref:`Mapping source aliases of subprojects <project_junctions_source_aliases>`.
+
 
 .. _project_plugins:
 
@@ -989,6 +995,35 @@ subproject.
    will not accrue runtime dependencies on elements in your *internal* subproject.
 
 
+.. _project_junctions_source_aliases:
+
+Mapping source aliases of subprojects
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+:mod:`junction <elements.junction>` elements allow source aliases of subprojects
+to be mapped to aliases of the parent project. This makes it possible to control
+the translation of aliases to URLs including mirror configuration across multiple
+project levels.
+
+To ensure that there are mappings for all aliases of all subprojects, you can set the
+``disallow-subproject-uris`` flag in the ``junctions`` group here in ``project.conf``.
+
+top-level
+
+.. code:: yaml
+
+   junctions:
+     disallow-subproject-uris: True
+
+This will raise an error if an alias without a mapping is encountered. This flag
+is applied recursively across all junctions.
+
+It also configures ``unaliased-url`` as a fatal warning in all subprojects to
+ensure that the current project is in full control over all source URLs.
+As the fatal warning configuration contributes to the cache key, this flag will
+affect the cache key of subprojects that haven't already configured
+``unaliased-url`` as a fatal warning.
+
+
 .. _project_defaults:
 
 Element default configuration

{BuildStream-2.1.0.dev0 → buildstream-2.2.0.dev3}/doc/source/using_config.rst

@@ -134,6 +134,12 @@ toplevel of your configuration file, like so:
      # Avoid caching build trees if we don't need them
      cache-buildtrees: auto
 
+     # Connection config is parameters given to grpc. It's completely
+     # optional. By default keepalive time is unset and grpc defaults
+     # are used.
+     connection-config:
+       keepalive-time: 60
+
      #
      # Support CAS server as remote cache
      # Useful to minimize network traffic with remote execution

{BuildStream-2.1.0.dev0 → buildstream-2.2.0.dev3}/requirements/dev-requirements.txt

@@ -6,7 +6,7 @@ pytest-datafiles==3.0.0
 pytest-env==0.8.1
 pytest-xdist==3.2.0
 pytest-timeout==2.1.0
-pyftpdlib==1.5.7
+pyftpdlib==1.5.9
 # isort is an indirect requirement, but it must be constrained
 # as 5.12 is not available for python 3.7
 isort==5.11.5

{BuildStream-2.1.0.dev0 → buildstream-2.2.0.dev3}/requirements/requirements.txt

@@ -1,13 +1,13 @@
 click==8.1.3
-grpcio==1.51.3
+grpcio==1.59.3
 Jinja2==3.1.2
 pluginbase==1.0.1
 protobuf==4.22.0
 psutil==5.9.4
 ruamel.yaml==0.17.21
-ruamel.yaml.clib==0.2.7
+ruamel.yaml.clib==0.2.8
 setuptools==67.4.0
-pyroaring==0.3.8
+pyroaring==0.4.4
 ujson==5.7.0
 ## The following requirements were added by pip freeze:
 MarkupSafe==2.1.2

{BuildStream-2.1.0.dev0 → buildstream-2.2.0.dev3}/src/BuildStream.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: BuildStream
-Version: 2.1.0.dev0
+Version: 2.2.0.dev3
 Summary: A framework for modelling build pipelines in YAML
 Home-page: https://buildstream.build
 Author: The Apache Software Foundation

{BuildStream-2.1.0.dev0 → buildstream-2.2.0.dev3}/src/BuildStream.egg-info/SOURCES.txt

@@ -351,15 +351,19 @@ src/buildstream/_sourcecache.py
 src/buildstream/_state.py
 src/buildstream/_stream.py
 src/buildstream/_types.c
+src/buildstream/_types.pyi
 src/buildstream/_types.pyx
 src/buildstream/_utils.c
+src/buildstream/_utils.pyi
 src/buildstream/_utils.pyx
 src/buildstream/_variables.c
+src/buildstream/_variables.pyi
 src/buildstream/_variables.pyx
 src/buildstream/_version.py
 src/buildstream/_versions.py
 src/buildstream/_workspaces.py
 src/buildstream/_yaml.c
+src/buildstream/_yaml.pyi
 src/buildstream/_yaml.pyx
 src/buildstream/buildelement.py
 src/buildstream/downloadablefilesource.py
@@ -367,11 +371,13 @@ src/buildstream/element.py
 src/buildstream/exceptions.py
 src/buildstream/node.c
 src/buildstream/node.pxd
+src/buildstream/node.pyi
 src/buildstream/node.pyx
 src/buildstream/plugin.py
 src/buildstream/py.typed
 src/buildstream/scriptelement.py
 src/buildstream/source.py
+src/buildstream/sourcemirror.py
 src/buildstream/types.py
 src/buildstream/utils.py
 src/buildstream/_cas/__init__.py
@@ -390,6 +396,7 @@ src/buildstream/_frontend/widget.py
 src/buildstream/_loader/__init__.py
 src/buildstream/_loader/loadcontext.py
 src/buildstream/_loader/loadelement.c
+src/buildstream/_loader/loadelement.pyi
 src/buildstream/_loader/loadelement.pyx
 src/buildstream/_loader/loader.py
 src/buildstream/_loader/metasource.py
@@ -413,6 +420,7 @@ src/buildstream/_pluginfactory/pluginoriginjunction.py
 src/buildstream/_pluginfactory/pluginoriginlocal.py
 src/buildstream/_pluginfactory/pluginoriginpip.py
 src/buildstream/_pluginfactory/sourcefactory.py
+src/buildstream/_pluginfactory/sourcemirrorfactory.py
 src/buildstream/_protos/__init__.py
 src/buildstream/_protos/build/__init__.py
 src/buildstream/_protos/build/bazel/__init__.py
@@ -549,6 +557,7 @@ src/buildstream/plugins/elements/manual.yaml
 src/buildstream/plugins/elements/script.py
 src/buildstream/plugins/elements/script.yaml
 src/buildstream/plugins/elements/stack.py
+src/buildstream/plugins/sourcemirrors/default.py
 src/buildstream/plugins/sources/__init__.py
 src/buildstream/plugins/sources/local.py
 src/buildstream/plugins/sources/remote.py
@@ -1787,6 +1796,7 @@ tests/frontend/project/files/sub2-project/project.conf
 tests/frontend/project/files/sub2-project/elements/import-sub.bst
 tests/frontend/project/files/sub2-project/files/etc-files/etc/animal.conf
 tests/frontend/project/plugins/randomelement.py
+tests/frontend/project/sourcemirrors/mirror.py
 tests/frontend/project/sources/fetch_source.py
 tests/frontend/project_fail/project.conf
 tests/frontend/project_fail/elements/compose-all.bst
@@ -2242,6 +2252,7 @@ tests/sources/tar/fetch/target-lz.bst
 tests/sources/tar/fetch/target.bst
 tests/sources/tar/fetch/content/a/c
 tests/sources/tar/fetch/content/a/b/d
+tests/sources/tar/fetch/sourcemirrors/bearermirror.py
 tests/sources/tar/no-basedir/target.bst
 tests/sources/tar/no-basedir/content/a/c
 tests/sources/tar/no-basedir/content/a/b/d
@@ -2263,6 +2274,7 @@ tests/sources/variables/unresolveable-target.bst
 tests/sources/variables/folder/file.txt
 tests/testutils/__init__.py
 tests/testutils/artifactshare.py
+tests/testutils/bearer_http_server.py
 tests/testutils/constants.py
 tests/testutils/context.py
 tests/testutils/element_generators.py

{BuildStream-2.1.0.dev0 → buildstream-2.2.0.dev3}/src/buildstream/__init__.py

@@ -32,6 +32,7 @@ if "_BST_COMPLETION" not in os.environ:
     from .node import MappingNode, Node, ProvenanceInformation, ScalarNode, SequenceNode
     from .plugin import Plugin
     from .source import Source, SourceError, SourceFetcher
+    from .sourcemirror import SourceMirror, SourceMirrorError
     from .downloadablefilesource import DownloadableFileSource
     from .element import Element, ElementError, DependencyConfiguration
     from .buildelement import BuildElement

{BuildStream-2.1.0.dev0 → buildstream-2.2.0.dev3}/src/buildstream/_cas/casremote.py

@@ -13,6 +13,7 @@
 #
 
 import grpc
+from google.protobuf.duration_pb2 import Duration  # pylint: disable=no-name-in-module
 
 from .._protos.google.rpc import code_pb2
 from .._protos.build.buildgrid import local_cas_pb2
@@ -69,6 +70,8 @@ class CASRemote(BaseRemote):
             cas_endpoint.client_key = self.spec.client_key
         if self.spec.client_cert:
             cas_endpoint.client_cert = self.spec.client_cert
+        if self.spec.keepalive_time is not None:
+            cas_endpoint.keepalive_time = Duration().FromSeconds(self.spec.keepalive_time)
         try:
             response = local_cas.GetInstanceNameForRemotes(request)
         except grpc.RpcError as e:

{BuildStream-2.1.0.dev0 → buildstream-2.2.0.dev3}/src/buildstream/_frontend/app.py

@@ -354,16 +354,16 @@ class App:
     #
     # Args:
     #    project_name (str): The project name, must be a valid symbol name
-    #    min_version (str): The minimum required version of BuildStream (default is current version)
-    #    element_path (str): The subdirectory to store elements in, default is 'elements'
+    #    min_version (str): The minimum required version of BuildStream
+    #    element_path (str): The subdirectory to store elements in
     #    force (bool): Allow overwriting an existing project.conf
     #    target_directory (str): The target directory the project should be initialized in
     #
     def init_project(
         self,
         project_name,
-        min_version=None,
-        element_path="elements",
+        min_version,
+        element_path,
         force=False,
         target_directory=None,
     ):
@@ -375,10 +375,6 @@ class App:
 
         project_path = os.path.join(directory, "project.conf")
 
-        if min_version is None:
-            bst_major, bst_minor = utils.get_bst_version()
-            min_version = "{}.{}".format(bst_major, bst_minor)
-
         try:
             if self._set_project_dir:
                 raise AppError(
@@ -901,21 +897,18 @@ class App:
     #
     # Args:
     #    project_name (str): The project name, must be a valid symbol name
-    #    min_version (str): The minimum BuildStream version, default is the latest version
-    #    element_path (str): The subdirectory to store elements in, default is 'elements'
+    #    min_version (str): The minimum BuildStream version
+    #    element_path (str): The subdirectory to store elements in
     #
     # Returns:
     #    project_name (str): The user selected project name
     #    min_version (int): The user selected minimum BuildStream version
     #    element_path (str): The user selected element path
     #
-    def _init_project_interactive(self, project_name, min_version=None, element_path="elements"):
+    def _init_project_interactive(self, project_name, min_version, element_path):
 
         bst_major, bst_minor = utils._get_bst_api_version()
 
-        if min_version is None:
-            min_version = "{}.{}".format(bst_major, bst_minor)
-
         def project_name_proc(user_input):
             try:
                 node._assert_symbol_name(user_input, "project name")

{BuildStream-2.1.0.dev0 → buildstream-2.2.0.dev3}/src/buildstream/_frontend/cli.py

@@ -408,7 +408,7 @@ def help_command(ctx, command):
 @click.option(
     "--min-version",
     type=click.STRING,
-    default="2.0",
+    default="2.2",
     show_default=True,
     help="The required format version",
 )