Merge ~paride/simplestreams:ubuntu/devel into simplestreams:ubuntu/devel

[Paride Legovini]

Cut a new upstream snapshot. This is generated by new-upstream-snapshot plus one manually resolved merge conflict.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:e9a35905007f7d6f3879ae584824a9a0c29c66bf
https://jenkins.ubuntu.com/server/job/simplestreams-ci/9/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-amd64/9/
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-ppc64el/9/
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-s390x/9/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/simplestreams-ci/9//rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

I walked through 'new-upstream-snapshot' and got identical results to Paride, except for the expected name in debian/changelog.

so I ACK this.

review: Approve

[Joshua Powers (powersj)]

review: Approve

diff --git a/.gitignore b/.gitignore
index b1af602..623952b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ exdata-query
 MANIFEST
 .coverage
 .tox
+*.snap
diff --git a/Makefile b/Makefile
index 577e545..3387cc1 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ exdata/fake: exdata-query gnupg
 	$(TENV) ./tools/make-test-data $(EXDATA_SIGN_ARG) exdata-query/ exdata/fake
 
 exdata-query:
-	rsync -avz --delete --exclude "FILE_DATA_CACHE" --exclude ".bzr/*" cloud-images.ubuntu.com::uec-images/query/ exdata-query
+	rsync -avz --delete --exclude "FILE_DATA_CACHE" --exclude ".bzr/*" cloud-images.ubuntu.com::cloud-images/query/ exdata-query
 
 gnupg: gnupg/README
 
diff --git a/bin/sstream-mirror-glance b/bin/sstream-mirror-glance
index 5375680..4593a92 100755
--- a/bin/sstream-mirror-glance
+++ b/bin/sstream-mirror-glance
@@ -32,6 +32,7 @@ from simplestreams import util
 from simplestreams.mirrors import glance
 
 DEFAULT_FILTERS = ['ftype~(disk1.img|disk.img)', 'arch~(x86_64|amd64|i386)']
+DEFAULT_KEYRING = "/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg"
 
 
 def error(msg):
@@ -94,7 +95,7 @@ def main():
     parser.add_argument('--log-file', default=sys.stderr,
                         type=argparse.FileType('w'))
 
-    parser.add_argument('--keyring', action='store', default=None,
+    parser.add_argument('--keyring', action='store', default=DEFAULT_KEYRING,
                         help='The keyring for gpg --keyring')
 
     parser.add_argument('source_mirror')
@@ -112,6 +113,11 @@ def main():
                         "data. This is useful in OpenStack Clouds which use "
                         "multiple hypervisor types with in a single region.")
 
+    parser.add_argument('--custom-property', action='append', default=[],
+                        dest="custom_properties",
+                        help='additional properties to add to glance'
+                        ' image metadata (key=value format).')
+
     args = parser.parse_args()
 
     modify_hook = None
@@ -122,7 +128,8 @@ def main():
                      'cloud_name': args.cloud_name,
                      'modify_hook': modify_hook,
                      'item_filters': args.item_filters,
-                     'hypervisor_mapping': args.hypervisor_mapping}
+                     'hypervisor_mapping': args.hypervisor_mapping,
+                     'custom_properties': args.custom_properties}
 
     (mirror_url, args.path) = util.path_from_mirror_url(args.source_mirror,
                                                         args.path)
diff --git a/bin/sstream-query b/bin/sstream-query
index efe9e0a..6534317 100755
--- a/bin/sstream-query
+++ b/bin/sstream-query
@@ -30,6 +30,7 @@ import sys
 
 FORMAT_PRETTY = "PRETTY"
 FORMAT_JSON = "JSON"
+DEFAULT_KEYRING = "/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg"
 
 
 def warn(msg):
@@ -98,7 +99,7 @@ def main():
     parser.add_argument('--log-file', default=sys.stderr,
                         type=argparse.FileType('w'))
 
-    parser.add_argument('--keyring', action='store', default=None,
+    parser.add_argument('--keyring', action='store', default=DEFAULT_KEYRING,
                         help='keyring to be specified to gpg via --keyring')
     parser.add_argument('--no-verify', '-U', action='store_false',
                         dest='verify', default=True,
diff --git a/debian/changelog b/debian/changelog
index 41e1af5..56cc537 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
+simplestreams (0.1.0-46-gb1f40d99-0ubuntu1) impish; urgency=medium
+
+  * New upstream snapshot.
+    - install-deps: install cargo as a tox dependency [Paride Legovini]
+    - Add 10s timeout to out-going requests to avoid blocking. [Adam Collard]
+    - simplestreams: fix use of deprecated LOG.warn method
+    - Use cloud-images.ubuntu.com rsync module instead of uec-images
+      [Philip Roche]
+    - Revert "Skip disk-kvm-img as unsuable under LXD" [Stéphane Graber]
+    - Make focal the current LTS [Robert C Jennings]
+    - Drop fast path use of keystoneauth1 sessions object. [James Page]
+    - Add build-packages to fix build failures on non-amd64 archs. [James Page]
+    - Add snap packaging for simplestreams [James Page]
+    - Add support for setting image custom properties [James Page]
+    - Unpin linting tools to allow them to work on Ubuntu 20.04 LTS.
+      [James Page]
+    - make-test-data: Add missing change for uefi1 combined lxd sha
+      [Robert C Jennings]
+    - Present LXD KVM with Xenial images [Robert C Jennings]
+    - Skip disk-kvm-img as unsuable under LXD [Stéphane Graber]
+    - https://bugs.launchpad.net/simplestreams/+bug/1833435 [Daniele Rondina]
+    - Fix file matching for disk-kvm.img [Robert C Jennings]
+    - tools/js2signed: change shebang to /usr/bin/env python3
+    - Fix file matching for disk-kvm.img [Stéphane Graber]
+    - Add combined-disk-kvm-img_sha256 to download.json [Stéphane Graber]
+    - debian: run the tests only against Python 3 [Paride Legovini]
+    - debian: stop building Python 2 package
+
+ -- Paride Legovini <[e-mail]>  Tue, 18 May 2021 12:22:08 +0200
+
 simplestreams (0.1.0-25-gba75825b-0ubuntu1) eoan; urgency=medium
 
   * New upstream snapshot.
diff --git a/debian/control b/debian/control
index 350b2d0..d6fc372 100644
--- a/debian/control
+++ b/debian/control
@@ -5,15 +5,6 @@ Standards-Version: 4.2.1
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 7),
                dh-python,
-               python-all,
-               python-glanceclient,
-               python-keystoneclient,
-               python-mock,
-               python-nose,
-               python-requests (>= 1.1),
-               python-setuptools,
-               python-swiftclient,
-               python-yaml,
                python3,
                python3-flake8,
                python3-glanceclient,
@@ -46,15 +37,6 @@ Description: Library and tools for using Simple Streams data
  This package provides a client for interacting with simple
  streams data as is produced to describe Ubuntu's cloud images.
 
-Package: python-simplestreams
-Architecture: all
-Priority: optional
-Depends: gnupg, python-boto, ${misc:Depends}, ${python:Depends}
-Suggests: python-requests (>= 1.1)
-Description: Library and tools for using Simple Streams data
- This package provides a client for interacting with simple
- streams data as is produced to describe Ubuntu's cloud images.
-
 Package: python3-simplestreams-openstack
 Architecture: all
 Priority: optional
diff --git a/debian/python-simplestreams.install b/debian/python-simplestreams.install
deleted file mode 100644
index 0236cd1..0000000
--- a/debian/python-simplestreams.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python2*/*-packages/simplestreams/*
diff --git a/debian/rules b/debian/rules
index bc93943..3e02246 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,16 @@
 #!/usr/bin/make -f
 
 export SS_REQUIRE_DISTRO_INFO = 0
-PYVERS := $(shell pyversions -r)
 PY3VERS := $(shell py3versions -r)
 %:
-	dh $@ --with=python2,python3
+	dh $@ --with=python3
 
 override_dh_auto_install:
 	dh_auto_install
-	set -ex; for python in $(PY3VERS) $(PYVERS); do \
+	set -ex; for python in $(PY3VERS); do \
 		$$python setup.py build --executable=/usr/bin/python3 && \
 		$$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
 	done
+
+override_dh_auto_test:
+	make test3
diff --git a/doc/README b/doc/README
index b484518..6d13222 100644
--- a/doc/README
+++ b/doc/README
@@ -114,6 +114,15 @@ The following is a description of each of these fields:
     'path' entries for a given item must be immutable.  That is, for a
     given 'path' under a mirror, the content must never change.
 
+    An 'item' dictionary may contain a 'mirrors' element.
+
+    'mirrors' entries it used for supply a list of mirrors prefix where
+    retrieve the item. When 'mirrors' is present client must create
+    the URL of the resource to fetch with the 'path' entry:
+
+    item_url = item_mirrors[0] . item_path
+
+
 == Index ==
 This is a index of products files that are available.
 It has a top level 'index' dictionary.  Each entry in that dictionary is a
diff --git a/setup.py b/setup.py
index b4d7d65..6b5a29b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-from distutils.core import setup
+from setuptools import setup
 from glob import glob
 import os
 
diff --git a/simplestreams/contentsource.py b/simplestreams/contentsource.py
index 40bf9d0..b54e898 100644
--- a/simplestreams/contentsource.py
+++ b/simplestreams/contentsource.py
@@ -32,6 +32,7 @@ else:
     urllib_error = urllib_request
 
 READ_BUFFER_SIZE = 1024 * 10
+TIMEOUT = 10
 
 try:
     # We try to use requests because we can do gzip encoding with it.
@@ -338,7 +339,7 @@ class Urllib2UrlReader(UrlReader):
                 req.add_header('User-Agent', user_agent)
             if offset is not None:
                 req.add_header('Range', 'bytes=%d-' % offset)
-            self.req = opener(req)
+            self.req = opener(req, timeout=TIMEOUT)
         except urllib_error.HTTPError as e:
             if e.code == 404:
                 myerr = IOError("Unable to open %s" % url)
@@ -378,7 +379,9 @@ class RequestsUrlReader(UrlReader):
         if headers == {}:
             headers = None
 
-        self.req = requests.get(url, stream=True, auth=auth, headers=headers)
+        self.req = requests.get(
+            url, stream=True, auth=auth, headers=headers, timeout=TIMEOUT
+        )
         self.r_iter = None
         if buflen is None:
             buflen = READ_BUFFER_SIZE
diff --git a/simplestreams/generate_simplestreams.py b/simplestreams/generate_simplestreams.py
index a78639b..5cb92b2 100644
--- a/simplestreams/generate_simplestreams.py
+++ b/simplestreams/generate_simplestreams.py
@@ -91,7 +91,10 @@ def write_streams(out_d, trees, updated, namer=None, condense=True):
     for content_id in trees:
         if condense:
             util.products_condense(trees[content_id],
-                                   sticky=['path', 'sha256', 'md5', 'size'])
+                                   sticky=[
+                                       'path', 'sha256', 'md5',
+                                       'size', 'mirrors'
+                                   ])
         content = trees[content_id]
         to_write.append((index['index'][content_id]['path'], content,))
     out_filenames = []
diff --git a/simplestreams/mirrors/__init__.py b/simplestreams/mirrors/__init__.py
index 60d5ade..4a9593a 100644
--- a/simplestreams/mirrors/__init__.py
+++ b/simplestreams/mirrors/__init__.py
@@ -203,8 +203,8 @@ class UrlMirrorReader(MirrorReader):
                 csource.read(1024)
         except Exception as e:
             if isinstance(e, IOError) and (e.errno == errno.ENOENT):
-                LOG.warn("got ENOENT for (%s, %s), trying with trailing /",
-                         self.prefix, path)
+                LOG.warning("got ENOENT for (%s, %s), trying with trailing /",
+                            self.prefix, path)
                 self.prefix = self.prefix + '/'
             else:
                 # this raised exception, but it was sneaky to do it
diff --git a/simplestreams/mirrors/glance.py b/simplestreams/mirrors/glance.py
index bdec7c8..cd26c06 100644
--- a/simplestreams/mirrors/glance.py
+++ b/simplestreams/mirrors/glance.py
@@ -23,6 +23,7 @@ import simplestreams.openstack as openstack
 from simplestreams.log import LOG
 
 import copy
+import collections
 import errno
 import glanceclient
 import json
@@ -168,6 +169,10 @@ class GlanceMirror(mirrors.BasicMirrorWriter):
         if not self.content_id:
             raise TypeError("content_id is required")
 
+        self.custom_properties = collections.OrderedDict(
+            prop.split('=') for prop in config.get("custom_properties", [])
+        )
+
     def _cidpath(self, content_id):
         return "streams/v1/%s.json" % content_id
 
@@ -210,7 +215,7 @@ class GlanceMirror(mirrors.BasicMirrorWriter):
                 continue
 
             if image.get('status') != "active":
-                LOG.warn("Ignoring inactive image %s with status '%s'" % (
+                LOG.warning("Ignoring inactive image %s with status '%s'" % (
                     image['id'], image.get('status')))
                 continue
 
@@ -220,7 +225,7 @@ class GlanceMirror(mirrors.BasicMirrorWriter):
             version = props.get('version_name')
             item = props.get('item_name')
             if not (version and product and item and source_content_id):
-                LOG.warn("%s missing required fields" % image['id'])
+                LOG.warning("%s missing required fields" % image['id'])
                 continue
 
             # get data from the datastore for this item, if it exists
@@ -291,6 +296,8 @@ class GlanceMirror(mirrors.BasicMirrorWriter):
             if _hypervisor_type:
                 properties['hypervisor_type'] = _hypervisor_type
 
+        properties.update(self.custom_properties)
+
         # Store flattened metadata for a source image along with the
         # image in 'simplestreams_metadata' property.
         simplestreams_metadata = image_metadata.copy()
diff --git a/simplestreams/objectstores/__init__.py b/simplestreams/objectstores/__init__.py
index 6ce8ff0..f118a92 100644
--- a/simplestreams/objectstores/__init__.py
+++ b/simplestreams/objectstores/__init__.py
@@ -175,13 +175,13 @@ class FileStore(ObjectStore):
             if not reader.check():
                 os.unlink(partfile)
                 if orig_part_size:
-                    LOG.warn(resume_msg)
+                    LOG.warning(resume_msg)
                 raise checksum_util.invalid_checksum_for_reader(reader)
         else:
             if not cksum.check():
                 os.unlink(partfile)
                 if orig_part_size:
-                    LOG.warn(resume_msg)
+                    LOG.warning(resume_msg)
                 raise checksum_util.InvalidChecksum(path=path, cksum=cksum)
         os.rename(partfile, wpath)
 
diff --git a/simplestreams/objectstores/swift.py b/simplestreams/objectstores/swift.py
index 9a6eb62..f2c0d5b 100644
--- a/simplestreams/objectstores/swift.py
+++ b/simplestreams/objectstores/swift.py
@@ -37,7 +37,8 @@ def get_swiftclient(**kwargs):
         sess = kwargs.get('session')
         try:
             # If session is available try it
-            return Connection(session=sess)
+            return Connection(session=sess,
+                              cacert=kwargs.get('cacert'))
         except TypeError:
             # The edge case where session is availble but swiftclient is
             # < 3.3.0. Use the old style method for Connection.
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
new file mode 100644
index 0000000..75ac11a
--- /dev/null
+++ b/snap/snapcraft.yaml
@@ -0,0 +1,65 @@
+name: simplestreams
+base: core18
+adopt-info: simplestreams
+summary: Library and tools for using Simple Streams data
+description: Library and tools for using Simple Streams data
+
+grade: stable
+confinement: strict
+
+layout:
+  /usr/share/keyrings:
+    bind: $SNAP/usr/share/keyrings
+
+apps:
+  sstream-mirror:
+    command: bin/sstream-mirror
+    plugs:
+      - network
+      - home
+  sstream-mirror-glance:
+    command: bin/sstream-mirror-glance
+    plugs:
+      - network
+      - home
+  sstream-query:
+    command: bin/sstream-query
+    plugs:
+      - network
+      - home
+  sstream-sync:
+    command: bin/sstream-sync
+    plugs:
+      - network
+      - home
+  json2streams:
+    command: bin/json2streams
+    plugs:
+      - network
+      - home
+
+parts:
+  simplestreams:
+    plugin: python
+    python-version: python3
+    source: .
+    source-type: git
+    constraints:
+      - https://raw.githubusercontent.com/openstack/requirements/stable/ussuri/upper-constraints.txt
+    python-packages:
+      - python-glanceclient
+      - python-keystoneclient
+      - python-swiftclient
+    stage-packages:
+      - gpgv
+      - ubuntu-keyring
+    build-packages:
+      - libffi-dev
+      - libssl-dev
+      - libxml2-dev
+      - libxslt1-dev
+    override-build: |
+      snapcraftctl build
+      last_release="$(git tag -l --sort=version:refname | grep -v ubuntu | tail -1)"
+      current_shorthash="$(git log --format="%h" | head -1)"
+      snapcraftctl set-version "${last_release}-${current_shorthash}"
diff --git a/tests/unittests/test_generate_simplestreams.py b/tests/unittests/test_generate_simplestreams.py
index 61b078d..a47a126 100644
--- a/tests/unittests/test_generate_simplestreams.py
+++ b/tests/unittests/test_generate_simplestreams.py
@@ -264,3 +264,19 @@ class TestWriteStreams(TestCase):
                 'item-1': {'arch': 'amd64'},
                 'item-2': {'arch': 'amd64'}, }}}}}}
         self.assertEqual(bar, expected)
+
+    def test_mirrors(self):
+        trees = {
+            'bar': {'products': {'prodbar': {'versions': {'1': {'items': {
+                'item-1': {'arch': 'amd64', 'mirrors': ['url1', 'url2']},
+                'item-2': {'arch': 'amd64'}}}}}}}}
+        with temp_dir() as out_dir, patch('sys.stderr', StringIO()):
+            write_streams(out_dir, trees, self.updated, FakeNamer,
+                          condense=False)
+            with open(os.path.join(out_dir, 'bar.json')) as bar_file:
+                bar = json.load(bar_file)
+        expected = {
+            'products': {'prodbar': {'versions': {'1': {'items': {
+                'item-1': {'arch': 'amd64', 'mirrors': ['url1', 'url2']},
+                'item-2': {'arch': 'amd64'}, }}}}}}
+        self.assertEqual(bar, expected)
diff --git a/tools/install-deps b/tools/install-deps
index 870da30..34888c5 100755
--- a/tools/install-deps
+++ b/tools/install-deps
@@ -107,8 +107,7 @@ elif [ "$1" = "tox" ]; then
     deps="gnupg tox"
     # these come as needed to build python-netaddr which is
     # a pip dependency of some of the openstack packages.
-    deps="$deps python-dev python3-dev build-essential" 
-    deps="$deps python-dev python3-dev build-essential"
+    deps="$deps python-dev python3-dev build-essential cargo"
     arch=$(dpkg --print-architecture)
     case "$arch" in
         i386|amd64) :;;
diff --git a/tools/js2signed b/tools/js2signed
index b02054b..2b66e5f 100755
--- a/tools/js2signed
+++ b/tools/js2signed
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #   Copyright (C) 2013 Canonical Ltd.
 #
 #   Author: Scott Moser <[e-mail]>
diff --git a/tools/make-test-data b/tools/make-test-data
index a1e183d..a287dab 100755
--- a/tools/make-test-data
+++ b/tools/make-test-data
@@ -32,7 +32,7 @@ try:
     url_request = urllib.request.Request
     url_open = urllib.request.urlopen
     url_error = urllib.error
-except ImportError as e:
+except ImportError:
     import urllib2
     url_request = urllib2.Request
     url_open = urllib2.urlopen
@@ -53,7 +53,13 @@ BASE_URLS = (
 
 FAKE_DATA = {
     'root.tar.gz': {'size': 10240},
-    'root.tar.xz': {'size': 10241},
+    'root.tar.xz': {
+        'size': 10241,
+        'mirrors': [
+            'https://us.images.linuxcontainers.org/',
+            'https://uk.images.linuxcontainers.org/'
+        ]
+    },
     'root.manifest': {'size': 10242},
     'lxd.tar.xz': {'size': 10245},
     'tar.gz': {'size': 11264},
@@ -197,7 +203,7 @@ def load_data_in_dir(path):
         except ValueError as e:
             sys.stderr.write("qindex parse failed %s" % path)
             raise e
-    except NonExistingUrl as e:
+    except NonExistingUrl:
         # sys.stderr.write("%s: 404 (%s)" % (qpath, e))
         pass
 
@@ -265,7 +271,7 @@ def get_cloud_images_file_size(path, save=True):
         try:
             size = int(get_url_len(burl + path))
             break
-        except Exception as error:
+        except Exception:
             sys.stderr.write("  size stat failed: %s" % burl + path)
             pass
 
@@ -298,8 +304,12 @@ def create_fake_file(prefix, item):
     # - combined_sha256 and combined_rootxz_sha256 for the -root.tar.gz
     # - combined_squashfs_sha256 for the squashfs
     # - combined_disk1-img_sha256 for the img
+    # - combined_uefi1-img_sha256 for the img (xenial)
+    # - combined_disk-kvm-img_sha256 for the img
     ftype = item['ftype']
     for name, extension in (('disk1-img', '.img'),
+                            ('uefi1-img', '-uefi1.img'),  # xenial
+                            ('disk-kvm-img', '-disk-kvm.img'),
                             ('rootxz', '-root.tar.xz'),
                             ('squashfs', '.squashfs')):
         if (ftype == "lxd.tar.xz" and
@@ -309,6 +319,8 @@ def create_fake_file(prefix, item):
                 rootitem = item.copy()
                 rootitem['ftype'] = extension.lstrip('-.')
                 rootitem['path'] = rootpath
+                if 'mirrors' in FAKE_DATA[ftype]:
+                    rootitem['mirrors'] = FAKE_DATA[ftype]['mirrors']
                 create_fake_file(prefix, rootitem)
 
             # and sha256 hash the combined file
@@ -570,6 +582,8 @@ def create_image_data(query_tree, out_d, streamdir):
 
             # find calculated combined checksums
             for name, extension in (('disk1-img', '.img'),
+                                    ('uefi1-img', '-uefi1.img'),  # xenial
+                                    ('disk-kvm-img', '-disk-kvm.img'),
                                     ('rootxz', '-root.tar.xz'),
                                     ('squashfs', '.squashfs')):
                 root = lxd.replace('-lxd.tar.xz', extension)
diff --git a/tools/sign-examples b/tools/sign-examples
index 9b549d2..89d5dd8 100755
--- a/tools/sign-examples
+++ b/tools/sign-examples
@@ -6,4 +6,4 @@ FILES=( ${TOP_DIR}/examples/*/streams/v1/*.json )
 force=""
 [ "$1" = "--force" ] && force="$1"
 
-"${TOP_DIR}/tools/js2signed" $force "${FILES[@]}"
+$SS_PYTHON "${TOP_DIR}/tools/js2signed" $force "${FILES[@]}"
diff --git a/tools/ubuntu_versions.py b/tools/ubuntu_versions.py
index aeecd47..4b896c6 100644
--- a/tools/ubuntu_versions.py
+++ b/tools/ubuntu_versions.py
@@ -23,7 +23,7 @@ from simplestreams.log import LOG
 
 # Needs to be changed whenever do-release-upgrade is flipped to the next
 # LTS (typically around the time of .1)
-CURRENT_LTS = "bionic"
+CURRENT_LTS = "focal"
 
 # This data is only used if python-distro-info is not available and
 # the user has set environment variable SS_REQUIRE_DISTRO_INFO=0
@@ -99,8 +99,8 @@ def get_ubuntu_info(date=None):
     try:
         devel = udi.devel(date=date)
     except distro_info.DistroDataOutdated as e:
-        LOG.warn("distro_info.UbuntuDistroInfo() raised exception (%s)."
-                 " Using stable release as devel.", e)
+        LOG.warning("distro_info.UbuntuDistroInfo() raised exception (%s)."
+                    " Using stable release as devel.", e)
         devel = udi.stable(date=date)
     ret = []
 
diff --git a/tox.ini b/tox.ini
index 654652e..b450afc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,6 +4,7 @@ envlist = py27, py3, flake8
 [testenv]
 setenv =
    GNUPGHOME={toxinidir}/gnupg
+   SS_PYTHON={envpython}
 commands = 
     {toxinidir}/tools/create-gpgdir
     {toxinidir}/tools/sign-examples
@@ -19,9 +20,9 @@ deps =
 
 [testenv:flake8]
 basepython = python3
-deps = flake8==3.5.0
-       pycodestyle==2.3.1
-       pyflakes==1.6.0
+deps = flake8>=3.5.0
+       pycodestyle>=2.3.1
+       pyflakes>=1.6.0
 commands = {toxinidir}/tools/run-flake8 {posargs}
 
 [testenv:py3-noopenstack]
@@ -30,3 +31,8 @@ deps =
     mock
     nose
 basepython = python3
+
+[testenv:snap]
+deps =
+whitelist_externals = /snap/bin/snapcraft
+commands = snapcraft --use-lxd