From 85dcf631dffff22e9532aa5c8e633fabe1da8b79 Mon Sep 17 00:00:00 2001 From: Chenxiong Qi Date: Jul 04 2018 14:03:56 +0000 Subject: [PATCH 1/4] Fix flake8 errors Signed-off-by: Chenxiong Qi --- diff --git a/pyrpkg/pkginfo.py b/pyrpkg/pkginfo.py index 1fd7ba2..6825538 100644 --- a/pyrpkg/pkginfo.py +++ b/pyrpkg/pkginfo.py @@ -154,8 +154,8 @@ class PackageMetadata(object): @property def ns_module_name(self): - logger.warning('Property ns_module_name is deprecated. Please use ' - 'ns_repo_name instead.') + logger.warning('Property ns_module_name is deprecated. ' + 'Please use ns_repo_name instead.') return self.ns_repo_name @property @@ -351,14 +351,14 @@ class PackageMetadata(object): @property def module_name(self): """This property ensures the module attribute""" - logger.warning('Property module_name is deprecated. Please use ' - 'repo_name instead.') + logger.warning('Property module_name is deprecated. ' + 'Please use repo_name instead.') return self.repo_name @module_name.setter def module_name(self, module_name): - logger.warning('Property module_name is deprecated. Please use ' - 'repo_name instead.') + logger.warning('Property module_name is deprecated. ' + 'Please use repo_name instead.') self.repo_name = module_name def load_module_name(self): @@ -390,4 +390,3 @@ class PackageMetadata(object): raise rpkgError('Could not find current repository name.' ' Use --name and optional --namespace.') - From cbef376a1e2698e6188cf288f8b025cbe1ddf687 Mon Sep 17 00:00:00 2001 From: Chenxiong Qi Date: Jul 04 2018 14:04:39 +0000 Subject: [PATCH 2/4] Set custom target correctly Set custom target correctly and PackageMetadata.target returns right value according to the specified target. Signed-off-by: Chenxiong Qi --- diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py index 1448dbb..d54406b 100644 --- a/pyrpkg/__init__.py +++ b/pyrpkg/__init__.py @@ -150,6 +150,7 @@ class Commands(object): # package name will be sent to lookaside CGI script as 'namespace/name' # instead of just name. self.lookaside_namespaced = lookaside_namespaced + self._custom_target = target # Define properties here # Properties allow us to "lazy load" various attributes, which also means @@ -384,6 +385,7 @@ class Commands(object): if not hasattr(self, '_package'): self._package = PackageMetadata( self.repo, + overwrite_target=self._custom_target, distgit_namespaced=self.distgit_namespaced) return self._package diff --git a/tests/test_commands.py b/tests/test_commands.py index 9eb12fa..67d9b8f 100644 --- a/tests/test_commands.py +++ b/tests/test_commands.py @@ -580,3 +580,20 @@ class TestLint(CommandTestCase): srpm_path, bin_path, ], shell=True)]) + + +class TestSpecifyTarget(CommandTestCase): + """ + Test build target is correct with specified target rather than guessing + from release branch + """ + + def test_specifiy_custom_target_for_normal_package_build(self): + expected_target = 'new-release-candidate' + cmd = self.make_commands(target=expected_target) + self.assertEqual(expected_target, cmd.package.target) + + def test_specified_custom_target_for_container_build(self): + expected_target = 'container-candidate' + cmd = self.make_commands(target=expected_target) + self.assertEqual(expected_target, cmd.package.container_build_target) From 14e98f18656f8cf69979924e3f3fd6c1262abb55 Mon Sep 17 00:00:00 2001 From: Chenxiong Qi Date: Jul 04 2018 15:22:37 +0000 Subject: [PATCH 3/4] Re-order imports Signed-off-by: Chenxiong Qi --- diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py index d54406b..712cb9a 100644 --- a/pyrpkg/__init__.py +++ b/pyrpkg/__init__.py @@ -10,6 +10,7 @@ # the full text of the license. from __future__ import print_function + import cccolutils import errno import fnmatch @@ -17,6 +18,7 @@ import getpass import git import glob import io +import json import koji import logging import os @@ -24,25 +26,27 @@ import re import rpm import shutil import six +import subprocess import sys import tempfile -import subprocess -import json import time -from multiprocessing.dummy import Pool as ThreadPool +from multiprocessing.dummy import Pool as ThreadPool from six.moves import configparser from six.moves import urllib from six.moves.urllib.parse import urljoin + import requests -from pyrpkg.errors import HashtypeMixingError, rpkgError, rpkgAuthError, \ - UnknownTargetError from .gitignore import GitIgnore +from pyrpkg.errors import HashtypeMixingError +from pyrpkg.errors import rpkgAuthError +from pyrpkg.errors import rpkgError +from pyrpkg.errors import UnknownTargetError from pyrpkg.lookaside import CGILookasideCache -from pyrpkg.sources import SourcesFile from pyrpkg.pkginfo import PackageMetadata from pyrpkg.pkgrepo import PackageRepository +from pyrpkg.sources import SourcesFile from pyrpkg.utils import cached_property, log_result, find_me diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py index bb6d4eb..151dff4 100644 --- a/pyrpkg/cli.py +++ b/pyrpkg/cli.py @@ -13,19 +13,21 @@ # LGPLv2.1. See comments before those functions. from __future__ import print_function + import argparse import getpass import logging import os import random +import re import requests -from requests.auth import HTTPBasicAuth import string import sys import time -import re + # For `_ArgumentParser' from gettext import gettext as _ +from requests.auth import HTTPBasicAuth import koji_cli.lib import pyrpkg.utils as utils diff --git a/pyrpkg/man_gen.py b/pyrpkg/man_gen.py index 1bf4ee8..2a7b326 100644 --- a/pyrpkg/man_gen.py +++ b/pyrpkg/man_gen.py @@ -10,9 +10,9 @@ # the full text of the license. -import sys -import os import datetime +import os +import sys # We could substitute the "" in .TH with the rpkg version if we knew it From a73df4b522f24ba4af64052f3bde1a22d741434d Mon Sep 17 00:00:00 2001 From: Chenxiong Qi Date: Jul 04 2018 15:23:09 +0000 Subject: [PATCH 4/4] Suppress output of test names Signed-off-by: Chenxiong Qi --- diff --git a/setup.cfg b/setup.cfg index 02757bc..8ba9046 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,7 +5,6 @@ test = nosetests max-line-length = 100 [nosetests] -verbosity = 2 detailed-errors = 1 with-coverage = 1 cover-package = pyrpkg