Merge pull request #39 from xmos/release/v4.2.0

xluciano · web-flow · commit 39d12979549d · 2024-02-16T17:29:16.000Z
Release/v4.2.0
diff --git a/Brewfile b/Brewfile
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 lib_xassert change log
 ======================
 
+4.2.0
+-----
+
+  * ADDED: Support for XCommon CMake build system
+
 4.1.0
 -----
 
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,10 +1,10 @@
-@Library('xmos_jenkins_shared_library@v0.16.2') _
+@Library('xmos_jenkins_shared_library@v0.18.0') _
 
 getApproval()
 
 pipeline {
   agent {
-    label 'x86_64&&brew&&macOS'
+    label 'x86_64&&macOS'
   }
   environment {
     REPO = 'lib_xassert'
diff --git a/lib_xassert/LICENSE.rst b/lib_xassert/LICENSE.rst
diff --git a/lib_xassert/lib_build_info.cmake b/lib_xassert/lib_build_info.cmake
@@ -0,0 +1,7 @@
+set(LIB_NAME lib_xassert)
+set(LIB_VERSION 4.2.0)
+set(LIB_INCLUDES api)
+set(LIB_DEPENDENT_MODULES "")
+set(LIB_OPTIONAL_HEADERS debug_conf.h xassert_conf.h)
+
+XMOS_REGISTER_MODULE()
diff --git a/lib_xassert/module_build_info b/lib_xassert/module_build_info
@@ -1,4 +1,4 @@
-VERSION = 4.1.0
+VERSION = 4.2.0
 
 DEPENDENT_MODULES =
 
diff --git a/requirements.txt b/requirements.txt
@@ -17,6 +17,8 @@
 # pip-install this one as editable using this repository's setup.py file.  The
 # same modules should appear in the setup.py list as given below.
 flake8==3.8.3
+# Pin importlib-metadata to <5 due to https://github.com/python/importlib_metadata/issues/409.
+importlib-metadata==4.13.0
 
 # Development dependencies
 #

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`# pip-install this one as editable using this repository's setup.py file. The`
`18`	`18`	`# same modules should appear in the setup.py list as given below.`
`19`	`19`	`flake8==3.8.3`
	`20`	`+# Pin importlib-metadata to <5 due to https://github.com/python/importlib_metadata/issues/409.`
	`21`	`+importlib-metadata==4.13.0`
`20`	`22`
`21`	`23`	`# Development dependencies`
`22`	`24`	`#`