diff options
-rw-r--r-- | BSD | 4 | ||||
-rw-r--r-- | HACKING | 14 | ||||
-rw-r--r-- | NEWS | 5 | ||||
-rw-r--r-- | README.rst | 26 | ||||
-rwxr-xr-x | bin/pcheck | 2 | ||||
-rwxr-xr-x | bin/pcheck-replay-stream | 2 | ||||
-rwxr-xr-x | build_api_docs.sh | 4 | ||||
-rw-r--r-- | pkgcheck/__init__.py (renamed from pkgcore_checks/__init__.py) | 0 | ||||
-rw-r--r-- | pkgcheck/addons.py (renamed from pkgcore_checks/addons.py) | 2 | ||||
-rw-r--r-- | pkgcheck/base.py (renamed from pkgcore_checks/base.py) | 0 | ||||
-rw-r--r-- | pkgcheck/cleanup.py (renamed from pkgcore_checks/cleanup.py) | 2 | ||||
-rw-r--r-- | pkgcheck/codingstyle.py (renamed from pkgcore_checks/codingstyle.py) | 2 | ||||
-rw-r--r-- | pkgcheck/deprecated.py (renamed from pkgcore_checks/deprecated.py) | 2 | ||||
-rw-r--r-- | pkgcheck/dropped_keywords.py (renamed from pkgcore_checks/dropped_keywords.py) | 2 | ||||
-rw-r--r-- | pkgcheck/errors.py (renamed from pkgcore_checks/errors.py) | 0 | ||||
-rw-r--r-- | pkgcheck/feeds.py (renamed from pkgcore_checks/feeds.py) | 2 | ||||
-rw-r--r-- | pkgcheck/glsa_scan.py (renamed from pkgcore_checks/glsa_scan.py) | 2 | ||||
-rw-r--r-- | pkgcheck/imlate.py (renamed from pkgcore_checks/imlate.py) | 4 | ||||
-rw-r--r-- | pkgcheck/metadata_checks.py (renamed from pkgcore_checks/metadata_checks.py) | 2 | ||||
-rw-r--r-- | pkgcheck/metadata_xml.py (renamed from pkgcore_checks/metadata_xml.py) | 2 | ||||
-rw-r--r-- | pkgcheck/pcheck.py (renamed from pkgcore_checks/pcheck.py) | 6 | ||||
-rw-r--r-- | pkgcheck/pkgdir_checks.py (renamed from pkgcore_checks/pkgdir_checks.py) | 2 | ||||
-rw-r--r-- | pkgcheck/plugins/__init__.py (renamed from pkgcore_checks/plugins/__init__.py) | 2 | ||||
-rw-r--r-- | pkgcheck/plugins/core_checks.py (renamed from pkgcore_checks/plugins/core_checks.py) | 2 | ||||
-rw-r--r-- | pkgcheck/plugins/pcheck_config.py (renamed from pkgcore_checks/plugins/pcheck_config.py) | 6 | ||||
-rw-r--r-- | pkgcheck/plugins/pcheck_configurables.py (renamed from pkgcore_checks/plugins/pcheck_configurables.py) | 2 | ||||
-rw-r--r-- | pkgcheck/plugins/plugincache | 4 | ||||
-rw-r--r-- | pkgcheck/repo_metadata.py (renamed from pkgcore_checks/repo_metadata.py) | 2 | ||||
-rw-r--r-- | pkgcheck/report_stream.py (renamed from pkgcore_checks/report_stream.py) | 4 | ||||
-rw-r--r-- | pkgcheck/reporters.py (renamed from pkgcore_checks/reporters.py) | 4 | ||||
-rw-r--r-- | pkgcheck/stale_unstable.py (renamed from pkgcore_checks/stale_unstable.py) | 4 | ||||
-rw-r--r-- | pkgcheck/test/__init__.py (renamed from pkgcore_checks/test/__init__.py) | 0 | ||||
-rw-r--r-- | pkgcheck/test/misc.py (renamed from pkgcore_checks/test/misc.py) | 4 | ||||
-rw-r--r-- | pkgcheck/test/test_addons.py (renamed from pkgcore_checks/test/test_addons.py) | 4 | ||||
-rw-r--r-- | pkgcheck/test/test_base.py (renamed from pkgcore_checks/test/test_base.py) | 2 | ||||
-rw-r--r-- | pkgcheck/test/test_cleanup.py (renamed from pkgcore_checks/test/test_cleanup.py) | 4 | ||||
-rw-r--r-- | pkgcheck/test/test_codingstyle.py (renamed from pkgcore_checks/test/test_codingstyle.py) | 4 | ||||
-rw-r--r-- | pkgcheck/test/test_demandload_usage.py (renamed from pkgcore_checks/test/test_demandload_usage.py) | 2 | ||||
-rw-r--r-- | pkgcheck/test/test_deprecated.py (renamed from pkgcore_checks/test/test_deprecated.py) | 4 | ||||
-rw-r--r-- | pkgcheck/test/test_dropped_keywords.py (renamed from pkgcore_checks/test/test_dropped_keywords.py) | 4 | ||||
-rw-r--r-- | pkgcheck/test/test_glsa.py (renamed from pkgcore_checks/test/test_glsa.py) | 4 | ||||
-rw-r--r-- | pkgcheck/test/test_imlate.py (renamed from pkgcore_checks/test/test_imlate.py) | 4 | ||||
-rw-r--r-- | pkgcheck/test/test_metadata_checks.py (renamed from pkgcore_checks/test/test_metadata_checks.py) | 4 | ||||
-rw-r--r-- | pkgcheck/test/test_pcheck.py (renamed from pkgcore_checks/test/test_pcheck.py) | 2 | ||||
-rw-r--r-- | pkgcheck/test/test_stale_unstable.py (renamed from pkgcore_checks/test/test_stale_unstable.py) | 4 | ||||
-rw-r--r-- | pkgcheck/test/test_whitespace.py (renamed from pkgcore_checks/test/test_whitespace.py) | 4 | ||||
-rw-r--r-- | pkgcheck/unstable_only.py (renamed from pkgcore_checks/unstable_only.py) | 4 | ||||
-rw-r--r-- | pkgcheck/visibility.py (renamed from pkgcore_checks/visibility.py) | 2 | ||||
-rw-r--r-- | pkgcheck/whitespace.py (renamed from pkgcore_checks/whitespace.py) | 2 | ||||
-rw-r--r-- | setup.py | 14 |
50 files changed, 97 insertions, 92 deletions
@@ -1,4 +1,4 @@ -Copyright (c) 2008, pkgcore contributors. +Copyright (c) 2008, pkgcheck contributors All rights reserved. Redistribution and use in source and binary forms, with or without @@ -9,7 +9,7 @@ modification, are permitted provided that the following conditions are met: 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. Neither the name of the <ORGANIZATION> nor the names of its +3. Neither the name of pkgcheck nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -2,7 +2,7 @@ Architecture overview ======================= -If you want to add a check or frontend to pkgcore-checks you should +If you want to add a check or frontend to pkgcheck you should probably read this thing first. If you only want to add a check you should only read the first section ("For everyone"). After that is extra documentation on adding feed types and some of the internals. @@ -81,12 +81,12 @@ Checkers are picked up by using pkgcore's plugin mechanism. For writing a simple custom checker the easiest thing to do is putting the entire thing in a single file including the pkgcore_plugins registration dictionary. See core_checks.py for what such a dictionary -looks like. Then put it in a directory called pkgcore_checks/plugins/ -on your PYTHONPATH. So if you have a system-wide pkgcore-checks +looks like. Then put it in a directory called pkgcheck/plugins/ +on your PYTHONPATH. So if you have a system-wide pkgcheck installation you can put your own plugin in -~/lib/python/pkgcore_checks/plugins/mycheck.py and run +~/lib/python/pkgcheck/plugins/mycheck.py and run PYTHONPATH=$HOME/lib/python pcheck ... to use the check (without -having to install a local copy of pkgcore-checks and putting the check +having to install a local copy of pkgcheck and putting the check inside it). For those who need more feed types @@ -96,7 +96,7 @@ Transforms ---------- Usually the checks should run in a single "pipeline": looping over the -packages once uses various caches (not just inside pkgcore-checks but +packages once uses various caches (not just inside pkgcheck but also the os disk cache) more efficiently. This is accomplished by applying "transforms" to the package iterator which change the feed type. They are very similar to checks, but they do not yield the same @@ -149,7 +149,7 @@ plugin system. See core_checks.py. The single available feed is currently hardcoded. This will probably change in the future, but exactly how remains to be seen. -For pkgcore-checks internals hackers +For pkgcheck internals hackers ==================================== Commandline frontend @@ -1,5 +1,6 @@ -pkgcore-checks Release Notes -============================ +============= +Release Notes +============= See ChangeLog for full commit logs; this is summarized and major changes. @@ -1,14 +1,14 @@ |test| -============== -pkgcore-checks -============== +======== +pkgcheck +======== Dependencies ============ -pkgcore-checks is developed alongside pkgcore. To run the development version -of pkgcore-checks you will need the development version of pkgcore. Otherwise +pkgcheck is developed alongside pkgcore. To run the development version +of pkgcheck you will need the development version of pkgcore. Otherwise the 0.x version numbers need to match. The metadata.xml checks require either xmllint (installed as part of @@ -20,7 +20,7 @@ Installation No installation is strictly required: just run the ``pcheck`` script and as long as you are not root things should work. If you want to make -pkgcore-checks available system-wide use the provided ``setup.py`` +pkgcheck available system-wide use the provided ``setup.py`` (see `Installing python modules`_ for details). Configuration @@ -46,7 +46,7 @@ it is used. So with the following suite definition in ``~/.pkgcore.conf``:: [pcheck-portdir-suite] - class=pkgcore_checks.base.Suite + class=pkgcheck.base.Suite target_repo=portdir you can run ``pcheck`` with no further arguments inside your portage @@ -55,7 +55,7 @@ directory and it will do the right thing. For use with overlays you need to define the "source" repo too:: [pcheck-overlay-suite] - class=pkgcore_checks.base.Suite + class=pkgcheck.base.Suite target_repo=/usr/local/portage/private src_repo=portdir @@ -67,7 +67,7 @@ See Overlays_ for more information on ``src_repo``. Finally, you can define a different checkset per suite:: [pcheck-portdir-suite] - class=pkgcore_checks.base.Suite + class=pkgcheck.base.Suite target_repo=portdir checkset=no-arch-checks @@ -88,11 +88,11 @@ checks and one running every available check except for the specified ones. Examples:: [no-arch-checks] - class=pkgcore_checks.base.Blacklist + class=pkgcheck.base.Blacklist patterns=unstable_only stale_unstable imlate [only-arch-checks] - class=pkgcore_checks.base.Whitelist + class=pkgcheck.base.Whitelist patterns=unstable_only stale_unstable imlate The first disables the three specified checks, the second enables only @@ -113,7 +113,7 @@ There are various ways to pick the checkset to use: ``pquery Overlays -------- -Checking just an overlay does not work very well since pkgcore-checks +Checking just an overlay does not work very well since pkgcheck needs to know about profiles and checks if all dependencies are available. To do this you will usually have to specify a base or "source" repo to pull this data from. You can set this with ``pcheck @@ -131,7 +131,7 @@ grep. To use an output format that prints everything on one line, put this in your configuration:: [pcheck-plain-reporter] - class=pkgcore_checks.reporters.plain_reporter + class=pkgcheck.reporters.plain_reporter default=true To use a non-default reporter use ``pcheck --reporter``. To see the @@ -6,7 +6,7 @@ from pkgcore.util import commandline -from pkgcore_checks import pcheck +from pkgcheck import pcheck if __name__ == '__main__': diff --git a/bin/pcheck-replay-stream b/bin/pcheck-replay-stream index a119b8f3..6f65d2d0 100755 --- a/bin/pcheck-replay-stream +++ b/bin/pcheck-replay-stream @@ -6,7 +6,7 @@ from pkgcore.util import commandline -from pkgcore_checks import report_stream +from pkgcheck import report_stream if __name__ == '__main__': diff --git a/build_api_docs.sh b/build_api_docs.sh index a998c71e..c7546131 100755 --- a/build_api_docs.sh +++ b/build_api_docs.sh @@ -10,6 +10,6 @@ if [ "$1" != "html" ] && [ "$1" != "pdf" ]; then fi export SNAKEOIL_DEMANDLOAD_PROTECTION=n -epydoc --${1} --no-frames --no-frames --graph=all -n pkgcore_checks -u \ +epydoc --${1} --no-frames --no-frames --graph=all -n pkgcheck -u \ http://pkgcore.org/trac/pkgcore-checks --show-imports --include-log \ - --inheritance=included --quiet --simple-term -o "$2" pkgcore_checks + --inheritance=included --quiet --simple-term -o "$2" pkgcheck diff --git a/pkgcore_checks/__init__.py b/pkgcheck/__init__.py index 1d398e37..1d398e37 100644 --- a/pkgcore_checks/__init__.py +++ b/pkgcheck/__init__.py diff --git a/pkgcore_checks/addons.py b/pkgcheck/addons.py index b50f09bb..c9d23f7f 100644 --- a/pkgcore_checks/addons.py +++ b/pkgcheck/addons.py @@ -15,7 +15,7 @@ from snakeoil.lists import iflatten_instance from snakeoil.mappings import OrderedDict from snakeoil.osutils import abspath, listdir_files, pjoin -from pkgcore_checks import base +from pkgcheck import base demandload( 'os', diff --git a/pkgcore_checks/base.py b/pkgcheck/base.py index 1bec5418..1bec5418 100644 --- a/pkgcore_checks/base.py +++ b/pkgcheck/base.py diff --git a/pkgcore_checks/cleanup.py b/pkgcheck/cleanup.py index b3f9a60f..04d2fafb 100644 --- a/pkgcore_checks/cleanup.py +++ b/pkgcheck/cleanup.py @@ -1,7 +1,7 @@ # Copyright: 2006 Brian Harring <ferringb@gmail.com> # License: BSD/GPL2 -from pkgcore_checks.base import Template, package_feed, Result, versioned_feed +from pkgcheck.base import Template, package_feed, Result, versioned_feed class RedundantVersionWarning(Result): diff --git a/pkgcore_checks/codingstyle.py b/pkgcheck/codingstyle.py index da467adf..a06ca0e7 100644 --- a/pkgcore_checks/codingstyle.py +++ b/pkgcheck/codingstyle.py @@ -5,7 +5,7 @@ from snakeoil.demandload import demandload -from pkgcore_checks import base +from pkgcheck import base demandload("re") diff --git a/pkgcore_checks/deprecated.py b/pkgcheck/deprecated.py index 5e5273bd..125553c6 100644 --- a/pkgcore_checks/deprecated.py +++ b/pkgcheck/deprecated.py @@ -3,7 +3,7 @@ from snakeoil.mappings import ImmutableDict -from pkgcore_checks.base import Template, versioned_feed, Result +from pkgcheck.base import Template, versioned_feed, Result class DeprecatedEAPI(Result): diff --git a/pkgcore_checks/dropped_keywords.py b/pkgcheck/dropped_keywords.py index 0b369f13..d5b93da8 100644 --- a/pkgcore_checks/dropped_keywords.py +++ b/pkgcheck/dropped_keywords.py @@ -3,7 +3,7 @@ from collections import defaultdict -from pkgcore_checks.base import Template, package_feed, versioned_feed, Result +from pkgcheck.base import Template, package_feed, versioned_feed, Result class DroppedKeywordWarning(Result): diff --git a/pkgcore_checks/errors.py b/pkgcheck/errors.py index 99e69d9b..99e69d9b 100644 --- a/pkgcore_checks/errors.py +++ b/pkgcheck/errors.py diff --git a/pkgcore_checks/feeds.py b/pkgcheck/feeds.py index 701b9767..478d8fa5 100644 --- a/pkgcore_checks/feeds.py +++ b/pkgcheck/feeds.py @@ -7,7 +7,7 @@ from operator import attrgetter from pkgcore.restrictions import util -from pkgcore_checks import base +from pkgcheck import base class VersionToEbuild(base.Transform): diff --git a/pkgcore_checks/glsa_scan.py b/pkgcheck/glsa_scan.py index 6c909cce..febaa171 100644 --- a/pkgcore_checks/glsa_scan.py +++ b/pkgcheck/glsa_scan.py @@ -6,7 +6,7 @@ import os from snakeoil.demandload import demandload -from pkgcore_checks import base +from pkgcheck import base demandload( 'pkgcore.pkgsets.glsa:GlsaDirSet', diff --git a/pkgcore_checks/imlate.py b/pkgcheck/imlate.py index 329b19c3..673a2dc7 100644 --- a/pkgcore_checks/imlate.py +++ b/pkgcheck/imlate.py @@ -3,8 +3,8 @@ from pkgcore.restrictions import packages, values -from pkgcore_checks.addons import ArchesAddon, StableCheckAddon -from pkgcore_checks.base import versioned_feed, package_feed, Result +from pkgcheck.addons import ArchesAddon, StableCheckAddon +from pkgcheck.base import versioned_feed, package_feed, Result class LaggingStableInfo(Result): diff --git a/pkgcore_checks/metadata_checks.py b/pkgcheck/metadata_checks.py index 4ecd7fdf..d50d7420 100644 --- a/pkgcore_checks/metadata_checks.py +++ b/pkgcheck/metadata_checks.py @@ -9,7 +9,7 @@ from pkgcore.fetch import fetchable from pkgcore.package.errors import MetadataException from snakeoil.demandload import demandload -from pkgcore_checks import base, addons +from pkgcheck import base, addons demandload('logging') diff --git a/pkgcore_checks/metadata_xml.py b/pkgcheck/metadata_xml.py index c45c3cbb..0ae740a0 100644 --- a/pkgcore_checks/metadata_xml.py +++ b/pkgcheck/metadata_xml.py @@ -6,7 +6,7 @@ import os from snakeoil import compatibility from snakeoil.demandload import demandload -from pkgcore_checks import base +from pkgcheck import base if compatibility.is_py3k: urllib_path = 'urllib.request:urlopen' diff --git a/pkgcore_checks/pcheck.py b/pkgcheck/pcheck.py index 85d15ab8..3ad3d39c 100644 --- a/pkgcore_checks/pcheck.py +++ b/pkgcheck/pcheck.py @@ -9,7 +9,7 @@ from pkgcore.plugin import get_plugins, get_plugin from snakeoil import lists from snakeoil.formatters import decorate_forced_wrapping -from pkgcore_checks import plugins, base, __version__, feeds +from pkgcheck import plugins, base, __version__, feeds from snakeoil.demandload import demandload demandload( @@ -22,7 +22,7 @@ demandload( 'pkgcore.restrictions.values:StrExactMatch', 'pkgcore.repository:multiplex', 'snakeoil.osutils:abspath', - 'pkgcore_checks:errors', + 'pkgcheck:errors', ) @@ -59,7 +59,7 @@ class OptionParser(commandline.OptionParser): def __init__(self, **kwargs): commandline.OptionParser.__init__( - self, version='pkgcore-checks %s' % (__version__,), + self, version='pkgcheck %s' % (__version__,), description="pkgcore based ebuild QA checks", usage="usage: %prog [options] [atom1...atom2]", **kwargs) diff --git a/pkgcore_checks/pkgdir_checks.py b/pkgcheck/pkgdir_checks.py index fe13438f..8c7bc090 100644 --- a/pkgcore_checks/pkgdir_checks.py +++ b/pkgcheck/pkgdir_checks.py @@ -9,7 +9,7 @@ import stat from snakeoil.demandload import demandload from snakeoil.osutils import listdir, pjoin -from pkgcore_checks.base import Result, Template, package_feed +from pkgcheck.base import Result, Template, package_feed demandload('errno') diff --git a/pkgcore_checks/plugins/__init__.py b/pkgcheck/plugins/__init__.py index 04fc31e6..ae43bed9 100644 --- a/pkgcore_checks/plugins/__init__.py +++ b/pkgcheck/plugins/__init__.py @@ -2,7 +2,7 @@ # License: BSD/GPL2 -"""pkgcore-checks plugins package.""" +"""pkgcheck plugins package.""" from pkgcore.plugins import extend_path diff --git a/pkgcore_checks/plugins/core_checks.py b/pkgcheck/plugins/core_checks.py index 967edb02..dcff66d2 100644 --- a/pkgcore_checks/plugins/core_checks.py +++ b/pkgcheck/plugins/core_checks.py @@ -5,7 +5,7 @@ """Default checks.""" # Please keep the imports and plugins sorted. -from pkgcore_checks import ( +from pkgcheck import ( cleanup, codingstyle, deprecated, dropped_keywords, feeds, glsa_scan, imlate, metadata_checks, metadata_xml, pkgdir_checks, repo_metadata, report_stream, reporters, stale_unstable, unstable_only, visibility, whitespace, diff --git a/pkgcore_checks/plugins/pcheck_config.py b/pkgcheck/plugins/pcheck_config.py index bafe4108..23695e2d 100644 --- a/pkgcore_checks/plugins/pcheck_config.py +++ b/pkgcheck/plugins/pcheck_config.py @@ -2,7 +2,7 @@ # License: BSD/GPL2 -"""Extra default config sections from pkgcore-checks.""" +"""Extra default config sections from pkgcheck.""" from pkgcore.config import basics @@ -11,11 +11,11 @@ from pkgcore.config import basics pkgcore_plugins = { 'global_config': [{ 'no-arch-checks': basics.ConfigSectionFromStringDict({ - 'class': 'pkgcore_checks.base.Blacklist', + 'class': 'pkgcheck.base.Blacklist', 'patterns': 'unstable_only stale_unstable imlate', }), 'all-checks': basics.ConfigSectionFromStringDict({ - 'class': 'pkgcore_checks.base.Blacklist', + 'class': 'pkgcheck.base.Blacklist', 'patterns': '', }), }], diff --git a/pkgcore_checks/plugins/pcheck_configurables.py b/pkgcheck/plugins/pcheck_configurables.py index 77c185f2..a9263034 100644 --- a/pkgcore_checks/plugins/pcheck_configurables.py +++ b/pkgcheck/plugins/pcheck_configurables.py @@ -2,7 +2,7 @@ # License: BSD/GPL2 -from pkgcore_checks import reporters, base +from pkgcheck import reporters, base pkgcore_plugins = { 'configurable': [ diff --git a/pkgcheck/plugins/plugincache b/pkgcheck/plugins/plugincache new file mode 100644 index 00000000..1f72ead2 --- /dev/null +++ b/pkgcheck/plugins/plugincache @@ -0,0 +1,4 @@ +pkgcore plugin cache v3 +core_checks:1426744357:transform,0,2:transform,0,4:transform,0,0:transform,0,1:transform,0,3:transform,0,6:transform,0,5:reporter,1,1:reporter,0,0:reporter,-1000,2:reporter,-1001,4:reporter,-1002,5:reporter,-10000000,3:check,0,9:check,0,16:check,0,11:check,0,23:check,0,14:check,0,13:check,0,0:check,0,7:check,0,19:check,0,10:check,0,22:check,0,21:check,0,12:check,0,3:check,0,6:check,0,18:check,0,5:check,0,24:check,0,17:check,0,8:check,0,20:check,0,15:check,0,2:check,0,1:check,0,4 +pcheck_config:1426744357:global_config,0,0 +pcheck_configurables:1426744357:configurable,0,4:configurable,0,1:configurable,0,5:configurable,0,2:configurable,0,6:configurable,0,3:configurable,0,0 diff --git a/pkgcore_checks/repo_metadata.py b/pkgcheck/repo_metadata.py index a4e1fb21..bff069d8 100644 --- a/pkgcore_checks/repo_metadata.py +++ b/pkgcheck/repo_metadata.py @@ -8,7 +8,7 @@ from pkgcore.ebuild.repository import SlavedTree from snakeoil import mappings from snakeoil.demandload import demandload -from pkgcore_checks import base, addons +from pkgcheck import base, addons demandload( 'snakeoil.osutils:listdir_dirs,listdir_files,pjoin', diff --git a/pkgcore_checks/report_stream.py b/pkgcheck/report_stream.py index b61cbcf9..ae53e821 100644 --- a/pkgcore_checks/report_stream.py +++ b/pkgcheck/report_stream.py @@ -9,14 +9,14 @@ several different reports without using a config defined multiplex reporter. from pkgcore.util import commandline -from pkgcore_checks import base +from pkgcheck import base from snakeoil.demandload import demandload demandload( 'os', 'snakeoil:pickling,formatters', 'snakeoil.modules:load_attribute', - 'pkgcore_checks:reporters', + 'pkgcheck:reporters', ) diff --git a/pkgcore_checks/reporters.py b/pkgcheck/reporters.py index b2c67957..09ad2bdb 100644 --- a/pkgcore_checks/reporters.py +++ b/pkgcheck/reporters.py @@ -8,11 +8,11 @@ from pkgcore.config import configurable from snakeoil import formatters -from pkgcore_checks import base +from pkgcheck import base from snakeoil.demandload import demandload demandload( - 'pkgcore_checks:errors', + 'pkgcheck:errors', 'snakeoil:currying', 'snakeoil:pickling', 'snakeoil:xml', diff --git a/pkgcore_checks/stale_unstable.py b/pkgcheck/stale_unstable.py index c122fb68..a895f41e 100644 --- a/pkgcore_checks/stale_unstable.py +++ b/pkgcheck/stale_unstable.py @@ -3,8 +3,8 @@ import time -from pkgcore_checks.addons import ArchesAddon, StableCheckAddon -from pkgcore_checks.base import versioned_feed, Result +from pkgcheck.addons import ArchesAddon, StableCheckAddon +from pkgcheck.base import versioned_feed, Result day = 24*3600 diff --git a/pkgcore_checks/test/__init__.py b/pkgcheck/test/__init__.py index e69de29b..e69de29b 100644 --- a/pkgcore_checks/test/__init__.py +++ b/pkgcheck/test/__init__.py diff --git a/pkgcore_checks/test/misc.py b/pkgcheck/test/misc.py index df909c14..0d9dd83d 100644 --- a/pkgcore_checks/test/misc.py +++ b/pkgcheck/test/misc.py @@ -9,8 +9,8 @@ from pkgcore.ebuild.misc import ChunkedDataDict, split_negations, chunked_data from pkgcore.repository.util import SimpleTree from pkgcore.test import TestCase -from pkgcore_checks import base -from pkgcore_checks.addons import ArchesAddon +from pkgcheck import base +from pkgcheck.addons import ArchesAddon default_arches = ArchesAddon.default_arches diff --git a/pkgcore_checks/test/test_addons.py b/pkgcheck/test/test_addons.py index e3f730fe..e1eea3b2 100644 --- a/pkgcore_checks/test/test_addons.py +++ b/pkgcheck/test/test_addons.py @@ -14,8 +14,8 @@ from snakeoil.fileutils import write_file from snakeoil.osutils import pjoin, ensure_dirs from snakeoil.test import mixins -from pkgcore_checks import addons, base -from pkgcore_checks.test.misc import FakePkg, FakeProfile, Options +from pkgcheck import addons, base +from pkgcheck.test.misc import FakePkg, FakeProfile, Options class exit_exception(Exception): diff --git a/pkgcore_checks/test/test_base.py b/pkgcheck/test/test_base.py index 7e42cb04..dc2c3ada 100644 --- a/pkgcore_checks/test/test_base.py +++ b/pkgcheck/test/test_base.py @@ -3,7 +3,7 @@ from pkgcore.test import TestCase -from pkgcore_checks import base +from pkgcheck import base dummies = list('dummy-%s' % (i,) for i in xrange(0, 10)) diff --git a/pkgcore_checks/test/test_cleanup.py b/pkgcheck/test/test_cleanup.py index 14212126..cb56f3d8 100644 --- a/pkgcore_checks/test/test_cleanup.py +++ b/pkgcheck/test/test_cleanup.py @@ -1,8 +1,8 @@ # Copyright: 2006 Brian Harring <ferringb@gmail.com> # License: BSD/GPL2 -from pkgcore_checks.test import misc -from pkgcore_checks.cleanup import RedundantVersionReport as redundant_ver +from pkgcheck.test import misc +from pkgcheck.cleanup import RedundantVersionReport as redundant_ver class TestRedundantVersion(misc.ReportTestCase): diff --git a/pkgcore_checks/test/test_codingstyle.py b/pkgcheck/test/test_codingstyle.py index 6ebf9ed0..7b93feb6 100644 --- a/pkgcore_checks/test/test_codingstyle.py +++ b/pkgcheck/test/test_codingstyle.py @@ -1,8 +1,8 @@ # Copyright: 2007 Markus Ullmann <jokey@gentoo.org> # License: BSD/GPL2 -from pkgcore_checks.test import misc -from pkgcore_checks.codingstyle import BadInsIntoCheck +from pkgcheck.test import misc +from pkgcheck.codingstyle import BadInsIntoCheck class TestBadInsIntoUsage(misc.ReportTestCase): diff --git a/pkgcore_checks/test/test_demandload_usage.py b/pkgcheck/test/test_demandload_usage.py index 3abbdbb7..f088f607 100644 --- a/pkgcore_checks/test/test_demandload_usage.py +++ b/pkgcheck/test/test_demandload_usage.py @@ -5,4 +5,4 @@ from snakeoil.test import test_demandload_usage class TestDemandLoadUsage(test_demandload_usage.TestDemandLoadTargets): - target_namespace = "pkgcore_checks" + target_namespace = "pkgcheck" diff --git a/pkgcore_checks/test/test_deprecated.py b/pkgcheck/test/test_deprecated.py index bfff0f2d..d86b1944 100644 --- a/pkgcore_checks/test/test_deprecated.py +++ b/pkgcheck/test/test_deprecated.py @@ -1,8 +1,8 @@ # Copyright: 2006 Brian Harring <ferringb@gmail.com> # License: BSD/GPL2 -from pkgcore_checks.test import misc -from pkgcore_checks.deprecated import DeprecatedEclassReport as dep_eclass +from pkgcheck.test import misc +from pkgcheck.deprecated import DeprecatedEclassReport as dep_eclass class TestDeprecatedEclass(misc.ReportTestCase): diff --git a/pkgcore_checks/test/test_dropped_keywords.py b/pkgcheck/test/test_dropped_keywords.py index 9b2f28f9..a1ab7f23 100644 --- a/pkgcore_checks/test/test_dropped_keywords.py +++ b/pkgcheck/test/test_dropped_keywords.py @@ -3,8 +3,8 @@ from itertools import chain -from pkgcore_checks.test import misc -from pkgcore_checks.dropped_keywords import DroppedKeywordsReport as drop_keys +from pkgcheck.test import misc +from pkgcheck.dropped_keywords import DroppedKeywordsReport as drop_keys class TestDroppedKeywords(misc.ReportTestCase): diff --git a/pkgcore_checks/test/test_glsa.py b/pkgcheck/test/test_glsa.py index d142f01a..b0241e27 100644 --- a/pkgcore_checks/test/test_glsa.py +++ b/pkgcheck/test/test_glsa.py @@ -5,8 +5,8 @@ from pkgcore.test.pkgsets.test_glsa import mk_glsa from snakeoil.osutils import pjoin from snakeoil.test.mixins import TempDirMixin -from pkgcore_checks.glsa_scan import TreeVulnerabilitiesReport as vuln_report -from pkgcore_checks.test import misc +from pkgcheck.glsa_scan import TreeVulnerabilitiesReport as vuln_report +from pkgcheck.test import misc class TestVulnerabilitiesReport(TempDirMixin, misc.ReportTestCase): diff --git a/pkgcore_checks/test/test_imlate.py b/pkgcheck/test/test_imlate.py index 3d0af602..38246709 100644 --- a/pkgcore_checks/test/test_imlate.py +++ b/pkgcheck/test/test_imlate.py @@ -1,8 +1,8 @@ # Copyright: 2006 Brian Harring <ferringb@gmail.com> # License: BSD/GPL2 -from pkgcore_checks.test import misc -from pkgcore_checks.imlate import ImlateReport +from pkgcheck.test import misc +from pkgcheck.imlate import ImlateReport class TestImlateReport(misc.ReportTestCase): diff --git a/pkgcore_checks/test/test_metadata_checks.py b/pkgcheck/test/test_metadata_checks.py index f15816f5..e5dbcaa5 100644 --- a/pkgcore_checks/test/test_metadata_checks.py +++ b/pkgcheck/test/test_metadata_checks.py @@ -11,8 +11,8 @@ from snakeoil.currying import post_curry from snakeoil.osutils import pjoin from snakeoil.test.mixins import TempDirMixin -from pkgcore_checks import metadata_checks, addons -from pkgcore_checks.test import misc +from pkgcheck import metadata_checks, addons +from pkgcheck.test import misc class TestDescriptionReport(misc.ReportTestCase): diff --git a/pkgcore_checks/test/test_pcheck.py b/pkgcheck/test/test_pcheck.py index 5f17f457..8c9c7b3f 100644 --- a/pkgcore_checks/test/test_pcheck.py +++ b/pkgcheck/test/test_pcheck.py @@ -4,7 +4,7 @@ from pkgcore.test import TestCase from pkgcore.test.scripts import helpers -from pkgcore_checks import pcheck +from pkgcheck import pcheck class CommandlineTest(TestCase, helpers.MainMixin): diff --git a/pkgcore_checks/test/test_stale_unstable.py b/pkgcheck/test/test_stale_unstable.py index 5da48733..809192ce 100644 --- a/pkgcore_checks/test/test_stale_unstable.py +++ b/pkgcheck/test/test_stale_unstable.py @@ -3,8 +3,8 @@ import time -from pkgcore_checks.stale_unstable import StaleUnstableReport -from pkgcore_checks.test import misc +from pkgcheck.stale_unstable import StaleUnstableReport +from pkgcheck.test import misc class TestStaleUnstableReport(misc.ReportTestCase): diff --git a/pkgcore_checks/test/test_whitespace.py b/pkgcheck/test/test_whitespace.py index 6f8cf6cd..3d3226b6 100644 --- a/pkgcore_checks/test/test_whitespace.py +++ b/pkgcheck/test/test_whitespace.py @@ -1,8 +1,8 @@ # Copyright: 2007 Markus Ullmann <jokey@gentoo.org> # License: BSD/GPL2 -from pkgcore_checks.test import misc -from pkgcore_checks.whitespace import WhitespaceCheck +from pkgcheck.test import misc +from pkgcheck.whitespace import WhitespaceCheck class TestStandardWhitespaces(misc.ReportTestCase): diff --git a/pkgcore_checks/unstable_only.py b/pkgcheck/unstable_only.py index ee179898..5ea3c620 100644 --- a/pkgcore_checks/unstable_only.py +++ b/pkgcheck/unstable_only.py @@ -3,8 +3,8 @@ from pkgcore.restrictions import packages, values -from pkgcore_checks.addons import ArchesAddon, StableCheckAddon -from pkgcore_checks.base import package_feed, Result +from pkgcheck.addons import ArchesAddon, StableCheckAddon +from pkgcheck.base import package_feed, Result class UnstableOnly(Result): diff --git a/pkgcore_checks/visibility.py b/pkgcheck/visibility.py index d3ff1b0f..7f6e3ede 100644 --- a/pkgcore_checks/visibility.py +++ b/pkgcheck/visibility.py @@ -6,7 +6,7 @@ from snakeoil.iterables import caching_iter from snakeoil.lists import stable_unique, iflatten_instance, iflatten_func from snakeoil import klass -from pkgcore_checks import base, addons +from pkgcheck import base, addons class FakeConfigurable(object): diff --git a/pkgcore_checks/whitespace.py b/pkgcheck/whitespace.py index 18a09cf2..e379fa2d 100644 --- a/pkgcore_checks/whitespace.py +++ b/pkgcheck/whitespace.py @@ -4,7 +4,7 @@ from snakeoil.demandload import demand_compile_regexp -from pkgcore_checks import base +from pkgcheck import base demand_compile_regexp('indent_regexp', '^\t* \t+') @@ -7,17 +7,17 @@ import os from snakeoil import distutils_extensions as snk_distutils -from pkgcore_checks import __version__ +from pkgcheck import __version__ class mysdist(snk_distutils.sdist): - package_namespace = 'pkgcore_checks' + package_namespace = 'pkgcheck' old_verinfo = False packages = [] -for root, dirs, files in os.walk('pkgcore_checks'): +for root, dirs, files in os.walk('pkgcheck'): if '__init__.py' in files: package = root.replace(os.path.sep, '.') packages.append(package) @@ -30,18 +30,18 @@ except OSError: class test(snk_distutils.test): - default_test_namespace = 'pkgcore_checks' - blacklist = frozenset(['pkgcore_checks.plugins']) + default_test_namespace = 'pkgcheck' + blacklist = frozenset(['pkgcheck.plugins']) class pchecks_build_py(snk_distutils.build_py): - package_namespace = 'pkgcore_checks' + package_namespace = 'pkgcheck' generate_verinfo = True setup( - name="pkgcore-checks", + name="pkgcheck", version=__version__, license="BSD/GPL2", author="Brian Harring", |