Skip to content

Commit

Permalink
Remove Ralph2 compatibility v1 (allegro#2908)
Browse files Browse the repository at this point in the history
Remove:
* ralph2 sync
* ralph2 cross validation

In the next PR I'll remove some hacks around ralph2 sync (singals wrapping etc)
  • Loading branch information
mkurek authored Jan 4, 2017
1 parent e01a432 commit 82424a7
Show file tree
Hide file tree
Showing 37 changed files with 2 additions and 3,820 deletions.
3 changes: 1 addition & 2 deletions src/ralph/admin/mixins.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
)
from ralph.lib.permissions.models import PermByFieldMixin
from ralph.lib.permissions.views import PermissionViewMetaClass
from ralph.ralph2_sync.admin import Ralph2SyncAdminMixin

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -212,7 +211,7 @@ def _check_absolute_url(self, cls, model):
return []


class RalphAdminMixin(Ralph2SyncAdminMixin, RalphAutocompleteMixin):
class RalphAdminMixin(RalphAutocompleteMixin):
"""Ralph admin mixin."""

list_views = None
Expand Down
9 changes: 1 addition & 8 deletions src/ralph/admin/sitetrees.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,6 @@ def section(section_name, app, model):
item._model = model
return item

cross_validation_items = []
if settings.RALPH2_RALPH3_CROSS_VALIDATION_ENABLED:
cross_validation_items = [
section(
_('Ralph2 Validation'), 'cross_validator', 'CrossValidationRun'
),
]

sitetrees = [
tree('ralph_admin', items=[
Expand Down Expand Up @@ -312,7 +305,7 @@ def section(section_name, app, model):
section(_('Transitions'), 'transitions', 'TransitionModel'),
section(_('Report template'), 'reports', 'Report'),
section(_('Custom fields'), 'custom_fields', 'CustomField'),
] + cross_validation_items
]
)
])
]
Expand Down
2 changes: 0 additions & 2 deletions src/ralph/admin/tests/tests_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@
'ralph.assets.models.assets.Asset',
'ralph.assets.models.base.BaseObject', # TODO: Add in the future
'ralph.assets.models.components.GenericComponent',
'ralph.cross_validator.models.CrossValidationResult',
'ralph.cross_validator.models.CrossValidationRun',
'ralph.data_center.models.physical.Connection',
'ralph.deployment.models.Deployment',
'ralph.deployment.models.PrebootFile',
Expand Down
2 changes: 0 additions & 2 deletions src/ralph/assets/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
ConfigurationClass,
ConfigurationModule
)
from ralph.cross_validator.views import ShowDiffMessageMixin
from ralph.data_importer import resources
from ralph.lib.custom_fields.admin import CustomFieldValueAdminMixin
from ralph.lib.table import Table, TableWithUrl
Expand Down Expand Up @@ -218,7 +217,6 @@ class ProfitCenterAdmin(RalphAdmin):
@register(AssetModel)
class AssetModelAdmin(
CustomFieldValueAdminMixin,
ShowDiffMessageMixin,
RalphAdmin
):

Expand Down
Empty file.
14 changes: 0 additions & 14 deletions src/ralph/cross_validator/__main__.py

This file was deleted.

15 changes: 0 additions & 15 deletions src/ralph/cross_validator/additional_checkers.py

This file was deleted.

123 changes: 0 additions & 123 deletions src/ralph/cross_validator/admin.py

This file was deleted.

13 changes: 0 additions & 13 deletions src/ralph/cross_validator/db_routers.py

This file was deleted.

82 changes: 0 additions & 82 deletions src/ralph/cross_validator/helpers.py

This file was deleted.

This file was deleted.

Loading

0 comments on commit 82424a7

Please sign in to comment.