From: xuhy Date: Mon, 24 Jun 2024 02:39:49 +0000 (+0800) Subject: Fix build errors on Ubuntu 24.04 X-Git-Tag: accepted/tools/devbase/tools/20250527.103808^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ca52f0149ca7ed075abcfd80597b0a1d37625b2;p=services%2Fobs-service-git-buildpackage.git Fix build errors on Ubuntu 24.04 python3 setup.py install --prefix=/usr does not work. packages are always installed into /usr/local in default. Change-Id: Ic08f3203ff85bf56818000358762906cd5bb171c Signed-off-by: xuhy --- diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..e491e93 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,6 @@ +graft config +graft service +graft obs_service_gbp +graft obs_service_gbp_utils +graft gbp_repocache +graft repocache_adm diff --git a/debian/control b/debian/control index 90d94ce..d4970f1 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,15 @@ Source: obs-service-git-buildpackage Section: devel Priority: extra Maintainer: Jian-feng Ding -Build-Depends: debhelper (>= 7.0.15), cdbs, python3-dev, dh-python, python3-docutils, python3, python3-setuptools, python3-coverage, python3-nose +Build-Depends: debhelper (>= 7.0.15), cdbs, + dh-python, + python3-dev, + python3-docutils, + python3, + python3-setuptools, + python3-coverage, + python3-nose, + python3-pip Standards-Version: 0.9 Homepage: http://www.tizen.org diff --git a/debian/gbp-repocache.install b/debian/gbp-repocache.install index 94cecbd..33dc539 100644 --- a/debian/gbp-repocache.install +++ b/debian/gbp-repocache.install @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/python*/*-packages/gbp_repocache/*.py -debian/tmp/usr/lib/python*/*-packages/repocache_adm/*.py +usr/local/lib/python*/*-packages/gbp_repocache/*.py +usr/local/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 dcce29b..0163925 100644 --- a/debian/obs-service-git-buildpackage-utils.install +++ b/debian/obs-service-git-buildpackage-utils.install @@ -1 +1 @@ -/usr/lib/python*/*-packages/obs_service_gbp_utils/*.py +usr/local/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 1826a57..db3bbd3 100644 --- a/debian/obs-service-git-buildpackage.install +++ b/debian/obs-service-git-buildpackage.install @@ -1,2 +1,2 @@ -usr/lib/obs/service/* -usr/lib/python*/*-packages/obs_service_gbp/*.py +usr/local/lib/python*/*-packages/usr/lib/obs/service/* /usr/lib/obs/service +usr/local/lib/python*/*-packages/obs_service_gbp/*.py diff --git a/debian/rules b/debian/rules index e3b5525..13f3c57 100755 --- a/debian/rules +++ b/debian/rules @@ -3,8 +3,9 @@ %: dh $@ --with python3 --buildsystem=pybuild cp config/git-buildpackage config/obs-service-git-buildpackage.example.config + override_dh_auto_install: - python3 setup.py install --root=debian/tmp --prefix=/usr + python3 -m pip install --no-build-isolation . --root=debian/tmp override_dh_auto_test: @echo 'Skipping autotests' diff --git a/obs_service_gbp/command.py b/obs_service_gbp/command.py index 601ead6..aed745d 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 ConfigParser import gbp.log as gbplog from gbp.rpm import guess_spec, NoSpecError @@ -103,7 +103,7 @@ def read_config(filenames=None): configs = default_configs if filenames is None else filenames configs = [os.path.expanduser(fname) for fname in configs] LOGGER.debug('Trying %s config files: %s', len(configs), configs) - parser = SafeConfigParser(defaults=defaults) + parser = ConfigParser(defaults=defaults) read = parser.read(configs) LOGGER.debug('Read %s config files: %s', len(read), read) diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..2f64ad9 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,27 @@ +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" + +[project] +name = "obs_service_gbp" +authors = [ + {name = "Markus Lehtonen", email = "markus.lehtonen@linux.intel.com"}, + ] +license = {text = "GPL-2.0+ License"} +dynamic = ["version", "description"] + +[project.urls] +Homepage = "http://www.tizen.org" + +[project.scripts] +repocache-adm = "repocache_adm.adm:main" + +[project.entry-points."repocache_adm.adm.main"] +repocache-adm = "repocache_adm.adm:main" + +[tool.setuptools] +packages = ['config', 'service', 'obs_service_gbp', 'obs_service_gbp_utils', 'gbp_repocache', 'repocache_adm'] + +[tool.setuptools.package-data] +service = ["git-buildpackage*"] +config = ['git-buildpackage'] diff --git a/setup.py b/setup.py index 0464b1c..444b12d 100644 --- a/setup.py +++ b/setup.py @@ -30,13 +30,10 @@ def tag_from_spec(tag): return line.split(':', 1)[1].strip() raise Exception("ERROR: unable to parse '%s' from spec file" % tag) -setup(name='obs_service_gbp', +setup( + name='obs_service_gbp', version=tag_from_spec('Version'), description=tag_from_spec('Summary'), - author='Markus Lehtonen', - author_email='markus.lehtonen@linux.intel.com', - url=tag_from_spec('URL'), - license=tag_from_spec('License'), packages=['obs_service_gbp', 'obs_service_gbp_utils', 'gbp_repocache', 'repocache_adm'], data_files=[('/usr/lib/obs/service', ['service/git-buildpackage',