Explorar el Código

Refresh patches, add dependency on gpg.

Jelmer Vernooij hace 3 años
padre
commit
24a1ebc1c8

+ 2 - 0
debian/control

@@ -7,10 +7,12 @@ Homepage: https://www.dulwich.io/
 Build-Depends: debhelper-compat (= 12),
                dh-python,
                git [!alpha !ppc64 !sparc64 !x32 !ia64],
+               gnupg,
                python3-all-dbg,
                python3-all-dev,
                python3-certifi,
                python3-fastimport,
+               python3-gpg,
                python3-urllib3 (>= 1.24.1)
 Standards-Version: 4.5.0
 Vcs-Git: https://salsa.debian.org/python-team/packages/dulwich.git

+ 1 - 1
debian/patches/02_skip_flappy_test

@@ -3,7 +3,7 @@ Index: dulwich/dulwich/tests/test_porcelain.py
 ===================================================================
 --- dulwich.orig/dulwich/tests/test_porcelain.py
 +++ dulwich/dulwich/tests/test_porcelain.py
-@@ -941,6 +941,9 @@ class PushTests(PorcelainTestCase):
+@@ -1324,6 +1324,9 @@ class PushTests(PorcelainTestCase):
          clone the remote, commit a file to the clone, then push the changes
          back to the remote.
          """

+ 7 - 5
debian/patches/disable-tcp-client-test.diff

@@ -1,10 +1,12 @@
---- a/dulwich/tests/compat/test_client.py
-+++ b/dulwich/tests/compat/test_client.py
-@@ -344,6 +344,7 @@ class DulwichTCPClientTest(CompatTestCas
+Index: dulwich/dulwich/tests/compat/test_client.py
+===================================================================
+--- dulwich.orig/dulwich/tests/compat/test_client.py
++++ dulwich/dulwich/tests/compat/test_client.py
+@@ -367,6 +367,7 @@ class DulwichTCPClientTest(CompatTestCas
      def setUp(self):
          CompatTestCase.setUp(self)
          DulwichClientTestBase.setUp(self)
 +        raise SkipTest('skipped for a first build')
          if check_for_daemon(limit=1):
-             raise SkipTest('git-daemon was already running on port %s' %
-                            protocol.TCP_GIT_PORT)
+             raise SkipTest(
+                 "git-daemon was already running on port %s" % protocol.TCP_GIT_PORT

+ 1 - 1
debian/tests/control

@@ -1,3 +1,3 @@
 Tests: testsuite3
-Depends: python3-dulwich, git
+Depends: python3-dulwich, git, gnupg, python3-gpg
 Restrictions: allow-stderr