From 37946a04d6469c71377e8a9ff360ec5266d0b95d Mon Sep 17 00:00:00 2001 From: lucianom Date: Wed, 16 Sep 2020 16:57:46 +0100 Subject: [PATCH 1/9] 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..36080613 --- /dev/null +++ b/python/setup.py @@ -0,0 +1,19 @@ +# Copyright (c) 2019-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_i2s', + 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 379594871ea74a533be9bd4965efb7426a020c30 Mon Sep 17 00:00:00 2001 From: lucianom Date: Wed, 16 Sep 2020 17:13:37 +0100 Subject: [PATCH 2/9] Fix copyright date --- python/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/setup.py b/python/setup.py index 36080613..cb3cb745 100644 --- a/python/setup.py +++ b/python/setup.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2020, XMOS Ltd, All rights reserved +# Copyright (c) 2020, XMOS Ltd, All rights reserved import setuptools # Another repository might depend on python code defined in this one. The From a341f9347081807b71d563db44971b0dd5273c67 Mon Sep 17 00:00:00 2001 From: lucianom Date: Wed, 16 Sep 2020 17:24:39 +0100 Subject: [PATCH 3/9] Update license date --- LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.txt b/LICENSE.txt index 0cbc97dc..2d62e134 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ Software Release License Agreement -Copyright (c) 2011-2019, XMOS, All rights reserved. +Copyright (c) 2011-2020, XMOS, All rights reserved. BY ACCESSING, USING, INSTALLING OR DOWNLOADING THE XMOS SOFTWARE, YOU AGREE TO BE BOUND BY THE FOLLOWING TERMS. IF YOU DO NOT AGREE TO THESE, DO NOT ATTEMPT TO DOWNLOAD, ACCESS OR USE THE XMOS Software. From af8eaee31bcba59e64d1f32056e22fe61bf6bf03 Mon Sep 17 00:00:00 2001 From: lucianom Date: Wed, 16 Sep 2020 17:34:36 +0100 Subject: [PATCH 4/9] Update lib name --- python/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/setup.py b/python/setup.py index cb3cb745..f8accb46 100644 --- a/python/setup.py +++ b/python/setup.py @@ -9,7 +9,7 @@ # 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_i2s', + name='lib_i2c', packages=setuptools.find_packages(), install_requires=[ 'flake8~=3.8', From 7f05fc91a6010b125696ca91e94324b74e2ad76b Mon Sep 17 00:00:00 2001 From: lucianom Date: Fri, 2 Oct 2020 10:09:25 +0100 Subject: [PATCH 5/9] Update pinned version of xmos_jenkins_shared_library --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cf49e2e6..29389448 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 64495d1a4e883a31618714e5cabfd0acee97ff00 Mon Sep 17 00:00:00 2001 From: Luciano Martin Date: Fri, 2 Oct 2020 10:22:34 +0100 Subject: [PATCH 6/9] Add missing newline --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 29389448..f5c76da7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,5 @@ @Library('xmos_jenkins_shared_library@v0.14.2') _ + getApproval() pipeline { From d5ad03407d22031b60de0de79c0e1ffab4cb16d9 Mon Sep 17 00:00:00 2001 From: lucianom Date: Mon, 5 Oct 2020 13:49:49 +0100 Subject: [PATCH 7/9] Bump version for infrastructure changes --- CHANGELOG.rst | 5 +++++ lib_i2c/module_build_info | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1eef4988..b74eb7a8 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ I2C library change log ====================== +6.0.1 +----- + + * CHANGED: Pin Python package versions + 6.0.0 ----- diff --git a/lib_i2c/module_build_info b/lib_i2c/module_build_info index 73ddc4af..4e436759 100644 --- a/lib_i2c/module_build_info +++ b/lib_i2c/module_build_info @@ -1,4 +1,4 @@ -VERSION = 6.0.0 +VERSION = 6.0.1 DEPENDENT_MODULES = lib_xassert(>=4.0.0) \ lib_logging(>=3.0.0) From 079b16b1f95e5325918bdfe8e5d9f1984ce4f364 Mon Sep 17 00:00:00 2001 From: lucianom Date: Mon, 5 Oct 2020 14:55:41 +0100 Subject: [PATCH 8/9] Update LICENSE date --- lib_i2c/LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_i2c/LICENSE.txt b/lib_i2c/LICENSE.txt index 8748df11..c79ba1b2 100644 --- a/lib_i2c/LICENSE.txt +++ b/lib_i2c/LICENSE.txt @@ -1,6 +1,6 @@ Software Release License Agreement -Copyright (c) 2014-2019, XMOS, All rights reserved. +Copyright (c) 2014-2020, XMOS, All rights reserved. BY ACCESSING, USING, INSTALLING OR DOWNLOADING THE XMOS SOFTWARE, YOU AGREE TO BE BOUND BY THE FOLLOWING TERMS. IF YOU DO NOT AGREE TO THESE, DO NOT ATTEMPT TO DOWNLOAD, ACCESS OR USE THE XMOS Software. From 744541dca6847ea0c89c39a7729fc1b5b7a6c65e Mon Sep 17 00:00:00 2001 From: lucianom Date: Wed, 7 Oct 2020 14:30:09 +0100 Subject: [PATCH 9/9] 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 b74eb7a8..5d187216 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,7 @@ I2C library change log ----- * CHANGED: Pin Python package versions + * REMOVED: not necessary cpanfile 6.0.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'