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") } 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" diff --git a/legacy_tests/requirements.txt b/legacy_tests/requirements.txt new file mode 100644 index 00000000..61016be9 --- /dev/null +++ b/legacy_tests/requirements.txt @@ -0,0 +1,5 @@ +# python_version 2.7 + +numpy==1.16.6 +scipy==1.2.3 +soundfile==0.10.3.post1 diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..26b87232 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,5 @@ +# python_version 3.7 + +pytest==6.0.1 +pytest-xdist==1.34.0 +flake8