snap-store-proxy-charm

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

  1. Git
  2. lp:~drednout/snap-store-proxy-charm
  3. fix-small-issues
  4. Merge into main
Proposed by Alex Ramanau
Status: Merged
Approved by: Alex Ramanau
Approved revision: 4855f61f256fd359b2228602e110b7fcd53192fa
Merge reported by: Otto Co-Pilot
Merged at revision: not available
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
Alex Ramanau Approve
Milos Approve
Review via email: mp+466222@code.launchpad.net

This proposal supersedes 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.
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Beginning pre-merge CI tests for revision 62c1feb4e20b5a3c95fff6fb85c6da792ede39e7

Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Pre-merge CI tests passed successfully for revision 62c1feb4e20b5a3c95fff6fb85c6da792ede39e7

Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Voting criteria not met.
https://jenkins.ols.ps5.canonical.com/job/snap-store-proxy-charm/44/

Revision history for this message
Milos (miloslu) wrote :

Thanks for looking into this! Can `pytest-xdist` be newer than 2.5.0? Or is 2.5.0 latest version that can work with it? If it can, we could have `>` instead.

Revision history for this message
Alex Ramanau (drednout) wrote :

> Thanks for looking into this! Can `pytest-xdist` be newer than 2.5.0? Or is
> 2.5.0 latest version that can work with it? If it can, we could have `>`
> instead.

Actually, pytest-xdist 3.6.0 is first problem version. Added less strict constraint.

Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Beginning pre-merge CI tests for revision 4855f61f256fd359b2228602e110b7fcd53192fa

Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Pre-merge CI tests passed successfully for revision 4855f61f256fd359b2228602e110b7fcd53192fa

Revision history for this message
Milos (miloslu) wrote :

Works like a charm, thanks!

review: Approve
Revision history for this message
Alex Ramanau (drednout) :
review: Approve

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..98efcc4 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 < 3.6.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