[Notes] [Git][BuildStream/buildstream][jjardon/pycodestyle] 8 commits: M

Javier Jardón pushed to branch jjardon/pycodestyle at BuildStream / buildstream

Commits:

7535fda8

by Jürg Billeter at 2018-08-28T14:25:35Z

Merge branch 'tristan/remove-redundant-test' into 'master'

tests/frontend/workspaces.py: Removing some redundant tests

See merge request BuildStream/buildstream!741

9641cb17

by Javier Jardón at 2018-08-28T20:19:30Z

Use pycodestyle instead pep8

pep8 package was renamed to pycodestyle to reduce confusion.

95af9700
by Javier Jardón at 2018-08-28T20:19:30Z
```
WIP
```
49df5a9f
by Javier Jardón at 2018-08-28T20:19:30Z
```
doc/source/conf.py: Fix E201, E202 warnings
```
120a8ada
by Javier Jardón at 2018-08-28T20:19:30Z
```
Fix E305 warnings
```
4ea64d99
by Javier Jardón at 2018-08-28T20:19:30Z
```
Fix E741 warnings
```

7eee6d16

by Javier Jardón at 2018-08-28T20:19:30Z

setup.cfg: Ignore W605 and W504 for now

This is the current occurence:
40      W605 invalid escape sequence '\s'
75      W504 line break after binary operator

de81e3d0
by Javier Jardón at 2018-08-28T20:59:29Z
```
WIP
```

Changes:

.gitlab-ci.yml

@@ -71,6 +71,8 @@ source_dist:
    - chown -R buildstream:buildstream buildstream
    - cd buildstream
 +  - pip3 install pytest-codestyle
++
    # Run the tests from the source distribution, We run as a simple
    # user to test for permission issues
    - su buildstream -c 'python3 setup.py test --index-url invalid://uri --addopts --integration'
@@ -120,6 +122,8 @@ tests-unix:
      # Unpack and get into dist/buildstream
      - cd dist && ./unpack.sh && cd buildstream
 +    - pip3 install pytest-codestyle
++
      # Since the unix platform is required to run as root, no user change required
      - python3 setup.py test --index-url invalid://uri --addopts --integration

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/element.py

@@ -1519,7 +1519,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
                  sandbox_vroot = sandbox.get_virtual_directory()

buildstream/plugins/sources/tar.py

@@ -127,7 +127,7 @@ class TarSource(DownloadableFileSource):
          if not base_dir.endswith(os.sep):
              base_dir = base_dir + os.sep
 -        l = len(base_dir)
 +        L = len(base_dir)
          for member in tar.getmembers():
              # First, ensure that a member never starts with `./`
@@ -145,9 +145,9 @@ class TarSource(DownloadableFileSource):
                  #       base directory.
+                 #
                  if member.type == tarfile.LNKTYPE:
 -                    member.linkname = member.linkname[l:]
 +                    member.linkname = member.linkname[L:]
 -                member.path = member.path[l:]
 +                member.path = member.path[L:]
                  yield member
      # We want to iterate over all paths of a tarball, but getmembers()

buildstream/plugins/sources/zip.py

@@ -121,13 +121,13 @@ class ZipSource(DownloadableFileSource):
          if not base_dir.endswith(os.sep):
              base_dir = base_dir + os.sep
 -        l = len(base_dir)
 +        L = len(base_dir)
          for member in archive.infolist():
              if member.filename == base_dir:
                  continue
              if member.filename.startswith(base_dir):
 -                member.filename = member.filename[l:]
 +                member.filename = member.filename[L:]
                  yield member
      # We want to iterate over all paths of an archive, but namelist()

buildstream/utils.py

@@ -645,6 +645,7 @@ def _pretty_size(size, dec_places=0):
              psize /= 1024
      return "{size:g}{unit}".format(size=round(psize, dec_places), unit=unit)
++
  # A sentinel to be used as a default argument for functions that need
  # to distinguish between a kwarg set to None and an unset kwarg.
  _sentinel = object()

dev-requirements.txt

  coverage == 4.4.0
 -pep8
  pylint == 2.1.1
  pytest >= 3.7
 +pytest-codestyle
  pytest-cov >= 2.5.0
  pytest-datafiles
  pytest-env
 -pytest-pep8
  pytest-pylint
  pytest-xdist

doc/bst2html.py

@@ -96,8 +96,8 @@ def _ansi2html_get_styles(palette):
          for g in range(24):
              i = g + 232
 -            l = g * 10 + 8
 -            indexed_style['%s' % i] = ''.join('%02X' % c if 0 <= c <= 255 else None for c in (l, l, l))
 +            L = g * 10 + 8
 +            indexed_style['%s' % i] = ''.join('%02X' % c if 0 <= c <= 255 else None for c in (L, L, L))
          _ANSI2HTML_STYLES[palette] = (regular_style, bold_style, indexed_style)
      return _ANSI2HTML_STYLES[palette]
@@ -455,6 +455,7 @@ def run_bst(directory, force, source_cache, description, palette):
      return 0
++
  if __name__ == '__main__':
      try:
          run_bst()

doc/source/conf.py

@@ -112,7 +112,7 @@ add_module_names = False
  pygments_style = 'sphinx'
  # A list of ignored prefixes for module index sorting.
 -modindex_common_prefix = [ 'buildstream.' ]
 +modindex_common_prefix = ['buildstream.']
  # If true, keep warnings as "system message" paragraphs in the built documents.
  # keep_warnings = False

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 =
 +    *_pb2.py
  env =
      D:BST_TEST_SUITE=True

tests/cachekey/cachekey.py

@@ -129,6 +129,7 @@ def assert_cache_keys(project_dir, output):
                               "Use tests/cachekey/update.py to automatically " +
                               "update this test case")
++
  ##############################################
  #             Test Entry Point               #
  ##############################################

tests/cachekey/update.py

@@ -65,5 +65,6 @@ def update_keys():
                  write_expected_key(element_name, actual_keys[element_name])
++
  if __name__ == '__main__':
      update_keys()

tests/frontend/buildcheckout.py

@@ -288,6 +288,7 @@ def test_build_checkout_force_tarball(datafiles, cli):
      assert os.path.join('.', 'usr', 'bin', 'hello') in tar.getnames()
      assert os.path.join('.', 'usr', 'include', 'pony.h') in tar.getnames()
++
  fetch_build_checkout_combos = \
      [("strict", kind) for kind in ALL_REPO_KINDS] + \
      [("non-strict", kind) for kind in ALL_REPO_KINDS]

[Notes] [Git][BuildStream/buildstream][jjardon/pycodestyle] 8 commits: Merge branch 'tristan/remove-redundant-test' into 'master'

Javier Jardón pushed to branch jjardon/pycodestyle at BuildStream / buildstream

Commits:

13 changed files:

Changes: