Skip to content

Commit

Permalink
Merge pull request #28 from xmos/release/v4.0.1
Browse files Browse the repository at this point in the history
Merge release/v4.0.1 into master
  • Loading branch information
xluciano authored Oct 8, 2020
2 parents 8600fbc + 916a7cc commit 11eaed1
Show file tree
Hide file tree
Showing 8 changed files with 62 additions and 12 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
SPDIF library change log
========================

4.0.1
-----

* CHANGED: Pin Python package versions
* REMOVED: not necessary cpanfile

4.0.0
-----

Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('xmos_jenkins_shared_library@develop') _
@Library('xmos_jenkins_shared_library@v0.14.2') _

getApproval()

Expand Down
7 changes: 0 additions & 7 deletions Pipfile

This file was deleted.

2 changes: 0 additions & 2 deletions cpanfile

This file was deleted.

2 changes: 1 addition & 1 deletion lib_spdif/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion lib_spdif/module_build_info
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION = 4.0.0
VERSION = 4.0.1

DEPENDENT_MODULES =

Expand Down
19 changes: 19 additions & 0 deletions python/setup.py
Original file line number Diff line number Diff line change
@@ -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=[
],
)
34 changes: 34 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 11eaed1

Please sign in to comment.