Package: ceph-iscsi
Version: 3.3-1
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu focal ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * Ensure tests run as part of package build:
    - d/control: Add runtime dependencies to BD's alongside mock
      and pytest.
    - d/rules: Set PYBUILD_TEST_ARGS inline with upstream
      configuration of pytest.
    - d/rules: Ensure .pytest_cache is tidied on clean.
  * d/source/options: Ignore any changes to .egg-info files.
  * d/control: Drop dependency on python3-rpm as its not required.

Thanks for considering the patch.


-- System Information:
Debian Release: bullseye/sid
  APT prefers focal
  APT policy: (500, 'focal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.3.0-19-generic (SMP w/4 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_GB:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru ceph-iscsi-3.3/debian/control ceph-iscsi-3.3/debian/control
--- ceph-iscsi-3.3/debian/control       2019-10-21 10:40:52.000000000 +0100
+++ ceph-iscsi-3.3/debian/control       2019-11-28 13:51:45.000000000 +0000
@@ -3,7 +3,22 @@
 Priority: optional
 Maintainer: Freexian Packaging Team <[email protected]>
 Uploaders: Sebastien Delafond <[email protected]>
-Build-Depends: debhelper-compat (= 12), dh-python, python3-setuptools, 
python3-all
+Build-Depends: debhelper-compat (= 12),
+               dh-python,
+               python3-all,
+               python3-configshell-fb,
+               python3-cryptography,
+               python3-distutils,
+               python3-flask,
+               python3-mock,
+               python3-netifaces,
+               python3-openssl,
+               python3-pytest,
+               python3-rados,
+               python3-rbd,
+               python3-requests,
+               python3-rtslib-fb,
+               python3-setuptools
 Standards-Version: 4.4.1
 Homepage: https://github.com/ceph/ceph-iscsi
 Vcs-Browser: https://salsa.debian.org/debian/ceph-iscsi
@@ -12,19 +27,19 @@
 Package: ceph-iscsi
 Architecture: all
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${python3:Depends},
-        tcmu-runner (>= 1.4.0),
-        python3-configshell-fb,
-        python3-cryptography,
-        python3-flask,
-        python3-netifaces,
-        python3-openssl,
-        python3-rados,
-        python3-rbd,
-        python3-rtslib-fb,
-        python3-distutils,
-        python3-rpm,
-        python3-requests
+Depends: python3-configshell-fb,
+         python3-cryptography,
+         python3-distutils,
+         python3-flask,
+         python3-netifaces,
+         python3-openssl,
+         python3-rados,
+         python3-rbd,
+         python3-requests,
+         python3-rtslib-fb,
+         tcmu-runner (>= 1.4.0),
+         ${misc:Depends},
+         ${python3:Depends}
 Description: common logic and CLI tools for creating and managing LIO gateways 
for Ceph
  It includes the rbd-target-api daemon which is responsible for
  restoring the state of LIO following a gateway reboot/outage and
diff -Nru ceph-iscsi-3.3/debian/rules ceph-iscsi-3.3/debian/rules
--- ceph-iscsi-3.3/debian/rules 2019-10-21 10:40:52.000000000 +0100
+++ ceph-iscsi-3.3/debian/rules 2019-11-28 13:40:27.000000000 +0000
@@ -2,6 +2,7 @@
 
 export PYBUILD_NAME=python-ceph-iscsi
 #export PYBUILD_DISABLE=test
+export PYBUILD_TEST_ARGS=--ignore=test/test_group.py test/
 
 %:
        dh $@ --with python3 --buildsystem=pybuild
@@ -9,3 +10,7 @@
 override_dh_installinit:
        dh_installinit -pceph-iscsi --name rbd-target-api
        dh_installinit -pceph-iscsi --name rbd-target-gw
+
+override_dh_auto_clean:
+       dh_auto_clean
+       rm -rf .pytest_cache
diff -Nru ceph-iscsi-3.3/debian/source/options 
ceph-iscsi-3.3/debian/source/options
--- ceph-iscsi-3.3/debian/source/options        1970-01-01 01:00:00.000000000 
+0100
+++ ceph-iscsi-3.3/debian/source/options        2019-11-28 13:32:25.000000000 
+0000
@@ -0,0 +1 @@
+extend-diff-ignore = "^[^/]*[.]egg-info/"

Reply via email to