From 58f9a0eb85473948df374931a033763d8aa9e26e Mon Sep 17 00:00:00 2001 From: lucianom Date: Tue, 22 Sep 2020 09:23:57 +0100 Subject: [PATCH 1/6] Replace Pipfile with requirements.txt file --- 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 6d52bfd..0000000 --- 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 0000000..7d8be8c --- /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_spdif', + packages=setuptools.find_packages(), + install_requires=[ + 'flake8~=3.8', + ], + dependency_links=[ + ], +) diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..99e7dd7 --- /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 a688b12ab43dd55a4e4d7d57a955d18e84124bd0 Mon Sep 17 00:00:00 2001 From: lucianom Date: Fri, 2 Oct 2020 10:09:30 +0100 Subject: [PATCH 2/6] Update pinned version of xmos_jenkins_shared_library --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ef0fa6c..6fffd63 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 7f2e226157c26ca2d4f3065428b3eec1cb09e341 Mon Sep 17 00:00:00 2001 From: Luciano Martin Date: Fri, 2 Oct 2020 11:07:44 +0100 Subject: [PATCH 3/6] Add blank line --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 6fffd63..0164d2b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,5 @@ @Library('xmos_jenkins_shared_library@v0.14.2') _ + getApproval() pipeline { From c5ea4fd041c250ef978ba824434d4428ed1062cf Mon Sep 17 00:00:00 2001 From: lucianom Date: Mon, 5 Oct 2020 14:31:01 +0100 Subject: [PATCH 4/6] Bump version for infrastructure changes --- CHANGELOG.rst | 5 +++++ lib_spdif/module_build_info | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5ffd5ec..e934ab3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ SPDIF library change log ======================== +4.0.1 +----- + + * CHANGED: Pin Python package versions + 4.0.0 ----- diff --git a/lib_spdif/module_build_info b/lib_spdif/module_build_info index d4fbd16..7c091bf 100644 --- a/lib_spdif/module_build_info +++ b/lib_spdif/module_build_info @@ -1,4 +1,4 @@ -VERSION = 4.0.0 +VERSION = 4.0.1 DEPENDENT_MODULES = From 1e0d8d55c81eee86b35f41d36a69e6b50265387d Mon Sep 17 00:00:00 2001 From: lucianom Date: Mon, 5 Oct 2020 15:00:07 +0100 Subject: [PATCH 5/6] Update LICENSE date --- lib_spdif/LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_spdif/LICENSE.txt b/lib_spdif/LICENSE.txt index 63570e3..87cd08a 100644 --- a/lib_spdif/LICENSE.txt +++ b/lib_spdif/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 405fb74f16a996e9ec67b000b81f9256aa1bd75f Mon Sep 17 00:00:00 2001 From: lucianom Date: Wed, 7 Oct 2020 14:30:14 +0100 Subject: [PATCH 6/6] 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 e934ab3..ba68c44 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,7 @@ SPDIF library change log ----- * CHANGED: Pin Python package versions + * REMOVED: not necessary cpanfile 4.0.0 ----- diff --git a/cpanfile b/cpanfile deleted file mode 100644 index 071f5e6..0000000 --- a/cpanfile +++ /dev/null @@ -1,2 +0,0 @@ -requires 'File::Copy::Recursive'; -requires 'LWP::Simple'