Merge ~lgp171188/launchpad:remove-unused-demo-charm-code into launchpad:master

Proposed by Guruprasad
Status: Merged
Approved by: Guruprasad
Approved revision: 5977142fd0fbcae26159904939e28f1ad87a4d42
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~lgp171188/launchpad:remove-unused-demo-charm-code
Merge into: launchpad:master
Diff against target: 119 lines (+0/-17)
1 file modified
dev/null (+0/-17)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Ines Almeida Approve
Review via email: mp+452219@code.launchpad.net

Commit message

charm/launchpad: Remove unused charm code

To post a comment you must log in.
Revision history for this message
Ines Almeida (ines-almeida) :
review: Approve
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/launchpad/charmcraft.yaml b/charm/launchpad/charmcraft.yaml
2deleted file mode 100644
3index 60c2c7b..0000000
4--- a/charm/launchpad/charmcraft.yaml
5+++ /dev/null
6@@ -1,62 +0,0 @@
7-type: charm
8-bases:
9- - build-on:
10- - name: ubuntu
11- channel: "20.04"
12- architectures: [amd64]
13- run-on:
14- - name: ubuntu
15- channel: "20.04"
16- architectures: [amd64]
17-parts:
18- charm-wheels:
19- source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
20- source-commit: "42c89d9c66dbe137139b047fd54aed49b66d1a5e"
21- source-submodules: []
22- source-type: git
23- plugin: dump
24- organize:
25- "*": charm-wheels/
26- prime:
27- - "-charm-wheels"
28- ols-layers:
29- source: https://git.launchpad.net/ols-charm-deps
30- source-commit: "9c59a9804f1f40e2a74be7dac9bf18a655a7864f"
31- source-submodules: []
32- source-type: git
33- plugin: dump
34- organize:
35- "*": layers/
36- stage:
37- - layers
38- prime:
39- - "-layers"
40- launchpad-layers:
41- after:
42- - ols-layers
43- source: https://git.launchpad.net/launchpad-layers
44- source-commit: "6ca1d670f636e1abb8328d88fc5fda80cb75152a"
45- source-submodules: []
46- source-type: git
47- plugin: dump
48- organize:
49- launchpad-base: layers/layer/launchpad-base
50- launchpad-payload: layers/layer/launchpad-payload
51- stage:
52- - layers
53- prime:
54- - "-layers"
55- charm:
56- after:
57- - charm-wheels
58- - launchpad-layers
59- source: .
60- plugin: reactive
61- build-snaps: [charm]
62- build-packages: [libpq-dev, python3-dev]
63- build-environment:
64- - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
65- - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
66- - PIP_NO_INDEX: "true"
67- - PIP_FIND_LINKS: $CRAFT_STAGE/charm-wheels
68- reactive-charm-build-arguments: [--binary-wheels-from-source]
69diff --git a/charm/launchpad/layer.yaml b/charm/launchpad/layer.yaml
70deleted file mode 100644
71index bcff867..0000000
72--- a/charm/launchpad/layer.yaml
73+++ /dev/null
74@@ -1,3 +0,0 @@
75-includes:
76- - layer:launchpad-base
77-repo: https://git.launchpad.net/launchpad
78diff --git a/charm/launchpad/metadata.yaml b/charm/launchpad/metadata.yaml
79deleted file mode 100644
80index 3dbf9a9..0000000
81--- a/charm/launchpad/metadata.yaml
82+++ /dev/null
83@@ -1,13 +0,0 @@
84-name: launchpad
85-display-name: launchpad
86-summary: Launchpad web application
87-maintainer: Launchpad Developers <launchpad-dev@lists.launchpad.net>
88-description: |
89- Launchpad is an open source suite of tools that help people and teams
90- to work together on software projects.
91-tags:
92- # https://juju.is/docs/charm-metadata#heading--charm-store-fields
93- - network
94-series:
95- - focal
96-subordinate: false
97diff --git a/charm/launchpad/reactive/launchpad.py b/charm/launchpad/reactive/launchpad.py
98deleted file mode 100644
99index 5b4222b..0000000
100--- a/charm/launchpad/reactive/launchpad.py
101+++ /dev/null
102@@ -1,17 +0,0 @@
103-# Copyright 2022 Canonical Ltd. This software is licensed under the
104-# GNU Affero General Public License version 3 (see the file LICENSE).
105-
106-from charmhelpers.core import hookenv
107-from charms.reactive import set_state, when, when_not
108-
109-
110-@when("ols.configured")
111-@when_not("service.configured")
112-def configure():
113- hookenv.log("Hello world!")
114- set_state("service.configured")
115-
116-
117-@when("service.configured")
118-def check_is_running():
119- hookenv.status_set("active", "Ready")

Subscribers

People subscribed via source and target branches

to status/vote changes: