Merge pull request #49 from xmos/release/v1.1.2

Release v1.1.2
xmos · Oct 10, 2022 · 52cff08 · 52cff08
2 parents 2ad0497 + 131abeb
commit 52cff08
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,13 @@
 xscope fileio change log
 ========================
 
+1.1.2
+-----
+
+  * CHANGED: Update tools version in Jenkinsfile to 15.1.4
+  * CHANGED: Update flake8 python linting to warn instead of error on Jenkins
+  * CHANGED: Pin importlib-meta python package to 4.13.0
+
 1.1.1
 -----
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -7,7 +7,7 @@ pipeline {
   parameters {
     string(
       name: 'TOOLS_VERSION',
-      defaultValue: '15.0.5',
+      defaultValue: '15.1.4',
       description: 'The tools version to build with (check /projects/tools/ReleasesTools/)'
     )
   }
@@ -36,8 +36,10 @@ pipeline {
         stage('Static analysis') {
           steps {
             withVenv() {
-              sh "flake8 --exit-zero --output-file=flake8.xml xscope_fileio"
-              recordIssues enabledForFailure: true, tool: flake8(pattern: 'flake8.xml')
+              warnError("Flake") {
+                sh "flake8 --exit-zero --output-file=flake8.xml xscope_fileio"
+                recordIssues enabledForFailure: true, tool: flake8(pattern: 'flake8.xml')
+              }
             }
           }
         }

diff --git a/requirements.txt b/requirements.txt
@@ -7,6 +7,9 @@ pylint==2.5.3
 pytest==6.0.0
 pytest-xdist==1.34.0
 
+# Pin importlib-metadata to <5 due to https://github.com/python/importlib_metadata/issues/409.
+importlib-metadata==4.13.0
+
 # self-install
 -e ./
 -e xtagctl/

diff --git a/setup.py b/setup.py
@@ -45,7 +45,7 @@ def run(self):
 
 setuptools.setup(
     name="xscope_fileio",
-    version="0.1.0",
+    version="1.1.2",
     cmdclass={"build": CustomBuildCommand, "develop": CustomDevelopCommand,},
     # Note for anyone trying to copy this pattern:
     # package_data keys are NAMES OF PACKAGES, not dirs

diff --git a/xscope_fileio/module_build_info b/xscope_fileio/module_build_info
@@ -1,4 +1,4 @@
-VERSION = 1.1.1
+VERSION = 1.1.2
 
 MODULE_XCC_FLAGS = $(XCC_FLAGS)