[Notes] [Git][BuildStream/buildstream][master] 13 commits: dev-requirements.txt: Require at least pytest 3.9

[Tristan Van Berkom <gitlab mg gitlab com>]

Title: GitLab

Tristan Van Berkom pushed to branch master at BuildStream / buildstream

Commits:

• caf49669
  by Tristan Van Berkom at 2018-12-26T19:54:05Z

  dev-requirements.txt: Require at least pytest 3.9
  
  Recently we have been adding some tests which use the new tmp_path
  fixture from pytest, this is new in 3.9.
  

• 425781db
  by Tristan Van Berkom at 2018-12-26T19:54:05Z

  _signals.py: Fixing new (simplifiable-if-_expression_) linter errors
  

• 1f8cc996
  by Tristan Van Berkom at 2018-12-26T19:54:05Z

  element.py: Fixing new (unnecessary-pass) and (simplifiable-if-_expression_) linter errors
  

• 89632150
  by Tristan Van Berkom at 2018-12-26T19:54:05Z

  source.py: Fixing new (unnecessary-pass) linter error
  

• 26d135ba
  by Tristan Van Berkom at 2018-12-26T19:54:05Z

  _artifactcache/casserver.py: Fixed new (wrong-import-order) linter error
  

• d0988f80
  by Tristan Van Berkom at 2018-12-26T19:54:05Z

  _frontend/cli.py: Fixing new (unnecessary-pass) linter errors
  

• 4d54ab78
  by Tristan Van Berkom at 2018-12-26T19:54:05Z

  _frontend/complete.py: Fixing new (simplifiable-if-_expression_) linter error
  

• ee0d5bf6
  by Tristan Van Berkom at 2018-12-26T19:54:05Z

  _frontend/widget.py: Fixing new (wrong-import-order) linter error
  

• 36295282
  by Tristan Van Berkom at 2018-12-26T19:54:05Z

  plugins/elements/import.py: Fixing new (duplicate-string-formatting-argument) linter error
  

• 4ffe03c6
  by Tristan Van Berkom at 2018-12-26T19:54:05Z

  buildstream/storage/_casbaseddirectory.py: Fixing new (unnecessary-pass) linter errors
  

• 80c137d5
  by Tristan Van Berkom at 2018-12-26T19:54:05Z

  dev-requirements.txt: Require new version of pytest-datafiles
  
  Since Thomas Nixon fixed the datafiles plugin to be compatible
  with pytest >= 3.8.0, we can now depend on it and avoid the
  warnings and errors which the older datafiles plugin causes.
  
  This fixes issue #636
  

• 61906a14
  by Tristan Van Berkom at 2018-12-26T19:54:05Z

  dev-requirements.txt: Remove the restriction on pylint.
  
  After having fixed the more recent linting errors, the
  tests should pass with recent versions of pylint. Tested
  with pylint 2.2.2.
  

• 94b9948c
  by Tristan Van Berkom at 2018-12-26T22:35:29Z

  Merge branch 'tristan/test-fixes' into 'master'
  
  Misc fixes to the tests and newer linter errors
  
  Closes #636
  
  See merge request BuildStream/buildstream!1011

10 changed files:

• buildstream/_artifactcache/casserver.py
• buildstream/_frontend/cli.py
• buildstream/_frontend/complete.py
• buildstream/_frontend/widget.py
• buildstream/_signals.py
• buildstream/element.py
• buildstream/plugins/elements/import.py
• buildstream/source.py
• buildstream/storage/_casbaseddirectory.py
• dev-requirements.txt

Changes:

buildstream/_artifactcache/casserver.py

---

...	...	@@ -27,8 +27,8 @@ import uuid
27	27	import errno
28	28	import threading
29	29
30		-import click
31	30	import grpc
	31	+import click
32	32
33	33	from .._protos.build.bazel.remote.execution.v2 import remote_execution_pb2, remote_execution_pb2_grpc
34	34	from .._protos.google.bytestream import bytestream_pb2, bytestream_pb2_grpc

buildstream/_frontend/cli.py

---

...	...	@@ -673,7 +673,6 @@ def checkout(app, element, location, force, deps, integrate, hardlinks, tar):
673	673	@cli.group(short_help="Manipulate sources for an element")
674	674	def source():
675	675	"""Manipulate sources for an element"""
676		- pass
677	676
678	677
679	678	##################################################################
...	...	@@ -822,7 +821,6 @@ def source_checkout(app, element, location, force, deps, fetch_, except_,
822	821	@cli.group(short_help="Manipulate developer workspaces")
823	822	def workspace():
824	823	"""Manipulate developer workspaces"""
825		- pass
826	824
827	825
828	826	##################################################################
...	...	@@ -1000,7 +998,6 @@ def _classify_artifacts(names, cas, project_directory):
1000	998	@cli.group(short_help="Manipulate cached artifacts")
1001	999	def artifact():
1002	1000	"""Manipulate cached artifacts"""
1003		- pass
1004	1001
1005	1002
1006	1003	################################################################

buildstream/_frontend/complete.py

---

...	...	@@ -203,7 +203,7 @@ def is_incomplete_option(all_args, cmd_param):
203	203	if start_of_option(arg_str):
204	204	last_option = arg_str
205	205
206		- return True if last_option and last_option in cmd_param.opts else False
	206	+ return bool(last_option and last_option in cmd_param.opts)
207	207
208	208
209	209	def is_incomplete_argument(current_params, cmd_param):

buildstream/_frontend/widget.py

---

...	...	@@ -23,8 +23,8 @@ from contextlib import ExitStack
23	23	from mmap import mmap
24	24	import re
25	25	import textwrap
26		-import click
27	26	from ruamel import yaml
	27	+import click
28	28
29	29	from . import Profile
30	30	from .. import Element, Consistency

buildstream/_signals.py

---

...	...	@@ -77,7 +77,7 @@ def terminator(terminate_func):
77	77	yield
78	78	return
79	79
80		- outermost = False if terminator_stack else True
	80	+ outermost = bool(not terminator_stack)
81	81
82	82	terminator_stack.append(terminate_func)
83	83	if outermost:
...	...	@@ -137,7 +137,7 @@ def suspend_handler(sig, frame):
137	137	def suspendable(suspend_callback, resume_callback):
138	138	global suspendable_stack # pylint: disable=global-statement
139	139
140		- outermost = False if suspendable_stack else True
	140	+ outermost = bool(not suspendable_stack)
141	141	suspender = Suspender(suspend_callback, resume_callback)
142	142	suspendable_stack.append(suspender)
143	143

buildstream/element.py

---

...	...	@@ -326,7 +326,6 @@ class Element(Plugin):
326	326
327	327	*Since: 1.2*
328	328	"""
329		- pass
330	329
331	330	def assemble(self, sandbox):
332	331	"""Assemble the output artifact
...	...	@@ -1340,7 +1339,7 @@ class Element(Plugin):
1340	1339	@contextmanager
1341	1340	def _prepare_sandbox(self, scope, directory, shell=False, integrate=True, usebuildtree=False):
1342	1341	# bst shell and bst checkout require a local sandbox.
1343		- bare_directory = True if directory else False
	1342	+ bare_directory = bool(directory)
1344	1343	with self.__sandbox(directory, config=self.__sandbox_config, allow_remote=False,
1345	1344	bare_directory=bare_directory) as sandbox:
1346	1345	sandbox._usebuildtree = usebuildtree
...	...	@@ -1695,7 +1694,7 @@ class Element(Plugin):
1695	1694
1696	1695	# Store workspaced.yaml
1697	1696	_yaml.dump(_yaml.node_sanitize({
1698		- 'workspaced': True if self._get_workspace() else False
	1697	+ 'workspaced': bool(self._get_workspace())
1699	1698	}), os.path.join(metadir, 'workspaced.yaml'))
1700	1699
1701	1700	# Store workspaced-dependencies.yaml

buildstream/plugins/elements/import.py

---

...	...	@@ -112,7 +112,7 @@ class ImportElement(BuildElement):
112	112
113	113	# Ensure target directory parent exists but target directory doesn't
114	114	commands.append("mkdir -p {}".format(os.path.dirname(outputdir)))
115		- commands.append("[ ! -e {} ] || rmdir {}".format(outputdir, outputdir))
	115	+ commands.append("[ ! -e {outputdir} ] || rmdir {outputdir}".format(outputdir=outputdir))
116	116
117	117	# Move it over
118	118	commands.append("mv {} {}".format(inputdir, outputdir))

buildstream/source.py

---

...	...	@@ -499,7 +499,6 @@ class Source(Plugin):
499	499
500	500	*Since: 1.4*
501	501	"""
502		- pass
503	502
504	503	#############################################################
505	504	# Public Methods #

buildstream/storage/_casbaseddirectory.py

---

...	...	@@ -53,12 +53,10 @@ class IndexEntry():
53	53	class ResolutionException(VirtualDirectoryError):
54	54	""" Superclass of all exceptions that can be raised by
55	55	CasBasedDirectory._resolve. Should not be used outside this module. """
56		- pass
57	56
58	57
59	58	class InfiniteSymlinkException(ResolutionException):
60	59	""" Raised when an infinite symlink loop is found. """
61		- pass
62	60
63	61
64	62	class AbsoluteSymlinkException(ResolutionException):
...	...	@@ -66,7 +64,6 @@ class AbsoluteSymlinkException(ResolutionException):
66	64	target starts with the path separator) and we have disallowed
67	65	following such symlinks.
68	66	"""
69		- pass
70	67
71	68
72	69	class UnexpectedFileException(ResolutionException):
...	...	@@ -664,13 +661,11 @@ class CasBasedDirectory(Directory):
664	661	""" Sets a static modification time for all regular files in this directory.
665	662	Since we don't store any modification time, we don't need to do anything.
666	663	"""
667		- pass
668	664
669	665	def set_deterministic_user(self):
670	666	""" Sets all files in this directory to the current user's euid/egid.
671	667	We also don't store user data, so this can be ignored.
672	668	"""
673		- pass
674	669
675	670	def export_files(self, to_directory, *, can_link=False, can_destroy=False):
676	671	"""Copies everything from this into to_directory, which must be the name

dev-requirements.txt

---

1	1	coverage == 4.4.0
2	2	pep8
3		-pylint == 2.1.1
4		-pytest >= 3.8
	3	+pylint
	4	+pytest >= 3.9
5	5	pytest-cov >= 2.5.0
6		-pytest-datafiles
	6	+pytest-datafiles >= 2.0
7	7	pytest-env
8	8	pytest-pep8
9	9	pytest-pylint

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.