From 9ab31d2298e2569eaaa77a33287f0794e6f1986c Mon Sep 17 00:00:00 2001 From: James Page Date: Wed, 1 Feb 2017 09:07:06 +0000 Subject: [PATCH] Tidy post migration to openstack git/gerrit Add gitreview configuration. Switch snapcraft.yaml to use official snap.openstack location. Move to using dpkg install of snapcraft instead of broken pypi. Change-Id: I8d0a85ff1129b5b67c4ec6af131e7d9eb1276cc5 --- .gitreview | 4 ++++ bindep.txt | 3 +-- requirements.txt | 4 ---- snapcraft.yaml | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 .gitreview diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..f6ff563 --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=review.openstack.org +port=29418 +project=openstack/snap-ceilometer.git diff --git a/bindep.txt b/bindep.txt index 55a90e5..5816a55 100644 --- a/bindep.txt +++ b/bindep.txt @@ -1,2 +1 @@ -libsodium-dev [platform:dpkg] -libapt-pkg-dev [platform:dpkg] +snapcraft [platform:dpkg] diff --git a/requirements.txt b/requirements.txt index 5f39202..10db2ad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1 @@ # Requirements to build snap -git+https://github.com/openstack-snaps/snapcraft@fixup-install-requires#egg_name=snapcraft -# PyPi less dependencies -https://launchpad.net/ubuntu/+archive/primary/+files/python-apt_1.1.0~beta1build1.tar.xz -https://launchpad.net/python-distutils-extra/trunk/2.39/+download/python-distutils-extra-2.39.tar.gz diff --git a/snapcraft.yaml b/snapcraft.yaml index 74673a8..f401a95 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -41,7 +41,7 @@ parts: - python-memcached - oslo.rootwrap - uwsgi - - git+https://github.com/openstack-snaps/snap.openstack#egg=snap.openstack + - git+https://github.com/openstack/snap.openstack#egg=snap.openstack constraints: https://raw.githubusercontent.com/openstack/requirements/master/upper-constraints.txt build-packages: - libffi-dev