Merge ~drednout/snap-store-proxy-charm:fix-small-issues into snap-store-proxy-charm:main

Proposed by Alex Ramanau
Status: Superseded
Proposed branch: ~drednout/snap-store-proxy-charm:fix-small-issues
Merge into: snap-store-proxy-charm:main
Diff against target: 29 lines (+3/-3)
2 files modified
config.yaml (+1/-1)
requirements-dev.txt (+2/-2)
Reviewer Review Type Date Requested Status
Ubuntu One hackers Pending
Review via email: mp+466221@code.launchpad.net

This proposal has been superseded by a proposal from 2024-05-22.

Commit message

Fix failing tests and misprint in config.yaml

Description of the change

Need to apply them for making jenkins pipeline works.

To post a comment you must log in.

Unmerged commits

62c1feb... by Alex Ramanau

Fix misprint in config.yaml

b7a709a... by Alex Ramanau

Pin pytest-xdist deps for fixing tests

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/config.yaml b/config.yaml
2index 3ebebd2..ecdc3de 100644
3--- a/config.yaml
4+++ b/config.yaml
5@@ -7,7 +7,7 @@
6 options:
7 registration_bundle:
8 default: null
9- desciption: |
10+ description: |
11 Registration file generated via `store-admin`, added as ie \
12 $(cat <generated file>)
13 type: string
14diff --git a/requirements-dev.txt b/requirements-dev.txt
15index cdd103c..528eab3 100644
16--- a/requirements-dev.txt
17+++ b/requirements-dev.txt
18@@ -8,8 +8,8 @@ flake8-black
19 pytest<7 # Needed due to pytest-pythonpath
20 pytest-pythonpath
21 pytest-mock
22-pytest-xdist
23+pytest-xdist==2.5.0
24 pytest-sugar
25 pytest-cov
26 pytest-isort
27-pymarkdownlnt
28\ No newline at end of file
29+pymarkdownlnt

Subscribers

People subscribed via source and target branches