Spade

Merge ~barryprice/spade/+git/spade:snapcraft into spade:master

  1. Git
  2. lp:~barryprice/spade/+git/spade
  3. snapcraft
  4. Merge into master
Proposed by Barry Price
Status: Superseded
Proposed branch: ~barryprice/spade/+git/spade:snapcraft
Merge into: spade:master
Prerequisite: ~barryprice/spade/+git/spade:black
Diff against target: 63 lines (+12/-5)
3 files modified
Makefile (+2/-3)
setup.py (+1/-0)
snap/snapcraft.yaml (+9/-2)
Reviewer Review Type Date Requested Status
Spade Developers Pending
Review via email: mp+394571@code.launchpad.net

This proposal has been superseded by a proposal from 2020-11-27.

Commit message

Snapcraft fixes for core20

To post a comment you must log in.
~barryprice/spade/+git/spade:snapcraft updated
c85283a... by Barry Price

Typo

6817bc5... by Barry Price

Merge branch 'master' into flake8

1734965... by Barry Price

Merge branch 'flake8' into black

fae038f... by Barry Price

Snapcraft fixes, and ignore built snap files

dd61da3... by Barry Price

Merge branch 'black' into snapcraft

Unmerged commits

dd61da3... by Barry Price

Merge branch 'black' into snapcraft

fae038f... by Barry Price

Snapcraft fixes, and ignore built snap files

1734965... by Barry Price

Merge branch 'flake8' into black

6817bc5... by Barry Price

Merge branch 'master' into flake8

c85283a... by Barry Price

Typo

a86afa5... by Barry Price

Reformatted with black

aa2d273... by Barry Price

Address all Flake8 errors bar complexity (noqa: C901)

7e34f18... by Barry Price

Modernise, switch to python3 exclusively

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index ceb744e..0efca2a 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -1,5 +1,4 @@
6-version := $(shell python3 -c "from spade import __version__; print(__version__)")
7-tempfiles_snap := snap/snapcraft.yaml spade*.snap
8+tempfiles_snap := snap/.snapcraft spade_*.snap parts/ prime/ stage/
9
10 blacken:
11 @echo "Normalising python layout with black"
12@@ -14,7 +13,7 @@ clean:
13 @git clean -fXd
14
15 snap: snap_clean
16- sed -e "s/{{VERSION}}/$(version)/" snapcraft.yaml.in > snap/snapcraft.yaml
17+ @export SNAPCRAFT_BUILD_ENVIRONMENT=multipass
18 snapcraft
19
20 snap_clean:
21diff --git a/setup.py b/setup.py
22index 7286fa2..efd69bd 100644
23--- a/setup.py
24+++ b/setup.py
25@@ -27,6 +27,7 @@ setup(
26 author_email="chris.stratford@canonical.com",
27 license='LICENSE',
28 packages=find_packages(exclude=['contrib', 'docs', 'tests*']),
29+ setup_requires=['wheel'],
30 install_requires=[
31 "python-swiftclient",
32 "python-keystoneclient",
33diff --git a/snapcraft.yaml.in b/snap/snapcraft.yaml
34similarity index 74%
35rename from snapcraft.yaml.in
36rename to snap/snapcraft.yaml
37index 9f56fb4..8c9a196 100644
38--- a/snapcraft.yaml.in
39+++ b/snap/snapcraft.yaml
40@@ -1,5 +1,6 @@
41 name: spade
42-version: 1.0
43+version: '1.0'
44+base: core20
45 summary: A tool for managing buckets in the cloud
46 description: A tool to simplify accessing objects in cloud storage
47 buckets (Amazon S3, Azure blobstore, Google cloud storage,
48@@ -11,8 +12,14 @@ grade: stable
49 apps:
50 spade:
51 command: bin/spade
52+ environment:
53+ PATH: ${SNAP}/bin:${PATH}
54+ PYTHONPATH: ${SNAP}/lib/python3
55 parts:
56 spade:
57 plugin: python
58- python-version: python3
59 source: .
60+ build-environment:
61+ - PYTHONPATH: "$SNAPCRAFT_PART_INSTALL/usr/lib/python3/dist-packages"
62+ stage-packages:
63+ - python3-wheel

Subscribers

People subscribed via source and target branches

to all changes: