Ubuntu Repository Cache Charm

Merge lp:~hloeung/ubuntu-repository-cache/minor-updates into lp:ubuntu-repository-cache

  1. minor-updates
  2. Merge into layer-ubuntu-repository-cache
Proposed by Haw Loeung
Status: Merged
Approved by: Haw Loeung
Approved revision: 354
Merged at revision: 351
Proposed branch: lp:~hloeung/ubuntu-repository-cache/minor-updates
Merge into: lp:ubuntu-repository-cache
Diff against target: 67 lines (+8/-2)
5 files modified
.bzrignore (+2/-0)
Makefile (+2/-0)
lib/ubuntu_repository_cache/mirror.py (+1/-1)
pytest.ini (+2/-0)
tox.ini (+1/-1)
To merge this branch: bzr merge lp:~hloeung/ubuntu-repository-cache/minor-updates
Reviewer Review Type Date Requested Status
Barry Price Approve
Canonical IS Reviewers Pending
Review via email: mp+427257@code.launchpad.net

Commit message

Minor fixes - cleaner lint output and cleaner directory for building charm

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Barry Price (barryprice) wrote :

LGTM +1

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 351

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2022-05-23 03:30:57 +0000
3+++ .bzrignore 2022-07-22 05:27:26 +0000
4@@ -1,3 +1,4 @@
5+*.charm
6 *.pyc
7 *.swp
8 *~
9@@ -13,5 +14,6 @@
10 build/
11 builds/
12 deps/
13+htmlcov/
14 repo-info
15 revision
16
17=== modified file 'Makefile'
18--- Makefile 2021-02-23 00:07:51 +0000
19+++ Makefile 2022-07-22 05:27:26 +0000
20@@ -46,6 +46,8 @@
21
22 clean:
23 @echo "Cleaning files"
24+ @rm -rf build
25+ @rm -rf htmlcov
26 @rm -rf .venv
27 @rm -rf .tox
28 @rm -rf ./tests/unit/__pycache__ ./reactive/__pycache__ ./lib/ubuntu_repository_cache/__pycache__ ./lib/ubuntu_repository_cache/tests/__pycache__ ./files/__pycache__
29
30=== modified file 'lib/ubuntu_repository_cache/mirror.py'
31--- lib/ubuntu_repository_cache/mirror.py 2022-07-22 03:43:04 +0000
32+++ lib/ubuntu_repository_cache/mirror.py 2022-07-22 05:27:26 +0000
33@@ -191,7 +191,7 @@
34 LOG('Metadata update complete.')
35
36
37-def _nonleader_update_metadata():
38+def _nonleader_update_metadata(): # NOQA: C901
39 '''Update the metadata on a non-leader peer in the cluster'''
40
41 LOG('Updating metadata on a peer')
42
43=== modified file 'pytest.ini'
44--- pytest.ini 2020-08-11 04:12:28 +0000
45+++ pytest.ini 2022-07-22 05:27:26 +0000
46@@ -5,6 +5,8 @@
47 # https://github.com/juju/charm-helpers/issues/293
48 ignore:.*dist\(\) and linux_distribution\(\) functions are deprecated:PendingDeprecationWarning
49 ignore:.*dist\(\) and linux_distribution\(\) functions are deprecated:DeprecationWarning
50+ # https://github.com/juju/charm-helpers/issues/701
51+ ignore:The distutils package is deprecated and slated for removal:DeprecationWarning
52
53 # distutils
54 ignore:the imp module is deprecated in favour of importlib:DeprecationWarning
55
56=== modified file 'tox.ini'
57--- tox.ini 2022-05-30 03:30:19 +0000
58+++ tox.ini 2022-07-22 05:27:26 +0000
59@@ -10,7 +10,7 @@
60 [testenv:unit]
61 commands =
62 pytest --ignore {toxinidir}/tests/functional \
63- {posargs:-v --cov=files --cov=lib --cov=reactive --cov-report=term-missing --cov-branch}
64+ {posargs:-v --cov=files --cov=lib --cov=reactive --cov-branch --cov-report=term-missing --cov-report=html}
65 deps = -r{toxinidir}/tests/unit/requirements.txt
66 -r{toxinidir}/requirements.txt
67 setenv =

Subscribers

People subscribed via source and target branches