[Notes] [Git][BuildStream/buildstream][tlater/message-lines] 4 commits:

Tristan Maat pushed to branch tlater/message-lines at BuildStream / buildstream

Commits:

3b5c8a28

by Tristan Maat at 2019-01-02T15:57:13Z

.gitlab-ci.yml: Use new testsuite images with pycodestyle 1.4.0

We need to bump the testsuite image versions to use the new
pycodestyle update that allows excluding file paths, so that we can
exclude generated python code.

bd60e8a9

by Javier Jardón at 2019-01-02T16:59:41Z

Use pycodestyle instead of pep8

pep8 package was renamed to pycodestyle to reduce confusion.

Disabled warnings:
W504 - Line break after binary operator (seems people like this)
W605 - Invalid escape sequence (some of our regexes use these)

32c47d1c

by Tristan Maat at 2019-01-02T17:32:09Z

Merge branch 'jjardon/pycodestyle' into 'master'

Use pycodestyle instead pep8 python module

See merge request BuildStream/buildstream!638

6d9081bc

by Tristan Maat at 2019-01-02T19:36:58Z

widget.py: Avoid "showing 0 lines" messages when there are no lines

This happened when bst is invoked with --message-lines 0 or
--error-lines 0, and was arguably a little too verbose (the user
explicitly asked us not to show them any lines, after all).

Fixes #779

Changes:

.gitlab-ci.yml

 -image: buildstream/testsuite-debian:9-master-123-7ce6581b
 +image: buildstream/testsuite-debian:9-06bab030-b848172c
  cache:
    key: "$CI_JOB_NAME-"
@@ -91,23 +91,23 @@ source_dist:
      - ${COVERAGE_DIR}
  tests-debian-9:
 -  image: buildstream/testsuite-debian:9-master-123-7ce6581b
 +  image: buildstream/testsuite-debian:9-06bab030-b848172c
    <<: *tests
  tests-fedora-27:
 -  image: buildstream/testsuite-fedora:27-master-123-7ce6581b
 +  image: buildstream/testsuite-fedora:27-06bab030-b848172c
    <<: *tests
  tests-fedora-28:
 -  image: buildstream/testsuite-fedora:28-master-123-7ce6581b
 +  image: buildstream/testsuite-fedora:28-06bab030-b848172c
    <<: *tests
  tests-ubuntu-18.04:
 -  image: buildstream/testsuite-ubuntu:18.04-master-123-7ce6581b
 +  image: buildstream/testsuite-ubuntu:18.04-06bab030-b848172c
    <<: *tests
  overnight-fedora-28-aarch64:
 -  image: buildstream/testsuite-fedora:aarch64-28-master-123-7ce6581b
 +  image: buildstream/testsuite-fedora:aarch64-28-06bab030-32a101f6
    tags:
      - aarch64
    <<: *tests
@@ -120,7 +120,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: buildstream/testsuite-fedora:27-master-123-7ce6581b
 +  image: buildstream/testsuite-fedora:27-06bab030-b848172c
    <<: *tests
    variables:
      BST_FORCE_BACKEND: "unix"
@@ -140,7 +140,7 @@ tests-unix:
  tests-fedora-missing-deps:
    # Ensure that tests behave nicely while missing bwrap and ostree
 -  image: buildstream/testsuite-fedora:28-master-123-7ce6581b
 +  image: buildstream/testsuite-fedora:28-06bab030-b848172c
    <<: *tests
    script:

buildstream/_frontend/widget.py

@@ -647,8 +647,9 @@ class LogLine(Widget):
              abbrev = False
              if message.message_type not in ERROR_MESSAGES \
                 and not frontend_message and n_lines > self._message_lines:
 -                abbrev = True
                  lines = lines[0:self._message_lines]
 +                if self._message_lines > 0:
 +                    abbrev = True
              else:
                  lines[n_lines - 1] = lines[n_lines - 1].rstrip('\n')
@@ -674,7 +675,7 @@ class LogLine(Widget):
              if self.context is not None and not self.context.log_verbose:
                  text += self._indent + self._err_profile.fmt("Log file: ")
                  text += self._indent + self._logfile_widget.render(message) + '\n'
 -            else:
 +            elif self._log_lines > 0:
                  text += self._indent + self._err_profile.fmt("Printing the last {} lines from log file:"
                                                               .format(self._log_lines)) + '\n'
                  text += self._indent + self._logfile_widget.render(message, abbrev=False) + '\n'

buildstream/_ostree.py

@@ -34,7 +34,7 @@ from ._exceptions import BstError, ErrorDomain
  # pylint: disable=wrong-import-position,wrong-import-order
  gi.require_version('OSTree', '1.0')
 -from gi.repository import GLib, Gio, OSTree  # nopep8
 +from gi.repository import GLib, Gio, OSTree  # noqa
  # For users of this file, they must expect (except) it.

buildstream/_signals.py

@@ -38,7 +38,7 @@ def terminator_handler(signal_, frame):
          terminator_ = terminator_stack.pop()
          try:
              terminator_()
 -        except:                                                 # pylint: disable=bare-except
 +        except:                               # noqa pylint: disable=bare-except
              # Ensure we print something if there's an exception raised when
              # processing the handlers. Note that the default exception
              # handler won't be called because we os._exit next, so we must

buildstream/element.py

@@ -1568,7 +1568,7 @@ class Element(Plugin):
                  utils._force_rmtree(rootdir)
              with _signals.terminator(cleanup_rootdir), \
 -                self.__sandbox(rootdir, output_file, output_file, self.__sandbox_config) as sandbox:  # nopep8
 +                self.__sandbox(rootdir, output_file, output_file, self.__sandbox_config) as sandbox:  # noqa
                  # By default, the dynamic public data is the same as the static public data.
                  # The plugin's assemble() method may modify this, though.

dev-requirements.txt

  coverage == 4.4.0
 -pep8
  pylint
  pytest >= 3.9
 +pytest-codestyle >= 1.4.0
  pytest-cov >= 2.5.0
  pytest-datafiles >= 2.0
  pytest-env
 -pytest-pep8
  pytest-pylint
  pytest-xdist
  pytest-timeout

setup.cfg

@@ -11,20 +11,11 @@ parentdir_prefix = BuildStream-
  test=pytest
  [tool:pytest]
 -addopts = --verbose --basetemp ./tmp --pep8 --pylint --pylint-rcfile=.pylintrc --cov=buildstream --cov-config .coveragerc --durations=20
 +addopts = --verbose --basetemp ./tmp --codestyle --pylint --pylint-rcfile=.pylintrc --cov=buildstream --cov-config .coveragerc --durations=20
  norecursedirs = tests/integration/project integration-cache tmp __pycache__ .eggs
  python_files = tests/*/*.py
 -pep8maxlinelength = 119
 -pep8ignore =
 -    * E129
 -    * E125
 -    doc/source/conf.py ALL
 -    tmp/* ALL
 -    */lib/python3* ALL
 -    */bin/* ALL
 -    buildstream/_fuse/fuse.py ALL
 -    .eggs/* ALL
 -    *_pb2.py ALL
 -    *_pb2_grpc.py ALL
 +codestyle_max_line_length = 119
 +codestyle_ignore = E129 E125 W504 W605
 +codestyle_exclude = doc/source/conf.py buildstream/_fuse/fuse.py buildstream/_protos/**/*py
  env =
      D:BST_TEST_SUITE=True

tests/testutils/http_server.py

@@ -29,7 +29,7 @@ class RequestHandler(SimpleHTTPRequestHandler):
                  expected_password, directory = self.server.users[user]
                  if password == expected_password:
                      return directory
 -            except:
 +            except:                           # noqa
                  raise Unauthorized('unauthorized')
              return None

[Notes] [Git][BuildStream/buildstream][tlater/message-lines] 4 commits: .gitlab-ci.yml: Use new testsuite images with pycodestyle 1.4.0

Tristan Maat pushed to branch tlater/message-lines at BuildStream / buildstream

Commits:

8 changed files:

Changes: