[elbe-devel] [PATCH v2 00/27] Remove Python 2 support

Torben Hohn torben.hohn at linutronix.de
Thu Sep 24 16:55:57 CEST 2020


This is my current queue based on Bastians.

The tests from tests_xml.py in "elbe test -l INITVM"
are now passing. 

elbe-ci is running.

Pushed to devel/torbenh/py2removal

I will review the patches from Bastian.

Bastian Germann (7):
  Set Linutronix as Maintainer
  debian: Remove Python 2 Debian packages
  debian: Only install python3 files/dependencies
  python3: Make py3 the only referenced version
  python3: Remove __future__ imports
  Upgrade debhelper to compat v10
  debian: Fix a lot of lintian lints

Torben Hohn (20):
  debian: rename pkg elbe-daemon to python3-elbe-daemon
  soapclient: remove b'' from wait_busy log output
  shellhelper: allow stdin options to be string
  daemons soap: set soap loglevel to INFO
  log: call close() on log handlers that are removed
  daemons soap: ignore ResourceWarning and PendingDeprecationWarning
  hdimg: use integer division for size
  fstab: fix losetup returning bytes instead of str
  hdimg: fix losetup returning betes instead of str
  pbuilder: fix critical issues with indention
  tests test_pylint: only lint elbepack
  log: filter out ansi sequences for the soap logger
  log: don't ignore, but replace decoding errors in async_logging
  tests pbuilder-amd64: add required <passwd> node
  projectmanager: fix log deletion
  log: also filter CTRL-H (BS)
  tests test_xml: do not os.chdir() in TestPBuilder
  cdroms: improve error message, when source pkg can not d/l
  elbexml: fix sources.list to not include arch for deb-src
  elbeproject: fix target sourcecode download

 .gitignore                                    |   4 -
 README.adoc                                   |   4 +-
 .../memory-profiling-for-elbe-daemon.patch    |   4 +-
 debian/changelog                              |   2 +-
 debian/compat                                 |   2 +-
 debian/control                                | 179 +++++-------------
 debian/copyright                              |  21 +-
 debian/elbe-bootup-check.install              |   1 -
 debian/elbe-daemon.install                    |   5 -
 debian/elbe-debianize.install                 |  37 ----
 debian/elbe-soap.install                      |   5 -
 debian/elbe-updated.install                   |   3 -
 debian/elbe.lintian-overrides                 |   1 -
 debian/elbe.postinst                          |   6 -
 debian/elbe.service                           |   1 +
 debian/python-elbe-bin.install                |  19 --
 debian/python-elbe-bin.lintian-overrides      |   2 -
 debian/python-elbe-bin.postinst               |   5 -
 debian/python-elbe-buildenv.install           |  33 ----
 debian/python-elbe-buildenv.postinst          |   4 -
 debian/python-elbe-common.install             |  37 ----
 debian/python-elbe-control.install            |   5 -
 ...ck.init => python3-elbe-bootup-check.init} |   0
 debian/python3-elbe-bootup-check.install      |   1 +
 .../python3-elbe-buildenv.lintian-overrides   |   4 +
 ...on.default => python3-elbe-daemon.default} |   0
 ...e-daemon.init => python3-elbe-daemon.init} |   0
 debian/python3-elbe-daemon.install            |   5 +
 ...on.service => python3-elbe-daemon.service} |   3 +-
 debian/python3-elbe-debianize.install         |  37 ++++
 debian/python3-elbe-soap.install              |   5 +
 ...d.default => python3-elbe-updated.default} |   0
 ...updated.init => python3-elbe-updated.init} |   0
 debian/python3-elbe-updated.install           |   3 +
 ...postinst => python3-elbe-updated.postinst} |   3 +
 ...ted.postrm => python3-elbe-updated.postrm} |   4 +
 ...dated.prerm => python3-elbe-updated.prerm} |   4 +
 ...d.service => python3-elbe-updated.service} |   1 +
 debian/rules                                  |   9 +-
 docs/elbe-control.txt                         |   2 +-
 docs/elbe-initvm.txt                          |   4 +-
 docs/elbe-pbuilder.txt                        |   4 +-
 docs/elbe.txt                                 |   2 +-
 elbe                                          |   4 +-
 elbe.spec                                     |  10 +-
 elbepack/aptpkgutils.py                       |   2 +-
 elbepack/aptprogress.py                       |   2 -
 elbepack/cdroms.py                            |   8 +-
 elbepack/changelogxml.py                      |   2 -
 elbepack/commands/add.py                      |   2 -
 elbepack/commands/adjustpkgs.py               |   4 +-
 elbepack/commands/bootup-check.py             |   2 -
 elbepack/commands/buildchroot.py              |   2 -
 elbepack/commands/buildsdk.py                 |   2 -
 elbepack/commands/buildsysroot.py             |   2 -
 elbepack/commands/check_updates.py            |   2 -
 elbepack/commands/chg_archive.py              |   2 -
 elbepack/commands/chroot.py                   |   2 -
 elbepack/commands/control.py                  |   2 -
 elbepack/commands/daemon.py                   |   2 -
 elbepack/commands/db.py                       |   2 -
 elbepack/commands/debianize.py                |   2 -
 elbepack/commands/diff.py                     |   2 -
 elbepack/commands/fetch_initvm_pkgs.py        |   2 -
 elbepack/commands/gen_update.py               |   2 -
 elbepack/commands/genlicence.py               |   2 -
 elbepack/commands/get_archive.py              |   2 -
 elbepack/commands/hdimg.py                    |   2 -
 elbepack/commands/init.py                     |   2 -
 elbepack/commands/initvm.py                   |   2 -
 elbepack/commands/mkcdrom.py                  |   2 -
 elbepack/commands/parselicence.py             |   2 -
 elbepack/commands/pbuilder.py                 |   2 -
 elbepack/commands/pin_versions.py             |   2 -
 elbepack/commands/pkgdiff.py                  |   2 -
 elbepack/commands/preprocess.py               |   2 -
 elbepack/commands/prjrepo.py                  |   2 -
 elbepack/commands/remove_sign.py              |   2 -
 elbepack/commands/setsel.py                   |   2 -
 elbepack/commands/show.py                     |   2 -
 elbepack/commands/sign.py                     |   2 -
 elbepack/commands/validate.py                 |   2 -
 elbepack/commands/xsdtoasciidoc.py            |   2 -
 elbepack/daemons/soap/__init__.py             |   8 +-
 elbepack/daemons/soap/esoap.py                |   2 -
 elbepack/db.py                                |   2 -
 elbepack/dbaction.py                          |   2 -
 elbepack/debinstaller.py                      |   2 -
 elbepack/egpg.py                              |   2 -
 elbepack/elbeproject.py                       |   2 +-
 elbepack/elbexml.py                           |  12 +-
 elbepack/filesystem.py                        |   2 -
 elbepack/finetuning.py                        |   2 -
 elbepack/fstab.py                             |   2 +-
 elbepack/hdimg.py                             |   8 +-
 elbepack/initvmaction.py                      |   2 -
 elbepack/log.py                               |  13 +-
 elbepack/pbuilder.py                          |  16 +-
 elbepack/pbuilderaction.py                    |   2 -
 elbepack/pkgutils.py                          |   2 -
 elbepack/projectmanager.py                    |   2 +-
 elbepack/rpcaptcache.py                       |   2 -
 elbepack/shellhelper.py                       |  21 ++
 elbepack/soapclient.py                        |   4 +-
 elbepack/templates.py                         |   2 -
 elbepack/tests/test_pylint.py                 |  46 +++--
 elbepack/tests/test_xml.py                    |   5 +-
 elbepack/treeutils.py                         |   2 -
 elbepack/updated.py                           |   2 -
 elbepack/version.py                           |  12 +-
 elbepack/virtapt.py                           |   2 -
 elbepack/xmldefaults.py                       |   2 -
 elbepack/xmlpreprocess.py                     |   2 -
 test/updated.py                               |   4 +-
 tests/pbuilder-amd64.xml                      |   1 +
 115 files changed, 247 insertions(+), 512 deletions(-)
 delete mode 100644 debian/elbe-bootup-check.install
 delete mode 100644 debian/elbe-daemon.install
 delete mode 100644 debian/elbe-debianize.install
 delete mode 100644 debian/elbe-soap.install
 delete mode 100644 debian/elbe-updated.install
 delete mode 100644 debian/elbe.lintian-overrides
 delete mode 100644 debian/elbe.postinst
 delete mode 100644 debian/python-elbe-bin.install
 delete mode 100644 debian/python-elbe-bin.lintian-overrides
 delete mode 100644 debian/python-elbe-bin.postinst
 delete mode 100644 debian/python-elbe-buildenv.install
 delete mode 100644 debian/python-elbe-buildenv.postinst
 delete mode 100644 debian/python-elbe-common.install
 delete mode 100644 debian/python-elbe-control.install
 rename debian/{elbe-bootup-check.init => python3-elbe-bootup-check.init} (100%)
 create mode 100644 debian/python3-elbe-bootup-check.install
 create mode 100644 debian/python3-elbe-buildenv.lintian-overrides
 rename debian/{elbe-daemon.default => python3-elbe-daemon.default} (100%)
 rename debian/{elbe-daemon.init => python3-elbe-daemon.init} (100%)
 create mode 100644 debian/python3-elbe-daemon.install
 rename debian/{elbe-daemon.service => python3-elbe-daemon.service} (61%)
 create mode 100644 debian/python3-elbe-debianize.install
 create mode 100644 debian/python3-elbe-soap.install
 rename debian/{elbe-updated.default => python3-elbe-updated.default} (100%)
 rename debian/{elbe-updated.init => python3-elbe-updated.init} (100%)
 create mode 100644 debian/python3-elbe-updated.install
 rename debian/{elbe-updated.postinst => python3-elbe-updated.postinst} (92%)
 rename debian/{elbe-updated.postrm => python3-elbe-updated.postrm} (90%)
 rename debian/{elbe-updated.prerm => python3-elbe-updated.prerm} (94%)
 rename debian/{elbe-updated.service => python3-elbe-updated.service} (83%)

-- 
2.20.1



More information about the elbe-devel mailing list