| Message ID | 20180221221342.15683-3-thomas.petazzoni@bootlin.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | New pkg-stats script, with version information | expand |
Hello, On Wed, Feb 21, 2018 at 07:13 PM, Thomas Petazzoni wrote: > This commit adds the following options to the pkg-stats-new script: > > -n, to specify a number of packages to parse instead of all packages > > -p, to specify a list of packages (comma-separated) to parse instead > of all packages > > These options are basically only useful when debugging/developping typo: developing > this script, but they are very useful, because the script is rather > slow to run completely with all 2000+ packages, especially once > upstream versions will be fetched from release-monitoring.org. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> With the typo fixed and regardless your decision about the help below: Reviewed-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> [snip] > @@ -452,13 +462,24 @@ def parse_args(): > parser = argparse.ArgumentParser() > parser.add_argument('-o', dest='output', action='store', required=True, > help='HTML output file') > + parser.add_argument('-n', dest='npackages', type=int, action='store', > + help='Number of packages') > + parser.add_argument('-p', dest='packages', action='store', > + help='List of packages') Should the help also mention the option expects a comma-separated list? Regards, Ricardo
Hello, On Sat, 24 Feb 2018 01:54:27 -0300, Ricardo Martincoski wrote: > Hello, > > On Wed, Feb 21, 2018 at 07:13 PM, Thomas Petazzoni wrote: > > > This commit adds the following options to the pkg-stats-new script: > > > > -n, to specify a number of packages to parse instead of all packages > > > > -p, to specify a list of packages (comma-separated) to parse instead > > of all packages > > > > These options are basically only useful when debugging/developping > > typo: developing Fixed. > > > this script, but they are very useful, because the script is rather > > slow to run completely with all 2000+ packages, especially once > > upstream versions will be fetched from release-monitoring.org. > > > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> > > With the typo fixed and regardless your decision about the help below: > Reviewed-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> Thanks! > > + parser.add_argument('-n', dest='npackages', type=int, action='store', > > + help='Number of packages') > > + parser.add_argument('-p', dest='packages', action='store', > > + help='List of packages') > > Should the help also mention the option expects a comma-separated list? Absolutely, fixed in v3! Thomas
diff --git a/support/scripts/pkg-stats-new b/support/scripts/pkg-stats-new index 8c74ff2a37..85a6caeeb9 100755 --- a/support/scripts/pkg-stats-new +++ b/support/scripts/pkg-stats-new @@ -23,6 +23,7 @@ import os from collections import defaultdict import re import subprocess +import sys class Package: @@ -47,11 +48,14 @@ class Package: (self.name, self.path, self.has_license, self.has_license_files, self.has_hash, self.patch_count) -def get_pkglist(): +def get_pkglist(npackages, package_list): """ Builds the list of Buildroot packages, returning a list of Package objects. Only the .name and .path fields of the Package object are initialized. + + npackages: limit to N packages + package_list: limit to those packages in this list """ WALK_USEFUL_SUBDIRS = ["boot", "linux", "package", "toolchain"] WALK_EXCLUDES = ["boot/common.mk", @@ -74,6 +78,7 @@ def get_pkglist(): "toolchain/helpers.mk", "toolchain/toolchain-wrapper.mk"] packages = list() + count = 0 for root, dirs, files in os.walk("."): rootdir = root.split("/") if len(rootdir) < 2: @@ -85,6 +90,8 @@ def get_pkglist(): continue # Strip ending ".mk" pkgname = f[:-3] + if package_list and pkgname not in package_list: + continue pkgpath = os.path.join(root, f) skip = False for exclude in WALK_EXCLUDES: @@ -96,6 +103,9 @@ def get_pkglist(): continue p = Package(pkgname, pkgpath) packages.append(p) + count += 1 + if npackages and count == npackages: + return packages return packages @@ -452,13 +462,24 @@ def parse_args(): parser = argparse.ArgumentParser() parser.add_argument('-o', dest='output', action='store', required=True, help='HTML output file') + parser.add_argument('-n', dest='npackages', type=int, action='store', + help='Number of packages') + parser.add_argument('-p', dest='packages', action='store', + help='List of packages') return parser.parse_args() def __main__(): args = parse_args() + if args.npackages and args.packages: + print "ERROR: -n and -p are mutually exclusive" + sys.exit(1) + if args.packages: + package_list = args.packages.split(",") + else: + package_list = None print "Build package list ..." - packages = get_pkglist() + packages = get_pkglist(args.npackages, package_list) print "Get package infra ..." add_infra_info(packages) print "Get make info ..."
This commit adds the following options to the pkg-stats-new script: -n, to specify a number of packages to parse instead of all packages -p, to specify a list of packages (comma-separated) to parse instead of all packages These options are basically only useful when debugging/developping this script, but they are very useful, because the script is rather slow to run completely with all 2000+ packages, especially once upstream versions will be fetched from release-monitoring.org. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> --- Changes since v1: - Fix flake8 warnings --- support/scripts/pkg-stats-new | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)