Skip to content

Commit

Permalink
Merge pull request #55 from xmos/release/v1.1.2
Browse files Browse the repository at this point in the history
Merge release/v1.1.2 into master
  • Loading branch information
xluciano authored Oct 8, 2020
2 parents 1b18a99 + 472ca32 commit 0c05b9e
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 13 deletions.
10 changes: 8 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
lib_xud Change Log
==================

1.1.2
-----

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

1.1.1
-----

* RESOLVED: Cases where disabling RxError caused firmware to crash
* RESOLVED: USB Disconnect on self-powered devices intermittently causing
EP set to not-ready indefinitely
* RESOLVED: USB Disconnect on self-powered devices intermittently causing EP
set to not-ready indefinitely

1.1.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_xud/module_build_info
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION = 1.1.1
VERSION = 1.1.2

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_xud',
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 0c05b9e

Please sign in to comment.