diff -Nru python-searchlightclient-2.0.1/babel.cfg python-searchlightclient-2.1.1/babel.cfg
--- python-searchlightclient-2.0.1/babel.cfg	2020-04-06 05:32:08.000000000 +0000
+++ python-searchlightclient-2.1.1/babel.cfg	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-[python: **.py]
diff -Nru python-searchlightclient-2.0.1/debian/changelog python-searchlightclient-2.1.1/debian/changelog
--- python-searchlightclient-2.0.1/debian/changelog	2020-05-08 21:36:31.000000000 +0000
+++ python-searchlightclient-2.1.1/debian/changelog	2020-10-16 15:16:43.000000000 +0000
@@ -1,3 +1,18 @@
+python-searchlightclient (2.1.1-2) unstable; urgency=medium
+
+  * Uploading to unstable.
+  * Fixed debian/watch.
+  * Add a debian/salsa-ci.yml.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 16 Oct 2020 17:16:43 +0200
+
+python-searchlightclient (2.1.1-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Removed python3-six from build-depends.
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 09 Sep 2020 22:55:32 +0200
+
 python-searchlightclient (2.0.1-2) unstable; urgency=medium
 
   * Uploading to unstable.
diff -Nru python-searchlightclient-2.0.1/debian/control python-searchlightclient-2.1.1/debian/control
--- python-searchlightclient-2.0.1/debian/control	2020-05-08 21:36:31.000000000 +0000
+++ python-searchlightclient-2.1.1/debian/control	2020-10-16 15:16:43.000000000 +0000
@@ -26,7 +26,6 @@
  python3-oslo.utils,
  python3-prettytable,
  python3-requests,
- python3-six,
  python3-sphinxcontrib.svg2pdfconverter <!nodoc>,
  python3-stestr,
  python3-testtools,
@@ -64,7 +63,6 @@
  python3-pbr,
  python3-prettytable,
  python3-requests,
- python3-six,
  python3-yaml,
  ${misc:Depends},
  ${python3:Depends},
diff -Nru python-searchlightclient-2.0.1/debian/salsa-ci.yml python-searchlightclient-2.1.1/debian/salsa-ci.yml
--- python-searchlightclient-2.0.1/debian/salsa-ci.yml	1970-01-01 00:00:00.000000000 +0000
+++ python-searchlightclient-2.1.1/debian/salsa-ci.yml	2020-10-16 15:16:43.000000000 +0000
@@ -0,0 +1,3 @@
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
diff -Nru python-searchlightclient-2.0.1/debian/watch python-searchlightclient-2.1.1/debian/watch
--- python-searchlightclient-2.0.1/debian/watch	2020-05-08 21:36:31.000000000 +0000
+++ python-searchlightclient-2.1.1/debian/watch	2020-10-16 15:16:43.000000000 +0000
@@ -1,4 +1,3 @@
 version=3
-opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
-https://pypi.debian.net/python-searchlightclient/python-searchlightclient-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
-
+opts="uversionmangle=s/\.0rc/~rc/;s/\.0b1/~b1/;s/\.0b2/~b2/;s/\.0b3/~b3/" \
+https://github.com/openstack/python-searchlightclient/tags .*/(\d[brc\d\.]+)\.tar\.gz
diff -Nru python-searchlightclient-2.0.1/doc/requirements.txt python-searchlightclient-2.1.1/doc/requirements.txt
--- python-searchlightclient-2.0.1/doc/requirements.txt	2020-04-06 05:32:08.000000000 +0000
+++ python-searchlightclient-2.1.1/doc/requirements.txt	2020-08-05 01:41:57.000000000 +0000
@@ -2,6 +2,6 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-openstackdocstheme>=1.30.0 # Apache-2.0
+openstackdocstheme>=2.2.0 # Apache-2.0
 sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
-sphinx>=1.8.0,!=2.1.0 # BSD
+sphinx>=2.0.0,!=2.1.0 # BSD
diff -Nru python-searchlightclient-2.0.1/doc/source/conf.py python-searchlightclient-2.1.1/doc/source/conf.py
--- python-searchlightclient-2.0.1/doc/source/conf.py	2020-04-06 05:32:08.000000000 +0000
+++ python-searchlightclient-2.1.1/doc/source/conf.py	2020-08-05 01:41:57.000000000 +0000
@@ -48,22 +48,13 @@
 master_doc = 'index'
 
 # General information about the project.
-project = 'python-searchlightclient'
 copyright = 'OpenStack Contributors'
 
 # openstackdocstheme options
-repository_name = 'openstack/python-searchlightclient'
-bug_project = 'python-searchlightclient'
-bug_tag = ''
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-#version = 'X.Y'
-# The full version, including alpha/beta/rc tags.
-#release = 'X.Y.Z'
+openstackdocs_repo_name = 'openstack/python-searchlightclient'
+openstackdocs_pdf_link = True
+openstackdocs_bug_project = 'python-searchlightclient'
+openstackdocs_bug_tag = ''
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -146,10 +137,6 @@
 # so a file named "default.css" will overwrite the builtin "default.css".
 # html_static_path = ['_static']
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 #html_use_smartypants = True
diff -Nru python-searchlightclient-2.0.1/lower-constraints.txt python-searchlightclient-2.1.1/lower-constraints.txt
--- python-searchlightclient-2.0.1/lower-constraints.txt	2020-04-06 05:32:08.000000000 +0000
+++ python-searchlightclient-2.1.1/lower-constraints.txt	2020-08-05 01:41:57.000000000 +0000
@@ -2,11 +2,11 @@
 appdirs==1.3.0
 asn1crypto==0.23.0
 Babel==2.3.4
-cffi==1.7.0
+cffi==1.14.0
 cliff==2.8.0
 cmd2==0.8.0
 coverage==4.0
-cryptography==2.1
+cryptography==2.7
 debtcollector==1.2.0
 decorator==3.4.0
 deprecation==1.0
@@ -15,8 +15,6 @@
 dulwich==0.15.0
 extras==1.0.0
 fixtures==3.0.0
-flake8==2.5.5
-hacking==1.1.0
 idna==2.6
 imagesize==0.7.1
 iso8601==0.1.11
@@ -28,13 +26,11 @@
 keystoneauth1==3.4.0
 linecache2==1.0.0
 MarkupSafe==1.0
-mccabe==0.2.1
 monotonic==0.6
 msgpack-python==0.4.0
 munch==2.1.0
 netaddr==0.7.18
 netifaces==0.10.4
-openstackdocstheme==1.18.1
 openstacksdk==0.11.2
 os-client-config==1.28.0
 os-service-types==1.2.0
@@ -44,11 +40,9 @@
 oslo.serialization==2.18.0
 oslo.utils==3.33.0
 pbr==2.0.0
-pep8==1.5.7
 positional==1.2.1
 prettytable==0.7.1
 pycparser==2.18
-pyflakes==0.8.1
 Pygments==2.2.0
 pyOpenSSL==17.1.0
 pyparsing==2.1.0
@@ -61,15 +55,12 @@
 python-openstackclient==3.12.0
 python-subunit==1.0.0
 pytz==2013.6
-PyYAML==3.12
+PyYAML==3.13
 requests==2.14.2
 requestsexceptions==1.2.0
 rfc3986==0.3.1
 simplejson==3.5.1
-six==1.10.0
 snowballstemmer==1.2.1
-Sphinx==1.8.0
-sphinxcontrib-websupport==1.0.1
 stevedore==1.20.0
 stestr==2.0.0
 testrepository==0.0.18
diff -Nru python-searchlightclient-2.0.1/requirements.txt python-searchlightclient-2.1.1/requirements.txt
--- python-searchlightclient-2.0.1/requirements.txt	2020-04-06 05:32:08.000000000 +0000
+++ python-searchlightclient-2.1.1/requirements.txt	2020-08-05 01:41:57.000000000 +0000
@@ -11,6 +11,5 @@
 oslo.utils>=3.33.0 # Apache-2.0
 python-keystoneclient>=3.8.0 # Apache-2.0
 python-openstackclient>=3.12.0 # Apache-2.0
-PyYAML>=3.12 # MIT
+PyYAML>=3.13 # MIT
 requests>=2.14.2 # Apache-2.0
-six>=1.10.0 # MIT
diff -Nru python-searchlightclient-2.0.1/searchlightclient/common/base.py python-searchlightclient-2.1.1/searchlightclient/common/base.py
--- python-searchlightclient-2.0.1/searchlightclient/common/base.py	2020-04-06 05:32:08.000000000 +0000
+++ python-searchlightclient-2.1.1/searchlightclient/common/base.py	2020-08-05 01:41:57.000000000 +0000
@@ -41,8 +41,7 @@
 import copy
 
 from oslo_utils import strutils
-import six
-from six.moves.urllib import parse
+from urllib import parse
 
 from searchlightclient.common import exceptions
 from searchlightclient.i18n import _
@@ -224,8 +223,7 @@
         return self.client.delete(url)
 
 
-@six.add_metaclass(abc.ABCMeta)
-class ManagerWithFind(BaseManager):
+class ManagerWithFind(BaseManager, metaclass=abc.ABCMeta):
     """Manager with additional `find()`/`findall()` methods."""
 
     @abc.abstractmethod
diff -Nru python-searchlightclient-2.0.1/searchlightclient/common/exceptions.py python-searchlightclient-2.1.1/searchlightclient/common/exceptions.py
--- python-searchlightclient-2.0.1/searchlightclient/common/exceptions.py	2020-04-06 05:32:08.000000000 +0000
+++ python-searchlightclient-2.1.1/searchlightclient/common/exceptions.py	2020-08-05 01:41:57.000000000 +0000
@@ -36,8 +36,6 @@
 import inspect
 import sys
 
-import six
-
 from searchlightclient.i18n import _
 
 
@@ -463,7 +461,7 @@
                     kwargs["message"] = (error.get("message") or
                                          error.get("faultstring"))
                     kwargs["details"] = (error.get("details") or
-                                         six.text_type(body))
+                                         str(body))
     elif content_type.startswith("text/"):
         kwargs["details"] = getattr(response, 'text', '')
 
diff -Nru python-searchlightclient-2.0.1/searchlightclient/common/utils.py python-searchlightclient-2.1.1/searchlightclient/common/utils.py
--- python-searchlightclient-2.0.1/searchlightclient/common/utils.py	2020-04-06 05:32:08.000000000 +0000
+++ python-searchlightclient-2.1.1/searchlightclient/common/utils.py	2020-08-05 01:41:57.000000000 +0000
@@ -23,10 +23,9 @@
 from oslo_utils import encodeutils
 from oslo_utils import importutils
 import prettytable
-import six
-from six.moves.urllib import error
-from six.moves.urllib import parse
-from six.moves.urllib import request
+from urllib import error
+from urllib import parse
+from urllib import request
 import yaml
 
 from searchlightclient import exc
@@ -149,10 +148,7 @@
 
         pt.add_row(row)
 
-    if six.PY3:
-        print(encodeutils.safe_encode(pt.get_string()).decode())
-    else:
-        print(encodeutils.safe_encode(pt.get_string()))
+    print(encodeutils.safe_encode(pt.get_string()).decode())
 
 
 def find_resource(manager, name_or_id):
diff -Nru python-searchlightclient-2.0.1/searchlightclient/v1/facets.py python-searchlightclient-2.1.1/searchlightclient/v1/facets.py
--- python-searchlightclient-2.0.1/searchlightclient/v1/facets.py	2020-04-06 05:32:08.000000000 +0000
+++ python-searchlightclient-2.1.1/searchlightclient/v1/facets.py	2020-08-05 01:41:57.000000000 +0000
@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from six.moves.urllib import parse
+from urllib import parse
 
 from searchlightclient.common import base
 
diff -Nru python-searchlightclient-2.0.1/setup.cfg python-searchlightclient-2.1.1/setup.cfg
--- python-searchlightclient-2.0.1/setup.cfg	2020-04-06 05:32:08.000000000 +0000
+++ python-searchlightclient-2.1.1/setup.cfg	2020-08-05 01:41:57.000000000 +0000
@@ -19,6 +19,7 @@
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
 
 [files]
 packages =
@@ -32,17 +33,3 @@
     search_resource_type_list = searchlightclient.osc.v1.resource_type:ListResourceType
     search_facet_list = searchlightclient.osc.v1.facet:ListFacet
     search_query = searchlightclient.osc.v1.search:SearchResource
-
-[extract_messages]
-keywords = _ gettext ngettext l_ lazy_gettext
-mapping_file = babel.cfg
-output_file = python-searchlightclient/locale/python-searchlightclient.pot
-
-[compile_catalog]
-directory = python-searchlightclient/locale
-domain = python-searchlightclient
-
-[update_catalog]
-domain = python-searchlightclient
-output_dir = python-searchlightclient/locale
-input_file = python-searchlightclient/locale/python-searchlightclient.pot
diff -Nru python-searchlightclient-2.0.1/test-requirements.txt python-searchlightclient-2.1.1/test-requirements.txt
--- python-searchlightclient-2.0.1/test-requirements.txt	2020-04-06 05:32:08.000000000 +0000
+++ python-searchlightclient-2.1.1/test-requirements.txt	2020-08-05 01:41:57.000000000 +0000
@@ -3,7 +3,7 @@
 # process, which may cause wedges in the gate later.
 
 # Hacking already pins down pep8, pyflakes and flake8
-hacking>=3.0,<3.1.0 # Apache-2.0
+hacking>=3.0.1,<3.1.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 stestr>=2.0.0 # Apache-2.0
diff -Nru python-searchlightclient-2.0.1/tools/install_venv_common.py python-searchlightclient-2.1.1/tools/install_venv_common.py
--- python-searchlightclient-2.0.1/tools/install_venv_common.py	2020-04-06 05:32:08.000000000 +0000
+++ python-searchlightclient-2.1.1/tools/install_venv_common.py	2020-08-05 01:41:57.000000000 +0000
@@ -22,8 +22,6 @@
 Synced in from openstack-common
 """
 
-from __future__ import print_function
-
 import optparse
 import os
 import subprocess
diff -Nru python-searchlightclient-2.0.1/tox.ini python-searchlightclient-2.1.1/tox.ini
--- python-searchlightclient-2.0.1/tox.ini	2020-04-06 05:32:08.000000000 +0000
+++ python-searchlightclient-2.1.1/tox.ini	2020-08-05 01:41:57.000000000 +0000
@@ -1,5 +1,5 @@
 [tox]
-envlist = pypy,py37,pep8
+envlist = py37,pep8
 minversion = 3.1.1
 skipsdist = True
 ignore_basepython_conflict = True
@@ -17,13 +17,6 @@
     stestr run --slowest {posargs}
 whitelist_externals = find
 
-[testenv:pypy]
-deps =
-       -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
- setuptools<3.2
-       -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
-
 [testenv:pep8]
 sitepackages = False
 commands = flake8
diff -Nru python-searchlightclient-2.0.1/.zuul.yaml python-searchlightclient-2.1.1/.zuul.yaml
--- python-searchlightclient-2.0.1/.zuul.yaml	2020-04-06 05:32:08.000000000 +0000
+++ python-searchlightclient-2.1.1/.zuul.yaml	2020-08-05 01:41:57.000000000 +0000
@@ -1,6 +1,6 @@
 - project:
     templates:
-      - openstack-python3-ussuri-jobs
+      - openstack-python3-victoria-jobs
       - openstack-cover-jobs
       - publish-openstack-docs-pti
       - check-requirements