Hello community, here is the log from the commit of package openSUSE-release-tools for openSUSE:Factory checked in at 2019-05-17 23:44:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old) and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openSUSE-release-tools" Fri May 17 23:44:10 2019 rev:176 rq:703648 version:20190516.fab9b27f Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes 2019-05-16 22:09:13.610326980 +0200 +++ /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.5148/openSUSE-release-tools.changes 2019-05-17 23:44:13.849877631 +0200 @@ -1,0 +2,55 @@ +Thu May 16 15:56:13 UTC 2019 - opensuse-releaseteam@opensuse.org + +- Update to version 20190516.fab9b27f: + * Convert stdout of repo checker perl part to string + * Fix check_source with python3 + +------------------------------------------------------------------- +Thu May 16 08:25:25 UTC 2019 - opensuse-releaseteam@opensuse.org + +- Update to version 20190516.63108381: + * Run container cleaner as python3 + * sha1_short: support bytes and str + +------------------------------------------------------------------- +Thu May 16 06:04:51 UTC 2019 - opensuse-releaseteam@opensuse.org + +- Update to version 20190516.4e26ac93: + * Sort architectures to fix #2021 + +------------------------------------------------------------------- +Thu May 16 05:36:12 UTC 2019 - opensuse-releaseteam@opensuse.org + +- Update to version 20190516.6dce9a79: + * Run even more bots in python3 + * Run source and repo checker in python3 + +------------------------------------------------------------------- +Thu May 16 04:42:13 UTC 2019 - opensuse-releaseteam@opensuse.org + +- Update to version 20190516.69527f81: + * origin-manager: switch to python3. + * osclib/origin: cast filter() to list() to improve debug output [python3]. + * osc-origin, osclib/origin: port first dict key/value access [python3]. + * osclib/util: sha1_short(): encode data as utf-8 [python3]. + +------------------------------------------------------------------- +Thu May 16 00:41:07 UTC 2019 - opensuse-releaseteam@opensuse.org + +- Update to version 20190515.8221df00: + * osclib/core: rework as package_list_kind_filtered(). + * osclib/core: provide package_kind(). + +------------------------------------------------------------------- +Wed May 15 19:02:02 UTC 2019 - opensuse-releaseteam@opensuse.org + +- Update to version 20190515.33b36945: + * Run ttm in python3 containers as well + +------------------------------------------------------------------- +Wed May 15 18:38:46 UTC 2019 - opensuse-releaseteam@opensuse.org + +- Update to version 20190515.b5131ba8: + * Run the monitors in python3 containers + +------------------------------------------------------------------- Old: ---- openSUSE-release-tools-20190515.5a1b08d8.obscpio New: ---- openSUSE-release-tools-20190516.fab9b27f.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-release-tools.spec ++++++ --- /var/tmp/diff_new_pack.WAv80I/_old 2019-05-17 23:44:15.325876820 +0200 +++ /var/tmp/diff_new_pack.WAv80I/_new 2019-05-17 23:44:15.329876819 +0200 @@ -31,7 +31,7 @@ %define source_dir openSUSE-release-tools %define announcer_filename factory-package-news Name: openSUSE-release-tools -Version: 20190515.5a1b08d8 +Version: 20190516.fab9b27f Release: 0 Summary: Tools to aid in staging and release work for openSUSE/SUSE License: GPL-2.0-or-later AND MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.WAv80I/_old 2019-05-17 23:44:15.369876796 +0200 +++ /var/tmp/diff_new_pack.WAv80I/_new 2019-05-17 23:44:15.373876794 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param> - <param name="changesrevision">5a1b08d81bf4a42d4413e340d555a3fee25cf811</param> + <param name="changesrevision">fab9b27fa8bd08f3176f6244a5272fd01e12e1b1</param> </service> </servicedata> ++++++ openSUSE-release-tools-20190515.5a1b08d8.obscpio -> openSUSE-release-tools-20190516.fab9b27f.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/ReviewBot.py new/openSUSE-release-tools-20190516.fab9b27f/ReviewBot.py --- old/openSUSE-release-tools-20190515.5a1b08d8/ReviewBot.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/ReviewBot.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,6 +1,4 @@ -#!/usr/bin/python - -from __future__ import print_function +#!/usr/bin/python3 from pprint import pprint import os, sys, re @@ -30,17 +28,7 @@ from osc import conf import osc.core -try: - from urllib.error import HTTPError, URLError -except ImportError: - # python 2.x - from urllib2 import HTTPError, URLError - -try: - import __builtin__ - input = getattr(__builtin__, 'raw_input') -except (ImportError, AttributeError): - pass +from urllib.error import HTTPError, URLError from itertools import count diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/ToolBase.py new/openSUSE-release-tools-20190516.fab9b27f/ToolBase.py --- old/openSUSE-release-tools-20190515.5a1b08d8/ToolBase.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/ToolBase.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,6 +1,4 @@ -#!/usr/bin/python - -from __future__ import print_function +#!/usr/bin/python3 from xml.etree import cElementTree as ET import cmdln @@ -11,13 +9,9 @@ import sys import time -try: - from urllib.error import HTTPError - from urllib.parse import quote_plus -except ImportError: - # python 2.x - from urllib2 import HTTPError - from urllib import quote_plus +from urllib.error import HTTPError +from urllib.parse import quote_plus + import osc.conf import osc.core @@ -29,12 +23,6 @@ http_DELETE = osc.core.http_DELETE http_POST = osc.core.http_POST -try: - import __builtin__ - input = getattr(__builtin__, 'raw_input') -except (ImportError, AttributeError): - pass - # http://stackoverflow.com/questions/312443/how-do-you-split-a-list-into-evenl... def chunks(l, n): """ Yield successive n-sized chunks from l. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/check_source.py new/openSUSE-release-tools-20190516.fab9b27f/check_source.py --- old/openSUSE-release-tools-20190515.5a1b08d8/check_source.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/check_source.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 import os import re @@ -13,15 +13,12 @@ import osc.conf import osc.core +from osc.util.helper import decode_list from osclib.conf import Config from osclib.core import devel_project_get from osclib.core import devel_project_fallback from osclib.core import group_members -try: - from urllib.error import HTTPError -except ImportError: - # python 2.x - from urllib2 import HTTPError +from urllib.error import HTTPError import ReviewBot from osclib.conf import str2bool @@ -153,9 +150,9 @@ civs += 'LC_ALL=C perl %s _old %s 2>&1' % (source_checker, target_package) p = subprocess.Popen(civs, shell=True, stdout=subprocess.PIPE, close_fds=True) ret = os.waitpid(p.pid, 0)[1] - checked = p.stdout.readlines() + checked = decode_list(p.stdout.readlines()) - output = ' '.join(checked).translate(None, '\033') + output = ' '.join(checked).replace('\033', '') os.chdir('/tmp') # ret = 0 : Good @@ -206,7 +203,7 @@ @staticmethod def checkout_package(*args, **kwargs): _stdout = sys.stdout - sys.stdout = open(os.devnull, 'wb') + sys.stdout = open(os.devnull, 'w') try: result = osc.core.checkout_package(*args, **kwargs) finally: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/check_source_in_factory.py new/openSUSE-release-tools-20190516.fab9b27f/check_source_in_factory.py --- old/openSUSE-release-tools-20190515.5a1b08d8/check_source_in_factory.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/check_source_in_factory.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 from pprint import pprint import os, sys, re @@ -13,11 +13,7 @@ import osc.conf import osc.core -try: - from urllib.error import HTTPError, URLError -except ImportError: - # python 2.x - from urllib2 import HTTPError, URLError +from urllib.error import HTTPError, URLError import yaml import ReviewBot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/check_tags_in_requests.py new/openSUSE-release-tools-20190516.fab9b27f/check_tags_in_requests.py --- old/openSUSE-release-tools-20190515.5a1b08d8/check_tags_in_requests.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/check_tags_in_requests.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 import sys import re @@ -11,17 +11,7 @@ except ImportError: import cElementTree as ET -try: - from urllib.error import HTTPError -except ImportError: - # python 2.x - from urllib2 import HTTPError - -try: - from urllib.error import URLError -except ImportError: - # python 2.x - from urllib2 import URLError +from urllib.error import HTTPError, URLError import ReviewBot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/container_cleaner.py new/openSUSE-release-tools-20190516.fab9b27f/container_cleaner.py --- old/openSUSE-release-tools-20190515.5a1b08d8/container_cleaner.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/container_cleaner.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,9 +1,7 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # (c) 2019 fvogt@suse.de # GPLv3-only -from __future__ import print_function - import osc.conf import osc.core import logging diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/devel-project.py new/openSUSE-release-tools-20190516.fab9b27f/devel-project.py --- old/openSUSE-release-tools-20190515.5a1b08d8/devel-project.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/devel-project.py 2019-05-16 17:55:03.000000000 +0200 @@ -16,7 +16,7 @@ from osclib.conf import Config from osclib.core import devel_project_fallback from osclib.core import entity_email -from osclib.core import package_list_without_links +from osclib.core import package_list_kind_filtered from osclib.core import request_age from osclib.stagingapi import StagingAPI from osclib.util import mail_send @@ -107,7 +107,7 @@ # devel_project_fallback() must be used on a per package basis. packages = args.packages if not packages: - packages = package_list_without_links(apiurl, args.project) + packages = package_list_kind_filtered(apiurl, args.project) maintainer_map = {} for package in packages: devel_project, devel_package = devel_project_fallback(apiurl, args.project, package) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/gocd/checkers.opensuse.gocd.yaml new/openSUSE-release-tools-20190516.fab9b27f/gocd/checkers.opensuse.gocd.yaml --- old/openSUSE-release-tools-20190515.5a1b08d8/gocd/checkers.opensuse.gocd.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/openSUSE-release-tools-20190516.fab9b27f/gocd/checkers.opensuse.gocd.yaml 2019-05-16 17:55:03.000000000 +0200 @@ -0,0 +1,44 @@ +format_version: 3 +pipelines: + openSUSE.Source.Check: + group: openSUSE.Checkers + lock_behavior: unlockWhenFinished + timer: + spec: 0 */5 * ? * * + environment_variables: + OSC_CONFIG: /home/go/config/oscrc-factory-auto + materials: + git: + git: https://github.com/openSUSE/openSUSE-release-tools.git + stages: + - Run: + approval: + type: manual + jobs: + Run: + timeout: 0 + resources: + - staging-bot3 + tasks: + - script: ./check_source.py -A https://api.opensuse.org --verbose --skip-add-reviews --group factory-auto review + openSUSE.Repochecker: + group: openSUSE.Checkers + lock_behavior: unlockWhenFinished + timer: + spec: 0 0 * ? * * + environment_variables: + OSC_CONFIG: /home/go/config/oscrc-repo-checker + materials: + git: + git: https://github.com/openSUSE/openSUSE-release-tools.git + stages: + - Run: + approval: + type: manual + jobs: + Run: + timeout: 0 + resources: + - repo-checker3 + tasks: + - script: ./repo_checker.py -A https://api.opensuse.org --debug review diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/gocd/checkers.suse.gocd.yaml new/openSUSE-release-tools-20190516.fab9b27f/gocd/checkers.suse.gocd.yaml --- old/openSUSE-release-tools-20190515.5a1b08d8/gocd/checkers.suse.gocd.yaml 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/gocd/checkers.suse.gocd.yaml 2019-05-16 17:55:03.000000000 +0200 @@ -20,7 +20,7 @@ resources: - staging-bot3 tasks: - - script: python3 ./check_tags_in_requests.py -A https://api.suse.de --verbose --user=sle-changelog-checker --review=accept-onpass --factory=openSUSE.org:openSUSE:Factory review + - script: ./check_tags_in_requests.py -A https://api.suse.de --verbose --user=sle-changelog-checker --review=accept-onpass --factory=openSUSE.org:openSUSE:Factory review SLE.Project.Only: group: SLE.Checkers lock_behavior: unlockWhenFinished @@ -39,15 +39,15 @@ SLE_15_SP1: timeout: 0 resources: - - repo-checker + - repo-checker3 tasks: - - script: /usr/bin/osrt-repo_checker -A https://api.suse.de --debug project_only --post-comments SUSE:SLE-15-SP1:GA + - script: ./repo_checker.py -A https://api.suse.de --debug project_only --post-comments SUSE:SLE-15-SP1:GA SLE_12_SP5: timeout: 0 resources: - - repo-checker + - repo-checker3 tasks: - - script: /usr/bin/osrt-repo_checker -A https://api.suse.de --debug project_only --post-comments SUSE:SLE-12-SP5:GA + - script: ./repo_checker.py -A https://api.suse.de --debug project_only --post-comments SUSE:SLE-12-SP5:GA SLE-SP1.Manager42: group: SLE.Checkers lock_behavior: unlockWhenFinished @@ -85,9 +85,9 @@ Run: timeout: 0 resources: - - repo-checker + - repo-checker3 tasks: - - script: /usr/bin/osrt-repo_checker -A https://api.suse.de --debug review + - script: ./repo_checker.py -A https://api.suse.de --debug review SLE.Leaper: group: SLE.Checkers lock_behavior: unlockWhenFinished @@ -107,7 +107,7 @@ resources: - leaper tasks: - - script: python3 /usr/bin/osrt-leaper -A https://api.suse.de --group=leaper --user=leaper --verbose --manual-version-updates --manual-maintenance-updates review + - script: ./leaper.py -A https://api.suse.de --group=leaper --user=leaper --verbose --manual-version-updates --manual-maintenance-updates review SLE.Staging.Bot.Regular: group: SLE.Checkers lock_behavior: unlockWhenFinished @@ -152,9 +152,9 @@ Run: timeout: 0 resources: - - staging-bot + - staging-bot3 tasks: - - script: /usr/bin/osrt-staging-report --debug -A https://api.suse.de -p SUSE:SLE-15-SP1:GA + - script: ./staging-report.py --debug -A https://api.suse.de -p SUSE:SLE-15-SP1:GA SLE.Check.Dups: group: SLE.Checkers lock_behavior: unlockWhenFinished @@ -173,7 +173,7 @@ Run: timeout: 0 resources: - - staging-bot + - staging-bot3 tasks: - script: /usr/bin/osc -A https://api.suse.de check_dups SUSE:SLE-15-SP1:GA SLE.Source.Check: @@ -194,9 +194,9 @@ Run: timeout: 0 resources: - - staging-bot + - staging-bot3 tasks: - - script: /usr/bin/osrt-check_source -A https://api.suse.de --verbose --skip-add-reviews --group factory-auto review + - script: ./check_source.py -A https://api.suse.de --verbose --skip-add-reviews --group factory-auto review SLE12.SP5.InstallCheck: group: SLE.Checkers lock_behavior: unlockWhenFinished @@ -217,47 +217,47 @@ resources: - repo-checker3 tasks: - - script: python3 ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s A + - script: ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s A Run.B: timeout: 0 resources: - repo-checker3 tasks: - - script: python3 ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s B + - script: ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s B Run.C: timeout: 0 resources: - repo-checker3 tasks: - - script: python3 ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s C + - script: ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s C Run.D: timeout: 0 resources: - repo-checker3 tasks: - - script: python3 ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s D + - script: ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s D Run.H: timeout: 0 resources: - repo-checker3 tasks: - - script: python3 ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s H + - script: ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s H Run.S: timeout: 0 resources: - repo-checker3 tasks: - - script: python3 ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s S + - script: ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s S Run.V: timeout: 0 resources: - repo-checker3 tasks: - - script: python3 ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s V + - script: ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s V Run.Y: timeout: 0 resources: - repo-checker3 tasks: - - script: python3 ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s Y + - script: ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s Y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/gocd/checkers.suse.gocd.yaml.erb new/openSUSE-release-tools-20190516.fab9b27f/gocd/checkers.suse.gocd.yaml.erb --- old/openSUSE-release-tools-20190515.5a1b08d8/gocd/checkers.suse.gocd.yaml.erb 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/gocd/checkers.suse.gocd.yaml.erb 2019-05-16 17:55:03.000000000 +0200 @@ -20,7 +20,7 @@ resources: - staging-bot3 tasks: - - script: python3 ./check_tags_in_requests.py -A https://api.suse.de --verbose --user=sle-changelog-checker --review=accept-onpass --factory=openSUSE.org:openSUSE:Factory review + - script: ./check_tags_in_requests.py -A https://api.suse.de --verbose --user=sle-changelog-checker --review=accept-onpass --factory=openSUSE.org:openSUSE:Factory review SLE.Project.Only: group: SLE.Checkers lock_behavior: unlockWhenFinished @@ -39,15 +39,15 @@ SLE_15_SP1: timeout: 0 resources: - - repo-checker + - repo-checker3 tasks: - - script: /usr/bin/osrt-repo_checker -A https://api.suse.de --debug project_only --post-comments SUSE:SLE-15-SP1:GA + - script: ./repo_checker.py -A https://api.suse.de --debug project_only --post-comments SUSE:SLE-15-SP1:GA SLE_12_SP5: timeout: 0 resources: - - repo-checker + - repo-checker3 tasks: - - script: /usr/bin/osrt-repo_checker -A https://api.suse.de --debug project_only --post-comments SUSE:SLE-12-SP5:GA + - script: ./repo_checker.py -A https://api.suse.de --debug project_only --post-comments SUSE:SLE-12-SP5:GA SLE-SP1.Manager42: group: SLE.Checkers lock_behavior: unlockWhenFinished @@ -85,9 +85,9 @@ Run: timeout: 0 resources: - - repo-checker + - repo-checker3 tasks: - - script: /usr/bin/osrt-repo_checker -A https://api.suse.de --debug review + - script: ./repo_checker.py -A https://api.suse.de --debug review SLE.Leaper: group: SLE.Checkers lock_behavior: unlockWhenFinished @@ -107,7 +107,7 @@ resources: - leaper tasks: - - script: python3 /usr/bin/osrt-leaper -A https://api.suse.de --group=leaper --user=leaper --verbose --manual-version-updates --manual-maintenance-updates review + - script: ./leaper.py -A https://api.suse.de --group=leaper --user=leaper --verbose --manual-version-updates --manual-maintenance-updates review SLE.Staging.Bot.Regular: group: SLE.Checkers lock_behavior: unlockWhenFinished @@ -152,9 +152,9 @@ Run: timeout: 0 resources: - - staging-bot + - staging-bot3 tasks: - - script: /usr/bin/osrt-staging-report --debug -A https://api.suse.de -p SUSE:SLE-15-SP1:GA + - script: ./staging-report.py --debug -A https://api.suse.de -p SUSE:SLE-15-SP1:GA SLE.Check.Dups: group: SLE.Checkers lock_behavior: unlockWhenFinished @@ -173,7 +173,7 @@ Run: timeout: 0 resources: - - staging-bot + - staging-bot3 tasks: - script: /usr/bin/osc -A https://api.suse.de check_dups SUSE:SLE-15-SP1:GA SLE.Source.Check: @@ -194,9 +194,9 @@ Run: timeout: 0 resources: - - staging-bot + - staging-bot3 tasks: - - script: /usr/bin/osrt-check_source -A https://api.suse.de --verbose --skip-add-reviews --group factory-auto review + - script: ./check_source.py -A https://api.suse.de --verbose --skip-add-reviews --group factory-auto review SLE12.SP5.InstallCheck: group: SLE.Checkers lock_behavior: unlockWhenFinished @@ -218,5 +218,5 @@ resources: - repo-checker3 tasks: - - script: python3 ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s <%= letter %> + - script: ./staging-installcheck.py -d -p SUSE:SLE-12-SP5:GA -A https://api.suse.de -s <%= letter %> <% end %> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/gocd/container-cleaner.gocd.yaml new/openSUSE-release-tools-20190516.fab9b27f/gocd/container-cleaner.gocd.yaml --- old/openSUSE-release-tools-20190515.5a1b08d8/gocd/container-cleaner.gocd.yaml 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/gocd/container-cleaner.gocd.yaml 2019-05-16 17:55:03.000000000 +0200 @@ -17,7 +17,7 @@ - Run: approval: manual resources: - - staging-bot + - staging-bot3 tasks: - script: |- scripts/container_cleaner.py --verbose run openSUSE:Containers:Tumbleweed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/gocd/monitors.gocd.yaml new/openSUSE-release-tools-20190516.fab9b27f/gocd/monitors.gocd.yaml --- old/openSUSE-release-tools-20190515.5a1b08d8/gocd/monitors.gocd.yaml 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/gocd/monitors.gocd.yaml 2019-05-16 17:55:03.000000000 +0200 @@ -20,7 +20,7 @@ Run: timeout: 0 resources: - - staging-bot + - staging-bot3 tasks: - script: |- export PYTHONPATH=$PWD/scripts @@ -45,7 +45,7 @@ Run: timeout: 0 resources: - - staging-bot + - staging-bot3 tasks: # endless loop - script: |- @@ -63,10 +63,6 @@ git: https://github.com/openSUSE/openSUSE-release-tools.git branch: master destination: scripts - osc: - git: https://github.com/openSUSE/osc.git - branch: python3 - destination: osc stages: - Run: approval: @@ -75,16 +71,16 @@ Run: timeout: 0 resources: - - staging-bot + - staging-bot3 tasks: # endless loop - script: |- - export PYTHONPATH=$PWD/osc:$PWD/scripts + export PYTHONPATH=$PWD/scripts git config --global user.email "coolo@suse.de" git config --global user.name "GoCD Repo Monitor" git clone git://botmaster.suse.de/suse-repos.git cd suse-repos - python3 ../scripts/gocd/rabbit-repoid.py -A https://api.suse.de SUSE:SLE-15-SP1:GA + ../scripts/gocd/rabbit-repoid.py -A https://api.suse.de SUSE:SLE-15-SP1:GA openSUSE.Repo.Monitor: group: Monitors lock_behavior: unlockWhenFinished @@ -97,10 +93,6 @@ git: https://github.com/openSUSE/openSUSE-release-tools.git branch: master destination: scripts - osc: - git: https://github.com/openSUSE/osc.git - branch: python3 - destination: osc stages: - Run: approval: @@ -109,13 +101,13 @@ Run: timeout: 0 resources: - - staging-bot + - staging-bot3 tasks: # endless loop - script: |- - export PYTHONPATH=$PWD/osc:$PWD/scripts + export PYTHONPATH=$PWD/scripts git config --global user.email "coolo@suse.de" git config --global user.name "GoCD Repo Monitor" git clone git://botmaster.suse.de/opensuse-repos.git cd opensuse-repos - python3 ../scripts/gocd/rabbit-repoid.py -A https://api.opensuse.org openSUSE:Factory openSUSE:Leap + ../scripts/gocd/rabbit-repoid.py -A https://api.opensuse.org openSUSE:Factory openSUSE:Leap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/gocd/rabbit-openqa.py new/openSUSE-release-tools-20190516.fab9b27f/gocd/rabbit-openqa.py --- old/openSUSE-release-tools-20190515.5a1b08d8/gocd/rabbit-openqa.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/gocd/rabbit-openqa.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 import argparse import logging @@ -15,18 +15,12 @@ from lxml import etree as ET from openqa_client.client import OpenQA_Client from openqa_client.exceptions import ConnectionError -try: - from urllib.error import HTTPError, URLError - from urllib.parse import quote_plus -except ImportError: - # python 2.x - from urllib2 import HTTPError, URLError - from urllib import quote_plus +from urllib.error import HTTPError, URLError +from urllib.parse import quote_plus import requests from PubSubConsumer import PubSubConsumer - class Project(object): def __init__(self, name): self.name = name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/gocd/rabbit-repoid.py new/openSUSE-release-tools-20190516.fab9b27f/gocd/rabbit-repoid.py --- old/openSUSE-release-tools-20190515.5a1b08d8/gocd/rabbit-repoid.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/gocd/rabbit-repoid.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,4 +1,4 @@ -#! /usr/bin/python +#!/usr/bin/python3 from __future__ import print_function @@ -16,12 +16,7 @@ from osclib.core import target_archs from lxml import etree as ET -try: - from urllib.error import HTTPError -except ImportError: - # python 2.x - from urllib2 import HTTPError - +from urllib.error import HTTPError from PubSubConsumer import PubSubConsumer class Listener(PubSubConsumer): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/gocd/totestmanager.gocd.yaml new/openSUSE-release-tools-20190516.fab9b27f/gocd/totestmanager.gocd.yaml --- old/openSUSE-release-tools-20190515.5a1b08d8/gocd/totestmanager.gocd.yaml 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/gocd/totestmanager.gocd.yaml 2019-05-16 17:55:03.000000000 +0200 @@ -16,7 +16,7 @@ - Run: approval: manual resources: - - staging-bot + - staging-bot3 tasks: - script: |- install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf @@ -37,7 +37,7 @@ - Run: approval: manual resources: - - staging-bot + - staging-bot3 tasks: - script: |- install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf @@ -58,7 +58,7 @@ - Run: approval: manual resources: - - staging-bot + - staging-bot3 tasks: - script: |- install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf @@ -79,7 +79,7 @@ - Run: approval: manual resources: - - staging-bot + - staging-bot3 tasks: - script: |- install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf @@ -100,7 +100,7 @@ - Run: approval: manual resources: - - staging-bot + - staging-bot3 tasks: - script: |- install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf @@ -121,7 +121,7 @@ - Run: approval: manual resources: - - staging-bot + - staging-bot3 tasks: - script: |- install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf @@ -142,7 +142,7 @@ - Run: approval: manual resources: - - staging-bot + - staging-bot3 tasks: - script: |- install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf @@ -163,7 +163,7 @@ - Run: approval: manual resources: - - staging-bot + - staging-bot3 tasks: - script: |- install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf @@ -184,7 +184,7 @@ - Run: approval: manual resources: - - staging-bot + - staging-bot3 tasks: - script: |- install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf @@ -205,7 +205,7 @@ - Run: approval: manual resources: - - staging-bot + - staging-bot3 tasks: - script: |- install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/gocd/totestmanager.gocd.yaml.erb new/openSUSE-release-tools-20190516.fab9b27f/gocd/totestmanager.gocd.yaml.erb --- old/openSUSE-release-tools-20190515.5a1b08d8/gocd/totestmanager.gocd.yaml.erb 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/gocd/totestmanager.gocd.yaml.erb 2019-05-16 17:55:03.000000000 +0200 @@ -19,7 +19,7 @@ - Run: approval: manual resources: - - staging-bot + - staging-bot3 tasks: - script: |- install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/issue-diff.py new/openSUSE-release-tools-20190516.fab9b27f/issue-diff.py --- old/openSUSE-release-tools-20190515.5a1b08d8/issue-diff.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/issue-diff.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,6 +1,4 @@ -#!/usr/bin/python - -from __future__ import print_function +#!/usr/bin/python3 import argparse import bugzilla @@ -26,12 +24,6 @@ from osclib.git import CACHE_DIR from osclib.git import sync -try: - import __builtin__ - input = getattr(__builtin__, 'raw_input') -except (ImportError, AttributeError): - pass - # Issue summary can contain unicode characters and therefore a string containing # either summary or one in which ISSUE_SUMMARY is then placed must be unicode. # For example, translation-update-upstream contains bsc#877707 which has a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/k8s-secret.py new/openSUSE-release-tools-20190516.fab9b27f/k8s-secret.py --- old/openSUSE-release-tools-20190515.5a1b08d8/k8s-secret.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/k8s-secret.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,18 +1,11 @@ -#!/usr/bin/python +#!/usr/bin/python3 -from __future__ import print_function import argparse import os from osclib.cache_manager import CacheManager import subprocess import sys -try: - import __builtin__ - input = getattr(__builtin__, 'raw_input') -except (ImportError, AttributeError): - pass - CACHE_DIR = CacheManager.directory('k8s-secret') SCRIPT_PATH = os.path.dirname(os.path.realpath(__file__)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/leaper.py new/openSUSE-release-tools-20190516.fab9b27f/leaper.py --- old/openSUSE-release-tools-20190515.5a1b08d8/leaper.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/leaper.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 from pprint import pprint import os @@ -17,11 +17,7 @@ from osclib.conf import Config from osclib.core import devel_project_get -try: - from urllib.error import HTTPError -except ImportError: - # python 2.x - from urllib2 import HTTPError +from urllib.error import HTTPError import yaml import ReviewBot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/manager_42.py new/openSUSE-release-tools-20190516.fab9b27f/manager_42.py --- old/openSUSE-release-tools-20190515.5a1b08d8/manager_42.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/manager_42.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 import argparse from dateutil.parser import parse as date_parse @@ -13,11 +13,7 @@ from osc.core import get_commitlog from osc.core import get_request_list -try: - from urllib.error import HTTPError -except ImportError: - # python 2.x - from urllib2 import HTTPError +from urllib.error import HTTPError import subprocess import time diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/origin-manager.py new/openSUSE-release-tools-20190516.fab9b27f/origin-manager.py --- old/openSUSE-release-tools-20190515.5a1b08d8/origin-manager.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/origin-manager.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 from osclib.core import package_source_hash from osclib.origin import origin_annotation_dump diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/osc-origin.py new/openSUSE-release-tools-20190516.fab9b27f/osc-origin.py --- old/openSUSE-release-tools-20190515.5a1b08d8/osc-origin.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/osc-origin.py 2019-05-16 17:55:03.000000000 +0200 @@ -10,7 +10,7 @@ from osc.core import get_request_list from osclib.cache import Cache from osclib.cache_manager import CacheManager -from osclib.core import package_list_without_links +from osclib.core import package_list_kind_filtered from osclib.core import project_attribute_list from osclib.origin import config_load from osclib.origin import config_origin_list @@ -131,7 +131,7 @@ with open(lookup_path, 'r') as lookup_stream: lookup = yaml.safe_load(lookup_stream) - if not isinstance(lookup.itervalues().next(), dict): + if not isinstance(next(iter(lookup.values())), dict): # Convert flat format to dictionary. for package, origin in lookup.items(): lookup[package] = {'origin': origin} @@ -139,8 +139,7 @@ if previous: return None - packages = package_list_without_links(apiurl, project) - logging.debug('{} packages found in {}'.format(len(packages), project)) + packages = package_list_kind_filtered(apiurl, project) lookup = {} for package in packages: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/osclib/core.py new/openSUSE-release-tools-20190516.fab9b27f/osclib/core.py --- old/openSUSE-release-tools-20190515.5a1b08d8/osclib/core.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/osclib/core.py 2019-05-16 17:55:03.000000000 +0200 @@ -301,18 +301,27 @@ project_pseudometa_file_save(apiurl, project, filename, content, comment) # Should be an API call that says give me "real" packages that does not include -# multibuild entries nor linked packages. -def package_list_without_links(apiurl, project): +# multibuild entries, nor linked packages, nor maintenance update packages, but +# does included inherited packages from project layering. Unfortunately, no such +# call provides either server-side filtering nor enough information to filter +# client-side. As such extra calls must be made for each package to handle the +# various different cases that can exist between products. For a more detailed +# write-up see the opensuse-buildservice mailing list thread: +# https://lists.opensuse.org/opensuse-buildservice/2019-05/msg00020.html. +def package_list_kind_filtered(apiurl, project, kinds_allowed=['source']): query = { 'view': 'info', 'nofilename': '1', } url = makeurl(apiurl, ['source', project], query) root = ETL.parse(http_GET(url)).getroot() - return root.xpath( - '//sourceinfo[not(./linked[@project="{}"]) and ' - 'not(contains(@package, ":"))' - 'and not(starts-with(@package, "00"))]/@package'.format(project)) + + for package in root.xpath('sourceinfo/@package'): + kind = package_kind(apiurl, project, package) + if kind not in kinds_allowed: + continue + + yield package def attribute_value_load(apiurl, project, name, namespace='OSRT'): url = makeurl(apiurl, ['source', project, '_attribute', namespace + ':' + name]) @@ -481,6 +490,42 @@ return True +def package_kind(apiurl, project, package): + if package.startswith('00'): + return 'meta' + + if ':' in package: + return 'multibuild_subpackage' + + if package.startswith('patchinfo.'): + return 'patchinfo' + + try: + url = makeurl(apiurl, ['source', project, package, '_meta']) + root = ETL.parse(http_GET(url)).getroot() + except HTTPError as e: + if e.code == 404: + return None + + raise e + + if root.find('releasename') is not None: + return 'maintenance_update' + + if root.find('bcntsynctag') is not None: + return 'multispec_subpackage' + + # Some multispec subpackages do not have bcntsynctag, so check link. + link = entity_source_link(apiurl, project, package) + if link is not None and link.get('cicount') == 'copy': + kind_target = package_kind(apiurl, project, link.get('package')) + if kind_target != 'maintenance_update': + # If a multispec subpackage was updated via a maintenance update the + # proper link information is lost and it will be considered source. + return 'multispec_subpackage' + + return 'source' + def entity_source_link(apiurl, project, package=None): try: if package: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/osclib/origin.py new/openSUSE-release-tools-20190516.fab9b27f/osclib/origin.py --- old/openSUSE-release-tools-20190515.5a1b08d8/osclib/origin.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/osclib/origin.py 2019-05-16 17:55:03.000000000 +0200 @@ -86,7 +86,7 @@ origins = config['origins'] i = 0 while i < len(origins): - origin = origins[i].keys()[0] + origin = next(iter(origins[i])) values = origins[i][origin] if origin == '*': @@ -354,9 +354,9 @@ def policy_get_preprocess(apiurl, origin, policy): project = origin.rstrip('~') config_project = Config.get(apiurl, project) - policy['pending_submission_allowed_reviews'] = filter(None, [ + policy['pending_submission_allowed_reviews'] = list(filter(None, [ config_resolve_variable(v, config_project, 'config_source') - for v in policy['pending_submission_allowed_reviews']]) + for v in policy['pending_submission_allowed_reviews']])) return policy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/osclib/util.py new/openSUSE-release-tools-20190516.fab9b27f/osclib/util.py --- old/openSUSE-release-tools-20190515.5a1b08d8/osclib/util.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/osclib/util.py 2019-05-16 17:55:03.000000000 +0200 @@ -159,4 +159,7 @@ if isinstance(data, list): data = '::'.join(data) + if isinstance(data, str): + data = data.encode('utf-8') + return hashlib.sha1(data).hexdigest()[:7] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/pkglistgen/group.py new/openSUSE-release-tools-20190516.fab9b27f/pkglistgen/group.py --- old/openSUSE-release-tools-20190515.5a1b08d8/pkglistgen/group.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/pkglistgen/group.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,5 +1,3 @@ -from __future__ import print_function - import logging import re import time @@ -287,7 +285,7 @@ else: src = s.lookup_str(solv.SOLVABLE_SOURCENAME) - if src in list(self.srcpkgs): + if src in self.srcpkgs: self.develpkgs[s.name] = self.srcpkgs[src] def _filter_already_selected(self, modules, pkgdict): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/pkglistgen/tool.py new/openSUSE-release-tools-20190516.fab9b27f/pkglistgen/tool.py --- old/openSUSE-release-tools-20190515.5a1b08d8/pkglistgen/tool.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/pkglistgen/tool.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,5 +1,3 @@ -from __future__ import print_function - import ToolBase import glob import logging @@ -28,11 +26,7 @@ from osclib.core import repository_arch_state from osclib.cache_manager import CacheManager -try: - from urllib.parse import urlparse -except ImportError: - # python 2.x - from urlparse import urlparse +from urllib.parse import urlparse from pkglistgen import file_utils from pkglistgen.group import Group @@ -69,7 +63,7 @@ self.all_architectures = None def filter_architectures(self, architectures): - self.filtered_architectures = list(set(architectures) & set(self.all_architectures)) + self.filtered_architectures = sorted(list(set(architectures) & set(self.all_architectures))) def _load_supportstatus(self): # XXX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/repo_checker.py new/openSUSE-release-tools-20190516.fab9b27f/repo_checker.py --- old/openSUSE-release-tools-20190515.5a1b08d8/repo_checker.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/repo_checker.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,6 +1,4 @@ -#!/usr/bin/python - -from __future__ import print_function +#!/usr/bin/python3 import cmdln from collections import namedtuple @@ -221,10 +219,10 @@ # Format output as markdown comment. parts = [] - stdout = stdout.strip() + stdout = stdout.strip().decode('utf-8') if stdout: parts.append('<pre>\n' + stdout + '\n' + '</pre>\n') - stderr = stderr.strip() + stderr = stderr.strip().decode('utf-8') if stderr: parts.append('<pre>\n' + stderr + '\n' + '</pre>\n') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/staging-report.py new/openSUSE-release-tools-20190516.fab9b27f/staging-report.py --- old/openSUSE-release-tools-20190515.5a1b08d8/staging-report.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/staging-report.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,6 +1,4 @@ -#!/usr/bin/python - -from __future__ import print_function +#!/usr/bin/python3 import argparse from datetime import datetime, timedelta diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/totest-manager.py new/openSUSE-release-tools-20190516.fab9b27f/totest-manager.py --- old/openSUSE-release-tools-20190515.5a1b08d8/totest-manager.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/totest-manager.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 from ttm.cli import CommandLineInterface diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/ttm/cli.py new/openSUSE-release-tools-20190516.fab9b27f/ttm/cli.py --- old/openSUSE-release-tools-20190515.5a1b08d8/ttm/cli.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/ttm/cli.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,4 +1,3 @@ -#!/usr/bin/python2 # -*- coding: utf-8 -*- # # (C) 2014 mhrusecky@suse.cz, openSUSE.org @@ -9,8 +8,6 @@ # (C) 2018 dheidler@suse.de, openSUSE.org # Distribute under GPLv2 or GPLv3 -from __future__ import print_function - import logging import ToolBase import cmdln diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/ttm/manager.py new/openSUSE-release-tools-20190516.fab9b27f/ttm/manager.py --- old/openSUSE-release-tools-20190515.5a1b08d8/ttm/manager.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/ttm/manager.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: utf-8 -*- # # (C) 2014 mhrusecky@suse.cz, openSUSE.org @@ -9,8 +8,6 @@ # (C) 2018 dheidler@suse.de, openSUSE.org # Distribute under GPLv2 or GPLv3 -from __future__ import print_function - import ToolBase import logging import re @@ -18,12 +15,7 @@ from enum import IntEnum from xml.etree import cElementTree as ET from osclib.stagingapi import StagingAPI -try: - from urllib.error import HTTPError -except ImportError: - # python 2.x - from urllib2 import HTTPError - +from urllib.error import HTTPError from ttm.totest import ToTest class NotFoundException(Exception): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/ttm/publisher.py new/openSUSE-release-tools-20190516.fab9b27f/ttm/publisher.py --- old/openSUSE-release-tools-20190515.5a1b08d8/ttm/publisher.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/ttm/publisher.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: utf-8 -*- # # (C) 2014 mhrusecky@suse.cz, openSUSE.org diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/ttm/releaser.py new/openSUSE-release-tools-20190516.fab9b27f/ttm/releaser.py --- old/openSUSE-release-tools-20190515.5a1b08d8/ttm/releaser.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/ttm/releaser.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: utf-8 -*- # # (C) 2014 mhrusecky@suse.cz, openSUSE.org @@ -9,8 +8,6 @@ # (C) 2018 dheidler@suse.de, openSUSE.org # Distribute under GPLv2 or GPLv3 -from __future__ import print_function - import re from xml.etree import cElementTree as ET diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190515.5a1b08d8/ttm/totest.py new/openSUSE-release-tools-20190516.fab9b27f/ttm/totest.py --- old/openSUSE-release-tools-20190515.5a1b08d8/ttm/totest.py 2019-05-15 13:47:32.000000000 +0200 +++ new/openSUSE-release-tools-20190516.fab9b27f/ttm/totest.py 2019-05-16 17:55:03.000000000 +0200 @@ -1,4 +1,3 @@ -#!/usr/bin/python2 # -*- coding: utf-8 -*- # # (C) 2014 mhrusecky@suse.cz, openSUSE.org @@ -9,7 +8,6 @@ # (C) 2018 dheidler@suse.de, openSUSE.org # Distribute under GPLv2 or GPLv3 -from __future__ import print_function import yaml from osclib.core import attribute_value_load ++++++ openSUSE-release-tools.obsinfo ++++++ --- /var/tmp/diff_new_pack.WAv80I/_old 2019-05-17 23:44:16.109876390 +0200 +++ /var/tmp/diff_new_pack.WAv80I/_new 2019-05-17 23:44:16.109876390 +0200 @@ -1,5 +1,5 @@ name: openSUSE-release-tools -version: 20190515.5a1b08d8 -mtime: 1557920852 -commit: 5a1b08d81bf4a42d4413e340d555a3fee25cf811 +version: 20190516.fab9b27f +mtime: 1558022103 +commit: fab9b27fa8bd08f3176f6244a5272fd01e12e1b1
participants (1)
-
root