From ec72f6cdd8b78c28e05ad3189b2217aa67033e6b Mon Sep 17 00:00:00 2001 From: wangbiao Date: Wed, 6 Mar 2024 21:46:20 +0900 Subject: [PATCH] port python2 code to python3 Change-Id: I02309cdeca6c30e01c22373fb013857f1263e1b5 Signed-off-by: wangbiao --- debian/control | 16 +++--- debian/gbp-repocache.install | 4 +- ...obs-service-git-buildpackage-utils.install | 2 +- debian/obs-service-git-buildpackage.install | 4 +- debian/rules | 53 +++---------------- obs_service_gbp/command.py | 4 +- repocache_adm/adm.py | 2 +- repocache_adm/cmd_stat.py | 8 +-- repocache_adm/common.py | 2 +- service/git-buildpackage | 2 +- setup.py | 2 +- 11 files changed, 30 insertions(+), 69 deletions(-) diff --git a/debian/control b/debian/control index 3f65e8c..90d94ce 100644 --- a/debian/control +++ b/debian/control @@ -2,16 +2,16 @@ Source: obs-service-git-buildpackage Section: devel Priority: extra Maintainer: Jian-feng Ding -Build-Depends: debhelper (>= 7.0.15), cdbs, python-dev, dh-python, python-docutils, python, python-setuptools, python-coverage, python-nose +Build-Depends: debhelper (>= 7.0.15), cdbs, python3-dev, dh-python, python3-docutils, python3, python3-setuptools, python3-coverage, python3-nose Standards-Version: 0.9 Homepage: http://www.tizen.org Package: obs-service-git-buildpackage Architecture: all -Depends: ${python:Depends}, +Depends: ${python3:Depends}, rpm, - python-rpm, - python-urlgrabber, + python3-rpm, + python3-urlgrabber, cpio, bzip2, git-buildpackage, @@ -23,10 +23,10 @@ Description: image creator for Linux distributions Package: obs-service-git-buildpackage-utils Architecture: all -Depends: ${python:Depends}, +Depends: ${python3:Depends}, rpm, - python, - python-urlgrabber, + python3, + python3-urlgrabber, cpio, bzip2, gbp-repocache, @@ -36,7 +36,7 @@ Description: image creator for Linux distributions Package: gbp-repocache Architecture: all -Depends: ${python:Depends}, +Depends: ${python3:Depends}, Description: image creator for Linux distributions The tool createrep is used to ppfarm test diff --git a/debian/gbp-repocache.install b/debian/gbp-repocache.install index 6791c38..94cecbd 100644 --- a/debian/gbp-repocache.install +++ b/debian/gbp-repocache.install @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/python2.7/site-packages/gbp_repocache /usr/lib/python2.7/site-packages/ -debian/tmp/usr/lib/python2.7/site-packages/repocache_adm /usr/lib/python2.7/site-packages/ +debian/tmp/usr/lib/python*/*-packages/gbp_repocache/*.py +debian/tmp/usr/lib/python*/*-packages/repocache_adm/*.py diff --git a/debian/obs-service-git-buildpackage-utils.install b/debian/obs-service-git-buildpackage-utils.install index 6de8327..dcce29b 100644 --- a/debian/obs-service-git-buildpackage-utils.install +++ b/debian/obs-service-git-buildpackage-utils.install @@ -1 +1 @@ -debian/tmp/usr/lib/python2.7/site-packages/obs_service_gbp_utils /usr/lib/python2.7/site-packages/ +/usr/lib/python*/*-packages/obs_service_gbp_utils/*.py diff --git a/debian/obs-service-git-buildpackage.install b/debian/obs-service-git-buildpackage.install index 1f37d68..1826a57 100644 --- a/debian/obs-service-git-buildpackage.install +++ b/debian/obs-service-git-buildpackage.install @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/obs/service/* /usr/lib/obs/service/ -debian/tmp/usr/lib/python2.7/site-packages/obs_service_gbp /usr/lib/python2.7/site-packages/ +usr/lib/obs/service/* +usr/lib/python*/*-packages/obs_service_gbp/*.py diff --git a/debian/rules b/debian/rules index ee90d94..e3b5525 100755 --- a/debian/rules +++ b/debian/rules @@ -1,52 +1,13 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -build: build-stamp -build-stamp: - dh_testdir - python setup.py build - pwd - ls +%: + dh $@ --with python3 --buildsystem=pybuild cp config/git-buildpackage config/obs-service-git-buildpackage.example.config -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs +override_dh_auto_install: + python3 setup.py install --root=debian/tmp --prefix=/usr - # Installing package - mkdir -p $(CURDIR)/debian/tmp/ - python setup.py install --skip-build --root=$(CURDIR)/debian/tmp --prefix=/usr - rm -rf $(CURDIR)/usr/lib/python2.7/site-packages/*info - ls -R -binary-indep: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_install - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_python2 - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb +override_dh_auto_test: + @echo 'Skipping autotests' -binary-arch: build install +override_dh_usrlocal: -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff --git a/obs_service_gbp/command.py b/obs_service_gbp/command.py index a11a869..335ca46 100644 --- a/obs_service_gbp/command.py +++ b/obs_service_gbp/command.py @@ -23,7 +23,7 @@ import argparse import logging import shutil import tempfile -from ConfigParser import SafeConfigParser +from configparser import SafeConfigParser import gbp.log as gbplog from gbp.rpm import guess_spec, NoSpecError @@ -112,7 +112,7 @@ def read_config(filenames=None): parser.add_section('general') # Read overrides from environment - for key in defaults.keys(): + for key in list(defaults.keys()): envvar ='OBS_GIT_BUILDPACKAGE_%s' % key.replace('-', '_').upper() if envvar in os.environ: parser.set('general', key, os.environ[envvar]) diff --git a/repocache_adm/adm.py b/repocache_adm/adm.py index 5d93815..40e0516 100755 --- a/repocache_adm/adm.py +++ b/repocache_adm/adm.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/python3 -u # vim:fileencoding=utf-8:et:ts=4:sw=4:sts=4 # # Copyright (C) 2013 Intel Corporation diff --git a/repocache_adm/cmd_stat.py b/repocache_adm/cmd_stat.py index e723bd9..abbd075 100644 --- a/repocache_adm/cmd_stat.py +++ b/repocache_adm/cmd_stat.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/python3 -u # vim:fileencoding=utf-8:et:ts=4:sw=4:sts=4 # # Copyright (C) 2013 Intel Corporation @@ -67,7 +67,7 @@ class Stat(SubcommandBase): num_repos += 1 pretty_sz = " (%s)" % pprint_sz(total_sz) if total_sz >= 1024 else "" - print "Status of %s:" % path - print "Total of %d repos taking %d bytes%s of disk space" % \ - (num_repos, total_sz, pretty_sz) + print("Status of %s:" % path) + print("Total of %d repos taking %d bytes%s of disk space" % \ + (num_repos, total_sz, pretty_sz)) return 0 diff --git a/repocache_adm/common.py b/repocache_adm/common.py index 197828b..8251966 100644 --- a/repocache_adm/common.py +++ b/repocache_adm/common.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/python3 -u # vim:fileencoding=utf-8:et:ts=4:sw=4:sts=4 # # Copyright (C) 2013 Intel Corporation diff --git a/service/git-buildpackage b/service/git-buildpackage index d2617b2..598be40 100755 --- a/service/git-buildpackage +++ b/service/git-buildpackage @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/python3 -u # vim:fileencoding=utf-8:et:ts=4:sw=4:sts=4 # # Copyright (C) 2013 Intel Corporation diff --git a/setup.py b/setup.py index 1f16160..0464b1c 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # vim:fileencoding=utf-8:et:ts=4:sw=4:sts=4 # # Copyright (C) 2013 Intel Corporation -- 2.34.1