From fe1811859b84789d071c5e97e03b5e506dc207e0 Mon Sep 17 00:00:00 2001 From: xuhy Date: Wed, 5 Jun 2024 15:02:03 +0800 Subject: [PATCH] Fix build errors on Ubuntu 24.04 Change-Id: Ifa871acfcedcfd55e63cd66eaecce7dc33bcf357 Signed-off-by: xuhy --- Makefile | 10 ++-------- bsr/bsr/gbs/gbs_actions.py | 7 ++----- bsr/setup.cfg | 2 +- bsr/setup.py | 25 +++++++++++-------------- bsr/tox.ini | 2 +- debian/compat | 2 +- debian/control | 2 +- debian/gbs-bsr.install | 16 ++++++++-------- debian/rules | 2 +- gitbuildsys/cmd_chroot.py | 2 +- gitbuildsys/cmd_devel.py | 2 +- gitbuildsys/oscapi.py | 2 +- packaging/gbs.spec | 2 +- setup.py | 2 +- tests/test_passwdx.py | 2 +- 15 files changed, 34 insertions(+), 46 deletions(-) diff --git a/Makefile b/Makefile index 9b9a02d..3121d52 100644 --- a/Makefile +++ b/Makefile @@ -12,10 +12,6 @@ ifndef PREFIX PREFIX = "/usr/local" endif -all: - python3 setup.py build - cd bsr && python3 setup.py build && cd .. - tag: git tag $(VERSION) @@ -43,12 +39,10 @@ pdf: docs: man html pdf -install: all - python3 setup.py install --prefix=${PREFIX} - cd bsr && python3 setup.py install --prefix=${PREFIX} && cd .. - clean: rm -rf {build/,dist/,*.egg-info/} cd bsr && rm -rf {build/,dist/,*.egg-info/} && cd .. + test: nosetests -v --with-coverage --with-xunit + diff --git a/bsr/bsr/gbs/gbs_actions.py b/bsr/bsr/gbs/gbs_actions.py index c8149cc..990fc0d 100755 --- a/bsr/bsr/gbs/gbs_actions.py +++ b/bsr/bsr/gbs/gbs_actions.py @@ -18,10 +18,7 @@ import os import subprocess import shutil -try: - from configparser import SafeConfigParser -except ImportError: - from configparser import SafeConfigParser +from configparser import ConfigParser from bsr.utility.utils import pushd, console, list_all_directories @@ -130,7 +127,7 @@ class GbsAction: console('Use gbs configuration file from {}'.format(self.get_config_file()), \ self.verbose) - parser = SafeConfigParser() + parser = ConfigParser() parser.read(self.get_config_file()) conf_profile = parser.get('general', 'profile') diff --git a/bsr/setup.cfg b/bsr/setup.cfg index 0c9e0fc..8183238 100644 --- a/bsr/setup.cfg +++ b/bsr/setup.cfg @@ -1,2 +1,2 @@ [metadata] -license_file = LICENSE +license_files = LICENSE diff --git a/bsr/setup.py b/bsr/setup.py index 166b5cd..9567c34 100644 --- a/bsr/setup.py +++ b/bsr/setup.py @@ -3,7 +3,7 @@ """A setuptools based setup module. """ -from setuptools import setup, find_packages +from setuptools import setup import os import sys @@ -23,15 +23,6 @@ with open(os.path.join(here, 'bsr', '__version__.py'), 'r') as f: with open('README.md', 'r') as f: readme = f.read() -def package_files(directory): - paths = [] - for (path, directories, filenames) in os.walk(directory): - for filename in filenames: - paths.append(os.path.join('..', path, filename)) - return paths - -extra_files = package_files('bsr/web_dist') - def check_debian(): """--install-layout is recognized after 2.5""" if sys.version_info[:2] > (2, 5): @@ -57,13 +48,19 @@ setup( author=about['__author__'], author_email=about['__author_email__'], url=about['__url__'], - packages=find_packages(), scripts=['bsr/bsr'], + packages=['bsr', 'bsr.analyzer', 'bsr.network', 'bsr.tests', 'bsr.report', 'bsr.utility', 'bsr.gbs', + 'bsr.web_dist', 'bsr.web_dist.images', 'bsr.web_dist.static.css', + 'bsr.web_dist.static.js', 'bsr.web_dist.static.media'], package_data={ - '': ['LICENSE', 'NOTICE'] + extra_files, - 'requests': ['*.pem'] + '': ['LICENSE', 'NOTICE'], + 'requests': ['*.pem'], + 'bsr.web_dist': ["*.json", "*.html"], + 'bsr.web_dist.images': ["*.svg", "*.png"], + 'bsr.web_dist.static.css': ["*.css"], + 'bsr.web_dist.static.js': ["*.js", "*.txt"], + 'bsr.web_dist.static.media': ["*.woff2", "*.ttf", "*.svg", "*.woff", "*.eot", "*.png"], }, - package_dir={'bsr': 'bsr'}, include_package_data=True, python_requires=">=2.7.17, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*", install_requires=requires, diff --git a/bsr/tox.ini b/bsr/tox.ini index 80454e0..9767ba1 100644 --- a/bsr/tox.ini +++ b/bsr/tox.ini @@ -4,4 +4,4 @@ envlist = py27,py35,py36,py37,py38 [testenv] commands = - python setup.py test + pytest diff --git a/debian/compat b/debian/compat index 7f8f011..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +10 diff --git a/debian/control b/debian/control index fc1cf9c..c2e7f65 100755 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Depends: ${misc:Depends}, ${python3:Depends}, python3-lxml, sudo, osc (>= 0.170.1), - git-buildpackage-rpm (>= 0.9.28-tizen20231130), + git-buildpackage-rpm (>= 0.9.36+tizen20240605), gbs-api (= ${binary:Version}), gbs-export (= ${binary:Version}), gbs-remotebuild (= ${binary:Version}), diff --git a/debian/gbs-bsr.install b/debian/gbs-bsr.install index 1121032..26bdaf3 100644 --- a/debian/gbs-bsr.install +++ b/debian/gbs-bsr.install @@ -1,8 +1,8 @@ -usr/lib/python*/*packages/bsr/*.py -usr/lib/python*/*packages/bsr/analyzer/*.py -usr/lib/python*/*packages/bsr/gbs/*.py -usr/lib/python*/*packages/bsr/network/*.py -usr/lib/python*/*packages/bsr/report/*.py -usr/lib/python*/*packages/bsr/utility/*.py -usr/lib/python*/*packages/bsr/web_dist/* -usr/bin/bsr +usr/local/lib/python*/*packages/bsr/*.py +usr/local/lib/python*/*packages/bsr/analyzer/*.py +usr/local/lib/python*/*packages/bsr/gbs/*.py +usr/local/lib/python*/*packages/bsr/network/*.py +usr/local/lib/python*/*packages/bsr/report/*.py +usr/local/lib/python*/*packages/bsr/utility/*.py +usr/local/lib/python*/*packages/bsr/web_dist/* +usr/local/bin/bsr /usr/bin diff --git a/debian/rules b/debian/rules index 262f1b4..48ac8e0 100644 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ override_dh_auto_install: python3 setup.py install --root=debian/tmp --prefix=/usr make man - cd bsr && python3 setup.py install --root=../debian/tmp --prefix=/usr && cd .. + cd bsr && python3 setup.py install --root=../debian/tmp --prefix=/usr/local && cd .. mkdir -p debian/tmp/usr/share/man/man1 mkdir -p debian/tmp/usr/share/gbs install -m644 docs/gbs.1 debian/tmp/usr/share/man/man1 diff --git a/gitbuildsys/cmd_chroot.py b/gitbuildsys/cmd_chroot.py index 796e986..fd59ee8 100644 --- a/gitbuildsys/cmd_chroot.py +++ b/gitbuildsys/cmd_chroot.py @@ -47,7 +47,7 @@ def main(args): try: build_env = os.environ - build_env['PS1'] = "(tizen-build-env)@\h \W]\$ " + build_env['PS1'] = r"(tizen-build-env)@\h \W]\$ " subprocess.call(cmd, env=build_env) except OSError as err: raise GbsError('failed to chroot to %s: %s' % (build_root, err)) diff --git a/gitbuildsys/cmd_devel.py b/gitbuildsys/cmd_devel.py index 05c119b..912ecc1 100644 --- a/gitbuildsys/cmd_devel.py +++ b/gitbuildsys/cmd_devel.py @@ -67,7 +67,7 @@ def update_local_conf(repo, values): conf_fn = os.path.join(repo.path, '.gbs.conf') log.info('Updating local .gbs.conf') with open(conf_fn, 'a+') as conf_fp: - parser.readfp(conf_fp) + parser.read_file(conf_fp) for section, items in list(values.items()): for key, value in list(items.items()): parser.set_into_file(section, key, value) diff --git a/gitbuildsys/oscapi.py b/gitbuildsys/oscapi.py index 3d5cbee..3dfb4b9 100644 --- a/gitbuildsys/oscapi.py +++ b/gitbuildsys/oscapi.py @@ -327,7 +327,7 @@ class OSC(object): # This regular expression is created for parsing the # results of of core.get_results() stat_re = re.compile(r'^(?P\S+)\s+(?P\S+)\s+' - '(?P\S*)$') + r'(?P\S*)$') for res in build_status: match = stat_re.match(res) if match: diff --git a/packaging/gbs.spec b/packaging/gbs.spec index 80f2844..40d9ea6 100755 --- a/packaging/gbs.spec +++ b/packaging/gbs.spec @@ -23,7 +23,7 @@ Requires: python3-requests Requires: python3-lxml Requires: sudo Requires: osc >= 0.170.1 -Requires: tizen-gbp-rpm >= 20231130 +Requires: tizen-gbp-rpm >= 20240605 Requires: depanneur >= 0.16.24 %if ! 0%{?tizen_version:1} diff --git a/setup.py b/setup.py index 03dbff8..cbee273 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ import os, sys import re -from distutils.core import setup +from setuptools import setup MOD_NAME = 'gitbuildsys' diff --git a/tests/test_passwdx.py b/tests/test_passwdx.py index 59d5a86..a8dafc2 100644 --- a/tests/test_passwdx.py +++ b/tests/test_passwdx.py @@ -166,7 +166,7 @@ class AutoGenerateTest(unittest.TestCase): reload(gitbuildsys.conf) parser = BrainConfigParser() - parser.readfp(StringIO(conf.getvalue())) + parser.read_file(StringIO(conf.getvalue())) name = parser.get('general', 'profile') repos = parser.get(name, 'repos') -- 2.34.1