diff -Nru pystaticconfiguration-0.10.3/debian/changelog pystaticconfiguration-0.10.3/debian/changelog
--- pystaticconfiguration-0.10.3/debian/changelog	2019-01-03 06:39:32.000000000 +0000
+++ pystaticconfiguration-0.10.3/debian/changelog	2019-08-27 06:25:21.000000000 +0000
@@ -1,3 +1,16 @@
+pystaticconfiguration (0.10.3-3) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Ondřej Nový ]
+  * Use debhelper-compat instead of debian/compat.
+
+  [ Andrey Rahmatullin ]
+  * Drop Python 2 support.
+  * Fix a tests failure.
+
+ -- Andrey Rahmatullin <wrar@debian.org>  Tue, 27 Aug 2019 11:25:21 +0500
+
 pystaticconfiguration (0.10.3-2) unstable; urgency=medium
 
   [ Ondřej Nový ]
diff -Nru pystaticconfiguration-0.10.3/debian/compat pystaticconfiguration-0.10.3/debian/compat
--- pystaticconfiguration-0.10.3/debian/compat	2019-01-03 06:39:32.000000000 +0000
+++ pystaticconfiguration-0.10.3/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-10
diff -Nru pystaticconfiguration-0.10.3/debian/control pystaticconfiguration-0.10.3/debian/control
--- pystaticconfiguration-0.10.3/debian/control	2019-01-03 06:39:32.000000000 +0000
+++ pystaticconfiguration-0.10.3/debian/control	2019-08-27 06:25:21.000000000 +0000
@@ -4,16 +4,8 @@
 Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: Sophie Brun <sophie@freexian.com>, Sebastien Delafond <seb@debian.org>
 Build-Depends:
- debhelper (>= 10),
+ debhelper-compat (= 10),
  dh-python,
- python-all,
- python-mock,
- python-pytest,
- python-setuptools,
- python-six,
- python-sphinx,
- python-sphinx-rtd-theme,
- python-yaml,
  python3-all,
  python3-mock,
  python3-pytest,
@@ -28,24 +20,6 @@
 Vcs-Browser: https://salsa.debian.org/python-team/modules/pystaticconfiguration
 Testsuite: autopkgtest-pkg-python
 
-Package: python-staticconf
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
-Suggests: python-staticconf-doc
-Description: Python library for loading and reading configuration (Python 2)
- This package contains PyStaticConfiguration, a Python library for loading,
- validating and reading configuration from many heterogeneous formats.
- Configuration is split into two phases.
-   * Configuration Loading: configuration is read from files or Python objects,
-     flattened, and merged into a container called a `namespace`. Namespaces
-     are used to separate unrelated configuration groups. If configuration is
-     changed frequently, it can also be reloaded easily with very little change
-     to the existing code.
-   * Configuration Reading: a configuration value is looked up in the
-     `namespace`. It is validating and converted to the requested type.
- .
- This package installs the library for Python 2.
-
 Package: python3-staticconf
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}
diff -Nru pystaticconfiguration-0.10.3/debian/patches/0002-stop-calling-fixture-as-a-function-by-refactoring-it.patch pystaticconfiguration-0.10.3/debian/patches/0002-stop-calling-fixture-as-a-function-by-refactoring-it.patch
--- pystaticconfiguration-0.10.3/debian/patches/0002-stop-calling-fixture-as-a-function-by-refactoring-it.patch	1970-01-01 00:00:00.000000000 +0000
+++ pystaticconfiguration-0.10.3/debian/patches/0002-stop-calling-fixture-as-a-function-by-refactoring-it.patch	2019-08-27 06:25:21.000000000 +0000
@@ -0,0 +1,23 @@
+From: Benjamin Bariteau <bariteau@yelp.com>
+Date: Fri, 14 Dec 2018 15:48:24 -0800
+Subject: stop calling fixture as a function by refactoring it into a fixture
+ that calls a function and can be separately called
+
+---
+ tests/loader_test.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/tests/loader_test.py b/tests/loader_test.py
+index 90b20f6..ee79062 100644
+--- a/tests/loader_test.py
++++ b/tests/loader_test.py
+@@ -32,6 +32,9 @@ class LoaderTestCase(object):
+             yield
+ 
+     @pytest.fixture(autouse=True)
++    def content_to_file(self):
++        self.write_content_to_file()
++
+     def write_content_to_file(self, content=None):
+         content = content or self.content
+         if not content:
diff -Nru pystaticconfiguration-0.10.3/debian/patches/series pystaticconfiguration-0.10.3/debian/patches/series
--- pystaticconfiguration-0.10.3/debian/patches/series	2019-01-03 06:39:32.000000000 +0000
+++ pystaticconfiguration-0.10.3/debian/patches/series	2019-08-27 06:25:21.000000000 +0000
@@ -1 +1,2 @@
 Remove-external-HTML-resources.patch
+0002-stop-calling-fixture-as-a-function-by-refactoring-it.patch
diff -Nru pystaticconfiguration-0.10.3/debian/rules pystaticconfiguration-0.10.3/debian/rules
--- pystaticconfiguration-0.10.3/debian/rules	2019-01-03 06:39:32.000000000 +0000
+++ pystaticconfiguration-0.10.3/debian/rules	2019-08-27 06:25:21.000000000 +0000
@@ -1,13 +1,12 @@
 #!/usr/bin/make -f
 
 export PYBUILD_NAME=staticconf
-export PYBUILD_TEST_ARGS_python2="-k-TestConfigurationWatcher"
 
 # Needed so that the tests find the testing.* modules
 export PYTHONPATH=$(CURDIR)
 
 %:
-	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
 
 override_dh_auto_build: