diff --git a/britney.py b/britney.py index d39ccdb..448fe0f 100755 --- a/britney.py +++ b/britney.py @@ -181,38 +181,34 @@ does for the generation of the update excuses. """ from __future__ import print_function +import optparse import os import sys import time -import optparse - -import apt_pkg - from collections import defaultdict, namedtuple from functools import reduce from itertools import product from operator import attrgetter - from urllib.parse import quote -from installability.builder import InstallabilityTesterBuilder -from excuse import Excuse -from migrationitem import MigrationItem -from hints import HintParser -from britney_util import (old_libraries_format, undo_changes, - compute_reverse_tree, possibly_compressed, - read_nuninst, write_nuninst, write_heidi, - eval_uninst, newly_uninst, make_migrationitem, - write_excuses, write_heidi_delta, write_controlfiles, - old_libraries, is_nuninst_asgood_generous, - clone_nuninst, check_installability, - create_provides_map, - ) -from policies.policy import AgePolicy, RCBugPolicy, PolicyVerdict +import apt_pkg # Check the "check_field_name" reflection before removing an import here. -from consts import (SOURCE, SOURCEVER, ARCHITECTURE, CONFLICTS, DEPENDS, - PROVIDES, MULTIARCH) +from britney2.consts import (SOURCE, SOURCEVER, ARCHITECTURE, CONFLICTS, DEPENDS, PROVIDES, MULTIARCH) +from britney2.excuse import Excuse +from britney2.hints import HintParser +from britney2.installability.builder import InstallabilityTesterBuilder +from britney2.migrationitem import MigrationItem +from britney2.policies.policy import AgePolicy, RCBugPolicy, PolicyVerdict +from britney2.utils import (old_libraries_format, undo_changes, + compute_reverse_tree, possibly_compressed, + read_nuninst, write_nuninst, write_heidi, + eval_uninst, newly_uninst, make_migrationitem, + write_excuses, write_heidi_delta, write_controlfiles, + old_libraries, is_nuninst_asgood_generous, + clone_nuninst, check_installability, + create_provides_map, + ) __author__ = 'Fabio Tranchitella and the Debian Release Team' __version__ = '2.0' @@ -1642,7 +1638,7 @@ class Britney(object): # uploads to (t-)p-u which intentionally drop binary # packages if any(x for x in self.binaries[suite][arch][0].values() \ - if x.source == src and x.source_version == source_u.version and \ + if x.source == src and x.source_version == source_u.version and \ x.architecture != 'all'): continue @@ -2778,7 +2774,7 @@ class Britney(object): self.nuninst_orig_save = self.get_nuninst() import readline - from completer import Completer + from britney2.completer import Completer histfile = os.path.expanduser('~/.britney2_history') if os.path.exists(histfile): diff --git a/installability/__init__.py b/britney2/__init__.py similarity index 100% rename from installability/__init__.py rename to britney2/__init__.py diff --git a/completer.py b/britney2/completer.py similarity index 100% rename from completer.py rename to britney2/completer.py diff --git a/consts.py b/britney2/consts.py similarity index 100% rename from consts.py rename to britney2/consts.py diff --git a/excuse.py b/britney2/excuse.py similarity index 100% rename from excuse.py rename to britney2/excuse.py diff --git a/hints.py b/britney2/hints.py similarity index 99% rename from hints.py rename to britney2/hints.py index c78e5cb..5f53aee 100644 --- a/hints.py +++ b/britney2/hints.py @@ -16,7 +16,7 @@ from __future__ import print_function from itertools import chain -from migrationitem import MigrationItem +from britney2.migrationitem import MigrationItem class MalformedHintException(Exception): diff --git a/policies/__init__.py b/britney2/installability/__init__.py similarity index 100% rename from policies/__init__.py rename to britney2/installability/__init__.py diff --git a/installability/builder.py b/britney2/installability/builder.py similarity index 99% rename from installability/builder.py rename to britney2/installability/builder.py index ee8b4f1..9f9961a 100644 --- a/installability/builder.py +++ b/britney2/installability/builder.py @@ -15,8 +15,9 @@ from collections import defaultdict from contextlib import contextmanager -from britney_util import ifilter_except, iter_except -from installability.solver import InstallabilitySolver +from britney2.utils import ifilter_except, iter_except +from britney2.installability.solver import InstallabilitySolver + class _RelationBuilder(object): """Private helper class to "build" relations""" diff --git a/installability/solver.py b/britney2/installability/solver.py similarity index 99% rename from installability/solver.py rename to britney2/installability/solver.py index 9e6e1b7..cce79dd 100644 --- a/installability/solver.py +++ b/britney2/installability/solver.py @@ -19,8 +19,8 @@ from __future__ import print_function import os from collections import deque -from installability.tester import InstallabilityTester -from britney_util import (ifilter_only, iter_except) +from britney2.utils import (ifilter_only, iter_except) +from britney2.installability.tester import InstallabilityTester class InstallabilitySolver(InstallabilityTester): diff --git a/installability/tester.py b/britney2/installability/tester.py similarity index 99% rename from installability/tester.py rename to britney2/installability/tester.py index 6b9a3d3..14939ce 100644 --- a/installability/tester.py +++ b/britney2/installability/tester.py @@ -16,7 +16,7 @@ from collections import defaultdict from functools import partial from itertools import chain, filterfalse -from britney_util import iter_except +from britney2.utils import iter_except class InstallabilityTester(object): diff --git a/migrationitem.py b/britney2/migrationitem.py similarity index 99% rename from migrationitem.py rename to britney2/migrationitem.py index 0757626..bdf64a7 100644 --- a/migrationitem.py +++ b/britney2/migrationitem.py @@ -144,6 +144,7 @@ class MigrationItem(object): def uvname(self): return self._uvname + class UnversionnedMigrationItem(MigrationItem): def __init__(self, name=None): super().__init__(name=name, versionned=False) diff --git a/britney2/policies/__init__.py b/britney2/policies/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/policies/policy.py b/britney2/policies/policy.py similarity index 99% rename from policies/policy.py rename to britney2/policies/policy.py index 50bbe5f..48a3e4b 100644 --- a/policies/policy.py +++ b/britney2/policies/policy.py @@ -1,11 +1,12 @@ -from abc import abstractmethod -from enum import Enum, unique -import apt_pkg import os import time +from abc import abstractmethod +from enum import Enum, unique from urllib.parse import quote -from hints import Hint, split_into_one_hint_per_package +import apt_pkg + +from britney2.hints import Hint, split_into_one_hint_per_package @unique @@ -93,7 +94,6 @@ class BasePolicy(object): """ pass - def apply_policy(self, general_policy_info, suite, source_name, source_data_tdist, source_data_srcdist, excuse): if self.policy_id not in general_policy_info: general_policy_info[self.policy_id] = pinfo = {} diff --git a/britney_util.py b/britney2/utils.py similarity index 98% rename from britney_util.py rename to britney2/utils.py index 92c58d1..c7c16da 100644 --- a/britney_util.py +++ b/britney2/utils.py @@ -21,21 +21,21 @@ # GNU General Public License for more details. +import errno +import os +import time from collections import defaultdict -from functools import partial from datetime import datetime +from functools import partial from itertools import filterfalse -import os -import time -import yaml -import errno -from migrationitem import MigrationItem, UnversionnedMigrationItem +import yaml -from consts import (VERSION, PROVIDES, DEPENDS, CONFLICTS, - ARCHITECTURE, SECTION, - SOURCE, MAINTAINER, MULTIARCH, - ESSENTIAL) +from britney2.consts import (VERSION, PROVIDES, DEPENDS, CONFLICTS, + ARCHITECTURE, SECTION, + SOURCE, MAINTAINER, MULTIARCH, + ESSENTIAL) +from britney2.migrationitem import MigrationItem, UnversionnedMigrationItem def ifilter_except(container, iterable=None):