Merge ~pelpsi/turnip/+git/dependencies:turnip-upgrade-to-focal into ~canonical-launchpad-branches/turnip/+git/dependencies:master

Proposed by Simone Pelosi
Status: Rejected
Rejected by: Simone Pelosi
Proposed branch: ~pelpsi/turnip/+git/dependencies:turnip-upgrade-to-focal
Merge into: ~canonical-launchpad-branches/turnip/+git/dependencies:master
Diff against target: 60 lines (+0/-0)
0 files modified
Reviewer Review Type Date Requested Status
Colin Watson (community) Needs Information
Review via email: mp+447754@code.launchpad.net

Commit message

Updated wheels dependencies for focal

Added dependencies required by layer-base

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote (last edit ):

I'm not really fond of the way that turnip's dependencies repository conflates dependencies of the payload with dependencies of the charm. Instead of doing this, could you try doing something like this in each of turnip's `charm/*/charmcraft.yaml` files (I haven't tested this): https://paste.ubuntu.com/p/txBh7NZXFB/

If we can manage to remove turnip-dependencies from the charm build process entirely, that would be even better, but I don't know whether that will be straightforwardly possible.

review: Needs Information
Revision history for this message
Simone Pelosi (pelpsi) wrote :

> I'm not really fond of the way that turnip's dependencies repository conflates
> dependencies of the payload with dependencies of the charm. Instead of doing
> this, could you try doing something like this in each of turnip's
> `charm/*/charmcraft.yaml` files (I haven't tested this):
> https://paste.ubuntu.com/p/txBh7NZXFB/
>
> If we can manage to remove turnip-dependencies from the charm build process
> entirely, that would be even better, but I don't know whether that will be
> straightforwardly possible.

Thank you Colin for the suggestion! I will give it a try right now, I totally agree with you.

Revision history for this message
Simone Pelosi (pelpsi) wrote :

I can confirm that we can remove turnip-dependencies from Turnip charms if we add Cython package into ols-char-deps:

https://code.launchpad.net/~pelpsi/ols-charm-deps/+git/wheels/+merge/447788

Unmerged commits

036a5c9... by Simone Pelosi

Updated wheels dependencies for focal

Added dependencies required by layer-base

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Cython-0.29.36.tar.gz b/Cython-0.29.36.tar.gz
2new file mode 100644
3index 0000000..d2ce057
4Binary files /dev/null and b/Cython-0.29.36.tar.gz differ
5diff --git a/Jinja2-3.1.2.tar.gz b/Jinja2-3.1.2.tar.gz
6new file mode 100644
7index 0000000..302517f
8Binary files /dev/null and b/Jinja2-3.1.2.tar.gz differ
9diff --git a/MarkupSafe-2.1.3.tar.gz b/MarkupSafe-2.1.3.tar.gz
10new file mode 100644
11index 0000000..4faf695
12Binary files /dev/null and b/MarkupSafe-2.1.3.tar.gz differ
13diff --git a/PyYAML-6.0.1.tar.gz b/PyYAML-6.0.1.tar.gz
14new file mode 100644
15index 0000000..8d032c8
16Binary files /dev/null and b/PyYAML-6.0.1.tar.gz differ
17diff --git a/charmhelpers-1.2.1.tar.gz b/charmhelpers-1.2.1.tar.gz
18new file mode 100644
19index 0000000..78f281b
20Binary files /dev/null and b/charmhelpers-1.2.1.tar.gz differ
21diff --git a/charms.reactive-1.5.2.tar.gz b/charms.reactive-1.5.2.tar.gz
22new file mode 100644
23index 0000000..433c84f
24Binary files /dev/null and b/charms.reactive-1.5.2.tar.gz differ
25diff --git a/flit_core-3.9.0.tar.gz b/flit_core-3.9.0.tar.gz
26new file mode 100644
27index 0000000..b34deac
28Binary files /dev/null and b/flit_core-3.9.0.tar.gz differ
29diff --git a/packaging-23.1.tar.gz b/packaging-23.1.tar.gz
30new file mode 100644
31index 0000000..80f2d80
32Binary files /dev/null and b/packaging-23.1.tar.gz differ
33diff --git a/pip-22.0.4.tar.gz b/pip-22.0.4.tar.gz
34new file mode 100644
35index 0000000..9dbc1c9
36Binary files /dev/null and b/pip-22.0.4.tar.gz differ
37diff --git a/pyaml-21.10.1.tar.gz b/pyaml-21.10.1.tar.gz
38new file mode 100644
39index 0000000..b19aad3
40Binary files /dev/null and b/pyaml-21.10.1.tar.gz differ
41diff --git a/setuptools-62.1.0.tar.gz b/setuptools-62.1.0.tar.gz
42new file mode 100644
43index 0000000..bcbf434
44Binary files /dev/null and b/setuptools-62.1.0.tar.gz differ
45diff --git a/setuptools_scm-6.4.2.tar.gz b/setuptools_scm-6.4.2.tar.gz
46new file mode 100644
47index 0000000..77b5137
48Binary files /dev/null and b/setuptools_scm-6.4.2.tar.gz differ
49diff --git a/tomli-1.0.0.tar.gz b/tomli-1.0.0.tar.gz
50new file mode 100644
51index 0000000..bc19ad4
52Binary files /dev/null and b/tomli-1.0.0.tar.gz differ
53diff --git a/tomli-2.0.1.tar.gz b/tomli-2.0.1.tar.gz
54new file mode 100644
55index 0000000..fde81b7
56Binary files /dev/null and b/tomli-2.0.1.tar.gz differ
57diff --git a/wheel-0.40.0.tar.gz b/wheel-0.40.0.tar.gz
58new file mode 100644
59index 0000000..869ba47
60Binary files /dev/null and b/wheel-0.40.0.tar.gz differ

Subscribers

People subscribed via source and target branches