Skip to content

Commit ea89d30

Browse files
authored
Merge pull request #13 from xmos/feature/req_file
Change python setup files and update Jenkinsfile
2 parents d1516c3 + 53df6e8 commit ea89d30

5 files changed

Lines changed: 60 additions & 10 deletions

File tree

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('xmos_jenkins_shared_library@develop') _
1+
@Library('xmos_jenkins_shared_library@v0.14.1') _
22

33
getApproval()
44

@@ -8,7 +8,7 @@ pipeline {
88
}
99
environment {
1010
REPO = 'lib_xassert'
11-
VIEW = "${env.JOB_NAME.contains('PR-') ? REPO+'_'+env.CHANGE_TARGET : REPO+'_'+env.BRANCH_NAME}"
11+
VIEW = getViewName(REPO)
1212
}
1313
options {
1414
skipDefaultCheckout()

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Software Release License Agreement
22

3-
Copyright (c) 2014-2019, XMOS, All rights reserved.
3+
Copyright (c) 2014-2020, XMOS, All rights reserved.
44

55
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.
66

Pipfile

Lines changed: 0 additions & 7 deletions
This file was deleted.

requirements.txt

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# python_version 3.7
2+
#
3+
# The parse_version_from_requirements() function in the installPipfile.groovy
4+
# file of the Jenkins Shared Library uses the python_version comment to set
5+
# the version of python used.
6+
7+
# Distributed (released) dependencies
8+
#
9+
# The python modules listed below specify a known working combination required
10+
# by the python code in this repository. The procedure used to set up a
11+
# suitable python environment for it installs the version of each module in
12+
# the list. Using a specific version ensures a controlled infrastructure for
13+
# development, testing and release of this repository.
14+
#
15+
# Another repository might depend on python code defined in this one. The
16+
# procedure to set up a suitable python environment for that repository may
17+
# pip-install this one as editable using this repository's setup.py file. The
18+
# same modules should appear in the setup.py list as given below.
19+
flake8==3.8.3
20+
21+
# The measure_fft_performance.py script imports gen_test. I have not found a
22+
# module by that name. The pytest-tornado module contains something named
23+
# gen_test, but I have not found evidence of importing pytest-tornado in whole
24+
# or in part.
25+
26+
# Development dependencies
27+
#
28+
# Each link listed below specifies the path to a setup.py file which are
29+
# installed in editable mode with '-e $PATH' (without the quotes).
30+
#
31+
# If python code in this repository depends on python code under development
32+
# in another repository, then an entry for that other respository should
33+
# appear in this list instead of the released dependencies list.
34+
#
35+
# If this repository uses the setup functionality (e.g., script entry points)
36+
# of its own setup.py file, then this list must include an entry for that
37+
# setup.py file, e.g., '-e .' or '-e ./python' (without the quotes).
38+
-e ../tools_xmostest

setup.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Copyright (c) 2020, XMOS Ltd, All rights reserved
2+
import setuptools
3+
4+
# Another repository might depend on python code defined in this one. The
5+
# procedure to set up a suitable python environment for that repository may
6+
# pip-install this one as editable using this setup.py file. To minimise the
7+
# chance of version conflicts while ensuring a minimal degree of conformity,
8+
# the 3rd-party modules listed here require the same major version and at
9+
# least the same minor version as specified in the requirements.txt file.
10+
# The same modules should appear in the requirements.txt file as given below.
11+
setuptools.setup(
12+
name='tools_xmostest',
13+
package_dir={'': 'lib/python'},
14+
packages=setuptools.find_packages(where="lib/python"),
15+
install_requires=[
16+
"flake8~=3.8",
17+
"tools_xmostest",
18+
],
19+
)

0 commit comments

Comments
 (0)