[Notes] [Git][BuildStream/buildstream][tristan/empty-manual-element] 3 commits: Remove dependency on pytest-runner

[Tristan Van Berkom <gitlab mg gitlab com>]

Title: GitLab

Tristan Van Berkom pushed to branch tristan/empty-manual-element at BuildStream / buildstream

Commits:

• b27b592a
  by Benjamin Schubert at 2018-11-01T10:49:57Z

  Remove dependency on pytest-runner
  
  This includes a new command mimicking pytest-runner so that we
  can drop this dependency
  
  This was the only setup_requires dependency that we had and
  will make like easier for people behind proxies
  

• 89ace5d7
  by Benjamin Schubert at 2018-11-01T11:16:36Z

  Merge branch 'bschubert/remove-pytest-runner' into 'master'
  
  Remove dependency on pytest-runner
  
  See merge request BuildStream/buildstream!886

• 4cfabce8
  by Angelos Evripiotis at 2018-11-01T11:35:02Z

  BREAK: manual.yaml: don't set any default env vars
  
  Remove the 'MAKEFLAGS' and 'V' defaults.
  
  Now that there is a specialised 'make' element, these make-specific
  defaults don't make sense here. This element is meant to be a blank
  slate for folks to build on.
  
  Note that this is a breaking change, that will require some users to
  make changes to their .bst files if they are expecting these environment
  variable to be set.
  
  _versions.py: BST_FORMAT_VERSION bumped to 18.
  
  This fixes issue #718
  

4 changed files:

• NEWS
• buildstream/_versions.py
• buildstream/plugins/elements/manual.yaml
• setup.py

Changes:

NEWS

---

...	...	@@ -2,6 +2,12 @@
2	2	buildstream 1.3.1
3	3	=================
4	4
	5	+ o BREAKING CHANGE: The 'manual' element lost its default 'MAKEFLAGS' and 'V'
	6	+ environment variables. There is already a 'make' element with the same
	7	+ variables. Note that this is a breaking change, it will require users to
	8	+ make changes to their .bst files if they are expecting these environment
	9	+ variables to be set.
	10	+
5	11	o Failed builds are included in the cache as well.
6	12	`bst checkout` will provide anything in `%{install-root}`.
7	13	A build including cached fails will cause any dependant elements

buildstream/_versions.py

---

...	...	@@ -23,7 +23,7 @@
23	23	# This version is bumped whenever enhancements are made
24	24	# to the `project.conf` format or the core element format.
25	25	#
26		-BST_FORMAT_VERSION = 17
	26	+BST_FORMAT_VERSION = 18
27	27
28	28
29	29	# The base BuildStream artifact version

buildstream/plugins/elements/manual.yaml

---

1		-# No variables added for the manual element by default, set
2		-# this if you plan to use make, and the sources cannot handle
3		-# parallelization.
4		-#
5		-# variables:
6		-#
7		-# notparallel: True
8		-
9	1	# Manual build element does not provide any default
10	2	# build commands
11	3	config:
...	...	@@ -28,14 +20,3 @@ config:
28	20	strip-commands:
29	21	- |
30	22	%{strip-binaries}
31		-
32		-# Use max-jobs CPUs for building and enable verbosity
33		-environment:
34		- MAKEFLAGS: -j%{max-jobs}
35		- V: 1
36		-
37		-# And dont consider MAKEFLAGS or V as something which may
38		-# affect build output.
39		-environment-nocache:
40		-- MAKEFLAGS
41		-- V

setup.py

---

...	...	@@ -39,6 +39,7 @@ if sys.version_info[0] != REQUIRED_PYTHON_MAJOR or sys.version_info[1] < REQUIRE
39	39	try:
40	40	from setuptools import setup, find_packages, Command
41	41	from setuptools.command.easy_install import ScriptWriter
	42	+ from setuptools.command.test import test as TestCommand
42	43	except ImportError:
43	44	print("BuildStream requires setuptools in order to build. Install it using"
44	45	" your package manager (usually python3-setuptools) or via pip (pip3"
...	...	@@ -219,9 +220,48 @@ class BuildGRPC(Command):
219	220	f.write(code)
220	221
221	222
	223	+#####################################################
	224	+# Pytest command #
	225	+#####################################################
	226	+class PyTest(TestCommand):
	227	+ """Defines a pytest command class to run tests from setup.py"""
	228	+
	229	+ user_options = TestCommand.user_options + [
	230	+ ("addopts=", None, "Arguments to pass to pytest"),
	231	+ ('index-url=''build_grpc': BuildGRPC,
	264	+ 'pytest': PyTest,
225	265	}
226	266	cmdclass.update(versioneer.get_cmdclass())
227	267	return cmdclass
...	...	@@ -305,6 +345,5 @@ setup(name='BuildStream',
305	345	'grpcio >= 1.10',
306	346	],
307	347	entry_points=bst_install_entry_points,
308		- setup_requires=['pytest-runner'],
309	348	tests_require=dev_requires,
310	349	zip_safe=False)

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