[Launchpad-reviewers] [Merge] ~cjwatson/lp-codeimport:charm-update-ols-layers into lp-codeimport:master

2023-10-02 Thread Colin Watson 
Colin Watson has proposed merging 
~cjwatson/lp-codeimport:charm-update-ols-layers into lp-codeimport:master.

Commit message:
charm: Update charm-wheels/ols-layers

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/lp-codeimport/+git/lp-codeimport/+merge/452567

The old version of layer-basic embedded in ols-layers had some insufficient 
pinning; as a result, builds have started failing recently due to changes in 
some unpinned dependencies.  Updating charm-wheels and ols-layers fixes that.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of 
~cjwatson/lp-codeimport:charm-update-ols-layers into lp-codeimport:master.
diff --git a/charm/lp-codeimport-storage/charmcraft.yaml b/charm/lp-codeimport-storage/charmcraft.yaml
index 14cc685..5b9d5f0 100644
--- a/charm/lp-codeimport-storage/charmcraft.yaml
+++ b/charm/lp-codeimport-storage/charmcraft.yaml
@@ -11,7 +11,7 @@ bases:
 parts:
   charm-wheels:
 source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
-source-commit: "59b32ae07f98051385c96d6d8e7e02ca4f197fe5"
+source-commit: "42c89d9c66dbe137139b047fd54aed49b66d1a5e"
 source-submodules: []
 source-type: git
 plugin: dump
@@ -21,7 +21,7 @@ parts:
   - "-charm-wheels"
   ols-layers:
 source: https://git.launchpad.net/ols-charm-deps
-source-commit: "1ca8acbef7eb49b8a2cc81e5e13479b4f226a48b"
+source-commit: "9c59a9804f1f40e2a74be7dac9bf18a655a7864f"
 source-submodules: []
 source-type: git
 plugin: dump
diff --git a/charm/lp-codeimport/charmcraft.yaml b/charm/lp-codeimport/charmcraft.yaml
index 09f8a2d..86f193b 100644
--- a/charm/lp-codeimport/charmcraft.yaml
+++ b/charm/lp-codeimport/charmcraft.yaml
@@ -11,7 +11,7 @@ bases:
 parts:
   charm-wheels:
 source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
-source-commit: "fe523e25521254c2034eea96e2fde079034b593a"
+source-commit: "42c89d9c66dbe137139b047fd54aed49b66d1a5e"
 source-submodules: []
 source-type: git
 plugin: dump
@@ -21,7 +21,7 @@ parts:
   - "-charm-wheels"
   ols-layers:
 source: https://git.launchpad.net/ols-charm-deps
-source-commit: "df20c87d00ca0bfda64c1b58d8254220aa55f680"
+source-commit: "9c59a9804f1f40e2a74be7dac9bf18a655a7864f"
 source-submodules: []
 source-type: git
 plugin: dump
___
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : launchpad-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help   : https://help.launchpad.net/ListHelp

[Launchpad-reviewers] [Merge] ~cjwatson/lp-codeimport:charm-update-ols-layers into lp-codeimport:master

2021-06-11 Thread Colin Watson 
Colin Watson has proposed merging 
~cjwatson/lp-codeimport:charm-update-ols-layers into lp-codeimport:master.

Commit message:
charm: Update ols-layers to df20c87d

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/lp-codeimport/+git/lp-codeimport/+merge/404068
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of 
~cjwatson/lp-codeimport:charm-update-ols-layers into lp-codeimport:master.
diff --git a/charm/dependencies.txt b/charm/dependencies.txt
index 983566b..3116e73 100644
--- a/charm/dependencies.txt
+++ b/charm/dependencies.txt
@@ -1,2 +1,2 @@
-ols-layers			git+ssh://git.launchpad.net/~ubuntuone-pqm-team/ols-charm-deps/+git/ols-layers;revno=4b403705
-charm-wheels			git+ssh://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels;revno=c38224af
+ols-layers			git+ssh://git.launchpad.net/~ubuntuone-pqm-team/ols-charm-deps/+git/ols-layers;revno=df20c87d
+charm-wheels			git+ssh://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels;revno=fe523e25
diff --git a/charm/lp-codeimport/layer.yaml b/charm/lp-codeimport/layer.yaml
index c5cd846..75854a4 100644
--- a/charm/lp-codeimport/layer.yaml
+++ b/charm/lp-codeimport/layer.yaml
@@ -10,6 +10,7 @@ options:
 - libssl-dev
 - libsvn-dev
 - python
+- python-dev
 - python-pkg-resources
 - python-sqlite
 - python-tdb
___
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : launchpad-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help   : https://help.launchpad.net/ListHelp