From a30c61b1dc1f50b2f889bc5ea74de713009b76f4 Mon Sep 17 00:00:00 2001 From: Brennan Magee Date: Mon, 17 Aug 2020 09:55:08 +0100 Subject: [PATCH 1/7] Switch out Pipfile for requirements.txt --- requirements.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..ea737916 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,3 @@ +pytest==6.0.0 +pytest-xdist==1.34.0 +flake8 From 055178ed0b06a4768b9477af53cdcccd718952a6 Mon Sep 17 00:00:00 2001 From: Brennan Magee Date: Mon, 17 Aug 2020 09:57:59 +0100 Subject: [PATCH 2/7] Switch out legacy Pipfile for req.txt as well --- legacy_tests/requirements.txt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 legacy_tests/requirements.txt diff --git a/legacy_tests/requirements.txt b/legacy_tests/requirements.txt new file mode 100644 index 00000000..194ab91f --- /dev/null +++ b/legacy_tests/requirements.txt @@ -0,0 +1,5 @@ +# python_version 2.7 + +numpy +scipy +soundfile From 7a5bf7f78c24bc6098e01ed525da788ed0d934e5 Mon Sep 17 00:00:00 2001 From: Brennan Magee Date: Mon, 17 Aug 2020 09:58:15 +0100 Subject: [PATCH 3/7] Add python version to requirements --- requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/requirements.txt b/requirements.txt index ea737916..984569f3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,5 @@ +# python_version 3.7 + pytest==6.0.0 pytest-xdist==1.34.0 flake8 From f612e10d9b1c3926809f278eeb74c867905465c5 Mon Sep 17 00:00:00 2001 From: Brennan Magee Date: Mon, 17 Aug 2020 09:58:29 +0100 Subject: [PATCH 4/7] Use updated Jenkins library --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3c034803..5431aaf7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -@Library('xmos_jenkins_shared_library@v0.10.0') _ +@Library('xmos_jenkins_shared_library@v0.14.1') _ getApproval() @@ -38,7 +38,7 @@ pipeline { steps { dir("${REPO}/legacy_tests") { viewEnv() { - // Use Pipfile in legacy_tests, not lib_mic_array/Pipfile + // Use requirements.txt in legacy_tests, not lib_mic_array/requirements.txt installPipfile(true) runPython("./runtests.py --junit-output=${REPO}_tests.xml") } From f27bcd79b53cfdf8d864051c27f0dc81e8faf246 Mon Sep 17 00:00:00 2001 From: Brennan Magee Date: Mon, 17 Aug 2020 09:59:41 +0100 Subject: [PATCH 5/7] Remove Pipfiles from index --- Pipfile | 11 ----------- legacy_tests/Pipfile | 14 -------------- 2 files changed, 25 deletions(-) delete mode 100644 Pipfile delete mode 100644 legacy_tests/Pipfile diff --git a/Pipfile b/Pipfile deleted file mode 100644 index 931d4ad5..00000000 --- a/Pipfile +++ /dev/null @@ -1,11 +0,0 @@ -[[source]] -name = "pypi" -url = "https://pypi.org/simple" -verify_ssl = true - -[dev-packages] -flake8 = "*" - -[packages] -pytest = "==6.0.0" -pytest-xdist = "==1.34.0" diff --git a/legacy_tests/Pipfile b/legacy_tests/Pipfile deleted file mode 100644 index f9e5ec53..00000000 --- a/legacy_tests/Pipfile +++ /dev/null @@ -1,14 +0,0 @@ -[[source]] -name = "pypi" -url = "https://pypi.org/simple" -verify_ssl = true - -[dev-packages] - -[packages] -numpy = "*" -scipy = "*" -soundfile = "*" - -[requires] -python_version = "2.7" From d41362a840f16c5a2301f68ca07ffd9c7d978c41 Mon Sep 17 00:00:00 2001 From: Brennan Magee Date: Mon, 17 Aug 2020 12:10:27 +0100 Subject: [PATCH 6/7] Hard pin pip dependencies in legacy tests --- legacy_tests/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/legacy_tests/requirements.txt b/legacy_tests/requirements.txt index 194ab91f..61016be9 100644 --- a/legacy_tests/requirements.txt +++ b/legacy_tests/requirements.txt @@ -1,5 +1,5 @@ # python_version 2.7 -numpy -scipy -soundfile +numpy==1.16.6 +scipy==1.2.3 +soundfile==0.10.3.post1 From 9e6664eb9d96fd1bffda86eb2b5eb05512fb8eba Mon Sep 17 00:00:00 2001 From: Brennan Magee Date: Mon, 17 Aug 2020 12:11:50 +0100 Subject: [PATCH 7/7] Update pytest patch to 6.0.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 984569f3..26b87232 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # python_version 3.7 -pytest==6.0.0 +pytest==6.0.1 pytest-xdist==1.34.0 flake8