[Notes] [Git][BuildStream/buildstream][juerg/python3.7] 4 commits: Add w

Jürg Billeter pushed to branch juerg/python3.7 at BuildStream / buildstream

Commits:

42aa3999

by William Salmon at 2018-08-07T13:41:02Z

Add warning to git track if track and ref are not present

This is to address https://gitlab.com/BuildStream/buildstream/issues/471 that
documented unhelpfull behavour when tracking git sources.

2ceb5dec

by Will Salmon at 2018-08-07T14:46:36Z

Merge branch 'willsalmon/trackWarning' into 'master'

Add warning to git track if track and ref are not present

Closes #471

See merge request BuildStream/buildstream!580

eee4b674

by Jürg Billeter at 2018-08-07T15:36:35Z

Revert "Restrict version of pylint"

This reverts commit 4f168b9b6a02216e2fae24d758ae6b778e545869.

The latest version of pytest_pylint works fine with pylint 2, which
means there is no longer a reason to restrict the pylint version.

pylint 2 is required for Python 3.7.

ea27e389

by Jürg Billeter at 2018-08-07T15:36:35Z

_artifactcache/cascache.py: Fix for PEP 479 / Python 3.7

Do not rely on `StopIteration` bubbling up.

https://www.python.org/dev/peps/pep-0479/

Changes:

buildstream/_artifactcache/cascache.py

@@ -846,6 +846,9 @@ class _CASRemote():
  def _grouper(iterable, n):
 -    # pylint: disable=stop-iteration-return
      while True:
 -        yield itertools.chain([next(iterable)], itertools.islice(iterable, n - 1))
 +        try:
 +            current = next(iterable)
 +        except StopIteration:
 +            return
 +        yield itertools.chain([current], itertools.islice(iterable, n - 1))

buildstream/_pipeline.py

@@ -358,10 +358,24 @@ class Pipeline():
                      inconsistent.append(element)
          if inconsistent:
 -            detail = "Exact versions are missing for the following elements\n" + \
 -                     "Try tracking these elements first with `bst track`\n\n"
 +            detail = "Exact versions are missing for the following elements:\n\n"
++
 +            missingTrack = 0
              for element in inconsistent:
 -                detail += "  " + element._get_full_name() + "\n"
 +                detail += "  " + element._get_full_name()
 +                for source in element.sources():
 +                    if not source._get_consistency() and not source.get_ref():
 +                        if hasattr(source, 'tracking') and source.tracking is None:
 +                            detail += ": Source {} is missing ref and track. ".format(source._get_full_name()) + \
 +                                      "Please specify a ref or branch/tag to track."
 +                            missingTrack = 1
++
 +                detail += "\n"
++
 +            if missingTrack:
 +                detail += "\nThen track these elements with `bst track`\n"
 +            else:
 +                detail += "\nTry tracking these elements first with `bst track`\n"
              raise PipelineError("Inconsistent pipeline", detail=detail, reason="inconsistent-pipeline")
      #############################################################

buildstream/plugins/sources/git.py

@@ -363,6 +363,12 @@ class GitSource(Source):
          # If self.tracking is not specified it's not an error, just silently return
          if not self.tracking:
 +            # Is there a better way to check if a ref is given.
 +            if self.mirror.ref is None:
 +                detail = 'Without a tracking branch ref can not be updated. Please ' + \
 +                         'provide a ref or a track.'
 +                raise SourceError("{}: No track or ref".format(self),
 +                                  detail=detail, reason="track-attempt-no-track")
              return None
          with self.timed_activity("Tracking {} from {}"

setup.py

@@ -272,6 +272,5 @@ setup(name='BuildStream',
                       'pytest-cov >= 2.5.0',
                       # Provide option to run tests in parallel, less reliable
                       'pytest-xdist',
 -                     'pytest >= 3.1.0',
 -                     'pylint >= 1.8 , < 2'],
 +                     'pytest >= 3.1.0'],
        zip_safe=False)

tests/sources/git.py

@@ -359,3 +359,45 @@ def test_submodule_track_ignore_inconsistent(cli, tmpdir, datafiles):
      # Assert that we are just fine without it, and emit a warning to the user.
      assert "Ignoring inconsistent submodule" in result.stderr
++
++
 +@pytest.mark.skipif(HAVE_GIT is False, reason="git is not available")
 +@pytest.mark.datafiles(os.path.join(DATA_DIR, 'template'))
 +def test_submodule_track_no_ref_or_track(cli, tmpdir, datafiles):
 +    project = os.path.join(datafiles.dirname, datafiles.basename)
++
 +    # Create the repo from 'repofiles' subdir
 +    repo = create_repo('git', str(tmpdir))
 +    ref = repo.create(os.path.join(project, 'repofiles'))
++
 +    # Write out our test target
 +    gitsource = repo.source_config(ref=None)
 +    gitsource.pop('track')
 +    element = {
 +        'kind': 'import',
 +        'sources': [
 +            gitsource
 +        ]
 +    }
++
 +    _yaml.dump(element, os.path.join(project, 'target.bst'))
++
 +    # Track will encounter an inconsistent submodule without any ref
 +    result = cli.run(project=project, args=['track', 'target.bst'])
 +    result.assert_main_error(ErrorDomain.STREAM, None)
 +    result.assert_task_error(ErrorDomain.SOURCE, 'track-attempt-no-track')
++
 +    # Assert that we are just fine without it, and emit a warning to the user.
 +    assert "FAILURE git source at" in result.stderr
 +    assert "Without a tracking branch ref can not be updated. Please " + \
 +        "provide a ref or a track." in result.stderr
++
 +    # Track will encounter an inconsistent submodule without any ref
 +    result = cli.run(project=project, args=['build', 'target.bst'])
 +    result.assert_main_error(ErrorDomain.PIPELINE, 'inconsistent-pipeline')
 +    result.assert_task_error(None, None)
++
 +    # Assert that we are just fine without it, and emit a warning to the user.
 +    assert "Exact versions are missing for the following elements" in result.stderr
 +    assert "is missing ref and track." in result.stderr
 +    assert "Then track these elements with `bst track`" in result.stderr

[Notes] [Git][BuildStream/buildstream][juerg/python3.7] 4 commits: Add warning to git track if track and ref are not present

Jürg Billeter pushed to branch juerg/python3.7 at BuildStream / buildstream

Commits:

5 changed files:

Changes: