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 <huayong.xu@samsung.com>

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644 (file)
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 90d94ce18c9e989913fd815f7f9044fd2a9b923f..d4970f1631ee8557c4208d1049748b9c291c20b5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,15 @@ Source: obs-service-git-buildpackage
 Section: devel
 Priority: extra
 Maintainer: Jian-feng Ding <jian-feng.ding@intel.com>
-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 94cecbd6bf4ebd3c2e749ace67b9f9305681d0e7..33dc53975626586b6d7592235a9aad612c54fc85 100644 (file)
--- 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 dcce29bfed9df8eb6b75d6397481917a8e5d6688..0163925fc216ca51a0e76e141d86c03b0f7da38f 100644 (file)
--- 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 1826a57be38661d17ab01453c35e7f788f339ed8..db3bbd36d23ae077efb52293306bff6f5ffe5175 100644 (file)
--- 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 e3b5525456010589a5749e77b04145c5b04fdb46..13f3c57ffe00bb7575660e5015acfc20f3806c40 100755 (executable)
--- 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 601ead614f1a9bf63d6496844b01247b5774b8fb..aed745d91e47067bf43695930b2a1167d7a1ca69 100644 (file)
--- 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 (file)
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 0464b1c9691b642ed0e9611a683c462bdc409df4..444b12dbdd2db222a0532b968c5cb6453f687dc4 100644 (file)
--- 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',