[Notes] [Git][BuildStream/buildstream][jmac/make_marked_directories] 5 commits: tox.ini: Specify minimum version of click-man

[Jim MacArthur <gitlab mg gitlab com>]

Title: GitLab

Jim MacArthur pushed to branch jmac/make_marked_directories at BuildStream / buildstream

Commits:

• 36746730
  by Chandan Singh at 2019-01-31T10:50:05Z

  tox.ini: Specify minimum version of click-man
  
  `click-man` versions < 0.3.0 do not properly support multiple
  entrypoints. Since this was added to `tox` after `0.3.0` was released,
  `tox` should never be pulling older versions. But, let's add it here for
  documentation purposes.
  
  See
  https://gitlab.com/BuildStream/buildstream/merge_requests/1107#note_135187046
  for some background on this.
  

• fa4a21ce
  by Chandan Singh at 2019-01-31T12:15:43Z

  Merge branch 'chandan/min-version-click-man' into 'master'
  
  tox.ini: Specify minimum version of click-man
  
  See merge request BuildStream/buildstream!1120

• dd791373
  by Chandan Singh at 2019-01-31T14:32:44Z

  testutils/site.py: Support parsing more exotic git versions
  
  We use output of `git --version` to determine if we can run some tests
  that rely on features from newer git versions. Usually, we expect the
  output to be like:
  
      git version 2.17.2
  
  On some platforms, like MacOS, there could be a suffix after the version
  string, so that it looks something like:
  
      git version 2.17.2 (Apple Git-113)
  
  This causes things to fail like so:
  
      ValueError: invalid literal for int() with base 10: '2 (Apple Git-113)\n'
  
  Fix logic around `HAVE_OLD_GIT` such that we split the output of
  `git --version` without limit on how many times we split. Previously we
  used to split only twice so the suffixes like `(Apple Git-113)` are not
  part of the parsed version.
  

• 96c0fbd6
  by Chandan Singh at 2019-01-31T15:39:19Z

  Merge branch 'chandan/fix-git-version-mac' into 'master'
  
  testutils/site.py: Support parsing more exotic git versions
  
  See merge request BuildStream/buildstream!1118

• 73945ef2
  by Jim MacArthur at 2019-01-31T16:36:55Z

  _sandboxremote.py: Create marked directories before running
  
  The other two sandboxes (BWrap and chroot) both do this because
  marked directories may be mount points. _cache_artifact requires
  install-root to be present, and existing BuildStream projects
  may rely on these too.
  

3 changed files:

• buildstream/sandbox/_sandboxremote.py
• tests/testutils/site.py
• tox.ini

Changes:

buildstream/sandbox/_sandboxremote.py

---

...	...	@@ -28,7 +28,7 @@ import grpc
28	28
29	29	from .. import utils
30	30	from .._message import Message, MessageType
31		-from . import Sandbox, SandboxCommandError
	31	+from . import Sandbox, SandboxCommandError, SandboxFlags
32	32	from .sandbox import _SandboxBatch
33	33	from ..storage._filebaseddirectory import FileBasedDirectory
34	34	from ..storage._casbaseddirectory import CasBasedDirectory
...	...	@@ -313,6 +313,15 @@ class SandboxRemote(Sandbox):
313	313	upload_vdir = CasBasedDirectory(cascache, ref=None)
314	314	upload_vdir.import_files(self.get_virtual_directory()._get_underlying_directory())
315	315
	316	+ # Create directories for all marked directories. This emulates
	317	+ # some of the behaviour of other sandboxes, which create these
	318	+ # to use as mount points.
	319	+ if not flags & SandboxFlags.ROOT_READ_ONLY:
	320	+ for mark in self._get_marked_directories():
	321	+ directory = mark['directory']
	322	+ # Create each marked directory
	323	+ upload_vdir.descend(directory.split(os.path.sep), create=True)
	324	+
316	325	upload_vdir.recalculate_hash()
317	326
318	327	# Generate action_digest first

tests/testutils/site.py

---

...	...	@@ -18,7 +18,7 @@ try:
18	18	utils.get_host_tool('git')
19	19	HAVE_GIT = True
20	20	out = str(subprocess.check_output(['git', '--version']), "utf-8")
21		- version = tuple(int(x) for x in out.split(' ', 2)[2].split('.'))
	21	+ version = tuple(int(x) for x in out.split(' ')[2].split('.'))
22	22	HAVE_OLD_GIT = version < (1, 8, 5)
23	23	except ProgramNotFoundError:
24	24	HAVE_GIT = False

tox.ini

---

...	...	@@ -88,5 +88,5 @@ whitelist_externals =
88	88	commands =
89	89	python3 setup.py --command-packages=click_man.commands man_pages
90	90	deps =
91		- click-man
	91	+ click-man >= 0.3.0
92	92	-rrequirements/requirements.txt

—
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.