From 49135a5c8bb9e9480447d878d4699a6739d8efc4 Mon Sep 17 00:00:00 2001 From: xross Date: Wed, 16 Sep 2020 11:42:23 +0100 Subject: [PATCH 1/7] Automated changelog update --- CHANGELOG.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9fc055dc..4a1b56e6 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,8 +5,8 @@ lib_xud Change Log ----- * RESOLVED: Cases where disabling RxError caused firmware to crash - * RESOLVED: USB Disconnect on self-powered devices intermittently causing - EP set to not-ready indefinitely + * RESOLVED: USB Disconnect on self-powered devices intermittently causing EP + set to not-ready indefinitely 1.1.0 ----- From 383dd978dd9364d52863eef6f748ec1f2daec70b Mon Sep 17 00:00:00 2001 From: lucianom Date: Tue, 22 Sep 2020 09:03:43 +0100 Subject: [PATCH 2/7] Replace Pipfile --- Pipfile | 7 ------- python/setup.py | 19 +++++++++++++++++++ requirements.txt | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 7 deletions(-) delete mode 100644 Pipfile create mode 100644 python/setup.py create mode 100644 requirements.txt diff --git a/Pipfile b/Pipfile deleted file mode 100644 index 6d52bfd2..00000000 --- a/Pipfile +++ /dev/null @@ -1,7 +0,0 @@ -[[source]] -name = "pypi" -url = "https://pypi.org/simple" -verify_ssl = true - -[dev-packages] -flake8 = "*" diff --git a/python/setup.py b/python/setup.py new file mode 100644 index 00000000..72b097fa --- /dev/null +++ b/python/setup.py @@ -0,0 +1,19 @@ +# Copyright (c) 2020, XMOS Ltd, All rights reserved +import setuptools + +# Another repository might depend on python code defined in this one. The +# procedure to set up a suitable python environment for that repository may +# pip-install this one as editable using this setup.py file. To minimise the +# chance of version conflicts while ensuring a minimal degree of conformity, +# the 3rd-party modules listed here require the same major version and at +# least the same minor version as specified in the requirements.txt file. +# The same modules should appear in the requirements.txt file as given below. +setuptools.setup( + name='lib_xud', + packages=setuptools.find_packages(), + install_requires=[ + 'flake8~=3.8', + ], + dependency_links=[ + ], +) diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..99e7dd7b --- /dev/null +++ b/requirements.txt @@ -0,0 +1,34 @@ +# python_version 3.7.6 +# +# The parse_version_from_requirements() function in the installPipfile.groovy +# file of the Jenkins Shared Library uses the python_version comment to set +# the version of python used. + +# Distributed (released) dependencies +# +# The python modules listed below specify a known working combination required +# by the python code in this repository. The procedure used to set up a +# suitable python environment for it installs the version of each module in +# the list. Using a specific version ensures a controlled infrastructure for +# development, testing and release of this repository. +# +# Another repository might depend on python code defined in this one. The +# procedure to set up a suitable python environment for that repository may +# 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 + +# Development dependencies +# +# Each link listed below specifies the path to a setup.py file which are +# installed in editable mode with '-e $PATH' (without the quotes). +# +# If python code in this repository depends on python code under development +# in another repository, then an entry for that other respository should +# appear in this list instead of the released dependencies list. +# +# If this repository uses the setup functionality (e.g., script entry points) +# of its own setup.py file, then this list must include an entry for that +# setup.py file, e.g., '-e .' or '-e ./python' (without the quotes). +-e ./python From 484b1b2449b959755f2997c33b63c146e78f2338 Mon Sep 17 00:00:00 2001 From: lucianom Date: Fri, 2 Oct 2020 10:07:41 +0100 Subject: [PATCH 3/7] Update pinned version of xmos_jenkins_shared_library --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index dd8e09e6..c02b016e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,4 @@ -@Library('xmos_jenkins_shared_library@develop') _ - +@Library('xmos_jenkins_shared_library@v0.14.2') _ getApproval() pipeline { From bcca8936a2ed9d8799bc025a0cc21be5d020c5fb Mon Sep 17 00:00:00 2001 From: Luciano Martin Date: Fri, 2 Oct 2020 10:23:18 +0100 Subject: [PATCH 4/7] Add missing newline --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index c02b016e..ec1272dd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,5 @@ @Library('xmos_jenkins_shared_library@v0.14.2') _ + getApproval() pipeline { From 3e6f0a4e3125fc31c8ba815e08ffcc33fec855a9 Mon Sep 17 00:00:00 2001 From: lucianom Date: Mon, 5 Oct 2020 13:23:10 +0100 Subject: [PATCH 5/7] Add entry --- CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4a1b56e6..568d8ead 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,6 +7,7 @@ lib_xud Change Log * RESOLVED: Cases where disabling RxError caused firmware to crash * RESOLVED: USB Disconnect on self-powered devices intermittently causing EP set to not-ready indefinitely + * CHANGED: Pin Python package versions 1.1.0 ----- From e278b11450d62f4b63b78ebf8e925e0b48aae540 Mon Sep 17 00:00:00 2001 From: lucianom Date: Wed, 7 Oct 2020 14:29:59 +0100 Subject: [PATCH 6/7] Remove not necessary cpanfile --- CHANGELOG.rst | 1 + cpanfile | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 cpanfile diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 568d8ead..0a4af100 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -8,6 +8,7 @@ lib_xud Change Log * RESOLVED: USB Disconnect on self-powered devices intermittently causing EP set to not-ready indefinitely * CHANGED: Pin Python package versions + * REMOVED: not necessary cpanfile 1.1.0 ----- diff --git a/cpanfile b/cpanfile deleted file mode 100644 index 071f5e6a..00000000 --- a/cpanfile +++ /dev/null @@ -1,2 +0,0 @@ -requires 'File::Copy::Recursive'; -requires 'LWP::Simple' From 05ff659ba49f010103798b3eae34a971952b01a1 Mon Sep 17 00:00:00 2001 From: lucianom Date: Thu, 8 Oct 2020 12:16:21 +0100 Subject: [PATCH 7/7] Bump version to v1.1.2 --- CHANGELOG.rst | 8 ++++++-- lib_xud/module_build_info | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0a4af100..63266c13 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,14 +1,18 @@ lib_xud Change Log ================== +1.1.2 +----- + + * CHANGED: Pin Python package versions + * REMOVED: not necessary cpanfile + 1.1.1 ----- * RESOLVED: Cases where disabling RxError caused firmware to crash * RESOLVED: USB Disconnect on self-powered devices intermittently causing EP set to not-ready indefinitely - * CHANGED: Pin Python package versions - * REMOVED: not necessary cpanfile 1.1.0 ----- diff --git a/lib_xud/module_build_info b/lib_xud/module_build_info index 7776e185..6fa37f80 100644 --- a/lib_xud/module_build_info +++ b/lib_xud/module_build_info @@ -1,4 +1,4 @@ -VERSION = 1.1.1 +VERSION = 1.1.2 DEPENDENT_MODULES =