Merge ~paride/curtin:release/20.2-0ubuntu1 into curtin:ubuntu/devel

Proposed by Paride Legovini
Status: Merged
Merged at revision: e46e3c216e47c1801001ba390580b784300e961e
Proposed branch: ~paride/curtin:release/20.2-0ubuntu1
Merge into: curtin:ubuntu/devel
Diff against target: 66 lines (+12/-4)
5 files modified
curtin/__init__.py (+1/-1)
curtin/block/__init__.py (+1/-1)
debian/changelog (+8/-0)
pylintrc (+1/-1)
tox.ini (+1/-1)
Reviewer Review Type Date Requested Status
Ryan Harper Approve
Server Team CI bot continuous-integration Approve
curtin developers Pending
Review via email: mp+391406@code.launchpad.net

Commit message

Release curtin 20.2-0ubuntu1

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ryan Harper (raharper) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/curtin/__init__.py b/curtin/__init__.py
index 092020b..82b6f26 100644
--- a/curtin/__init__.py
+++ b/curtin/__init__.py
@@ -38,6 +38,6 @@ FEATURES = [
38 'UEFI_REORDER_FALLBACK_SUPPORT',38 'UEFI_REORDER_FALLBACK_SUPPORT',
39]39]
4040
41__version__ = "20.1"41__version__ = "20.2"
4242
43# vi: ts=4 expandtab syntax=python43# vi: ts=4 expandtab syntax=python
diff --git a/curtin/block/__init__.py b/curtin/block/__init__.py
index 10b8b9e..0cf0866 100644
--- a/curtin/block/__init__.py
+++ b/curtin/block/__init__.py
@@ -333,7 +333,7 @@ def dmsetup_info(devname):
333 ','.join(fields), '--noheading',333 ','.join(fields), '--noheading',
334 '--separator', _SEP], capture=True)334 '--separator', _SEP], capture=True)
335 except util.ProcessExecutionError as e:335 except util.ProcessExecutionError as e:
336 LOG.error('Failed to run dmsetup info:', e)336 LOG.error('Failed to run dmsetup info: %s', e)
337 return {}337 return {}
338338
339 values = out.strip().split(_SEP)339 values = out.strip().split(_SEP)
diff --git a/debian/changelog b/debian/changelog
index 265d939..08cffa4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
1curtin (20.2-0ubuntu1) groovy; urgency=medium
2
3 * New upstream release.
4 - Release 20.2 (LP: #1896947)
5 - Fix the py3 pylint ci run [Paride Legovini]
6
7 -- Paride Legovini <paride.legovini@canonical.com> Fri, 25 Sep 2020 22:44:41 +0200
8
1curtin (20.1-29-g81144052-0ubuntu1) groovy; urgency=medium9curtin (20.1-29-g81144052-0ubuntu1) groovy; urgency=medium
210
3 * New upstream snapshot.11 * New upstream snapshot.
diff --git a/pylintrc b/pylintrc
index 167cff0..67a4e01 100644
--- a/pylintrc
+++ b/pylintrc
@@ -7,7 +7,7 @@ jobs=0
7# List of members which are set dynamically and missed by pylint inference7# List of members which are set dynamically and missed by pylint inference
8# system, and so shouldn't trigger E1101 when accessed. Python regular8# system, and so shouldn't trigger E1101 when accessed. Python regular
9# expressions are accepted.9# expressions are accepted.
10generated-members=DISTROS.*,parse_*,*_data10generated-members=DISTROS\.
1111
12# List of module names for which member attributes should not be checked12# List of module names for which member attributes should not be checked
13# (useful for modules/projects where namespaces are manipulated during runtime13# (useful for modules/projects where namespaces are manipulated during runtime
diff --git a/tox.ini b/tox.ini
index 72d56d4..04b43b6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -60,7 +60,7 @@ commands = {envpython} -m pyflakes {posargs:curtin/ tests/ tools/}
60# set basepython because tox 1.6 (trusty) does not support generated environments60# set basepython because tox 1.6 (trusty) does not support generated environments
61basepython = python361basepython = python3
62deps = {[testenv]deps}62deps = {[testenv]deps}
63 pylint==2.3.163 pylint==2.6.0
64 git+https://git.launchpad.net/simplestreams64 git+https://git.launchpad.net/simplestreams
65commands = {envpython} -m pylint --errors-only {posargs:curtin tests/vmtests}65commands = {envpython} -m pylint --errors-only {posargs:curtin tests/vmtests}
6666

Subscribers

People subscribed via source and target branches