Skip to content

Commit

Permalink
Merge branch 'fix/collapse-migrations'
Browse files Browse the repository at this point in the history
  • Loading branch information
seawolf42 committed Sep 28, 2018
2 parents 6d53a96 + 9517a9c commit 72bc8d8
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.15 on 2018-09-28 02:34
from __future__ import unicode_literals

from django.db import migrations


class Migration(migrations.Migration):

replaces = [('lookup_tables', '0001_initial'), ('lookup_tables', '0002_table_ref_field'), ('lookup_tables', '0003_auto_20180614_2034'), ('lookup_tables', '0004_auto_20180926_1753'), ('lookup_tables', '0005_auto_20180927_2134')]

dependencies = [
]

operations = [
]
21 changes: 21 additions & 0 deletions lookup_tables/migrations/0005_auto_20180927_2134.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.15 on 2018-09-28 02:34
from __future__ import unicode_literals

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('lookup_tables', '0004_auto_20180926_1753'),
]

operations = [
migrations.DeleteModel(
name='LookupTable',
),
migrations.DeleteModel(
name='LookupTableItem',
),
]
4 changes: 2 additions & 2 deletions lookup_tables/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ def save(self, *args, **kwargs):
super(AbstractLookupTable, self).save(*args, **kwargs)


class LookupTable(models.Model):
class LookupTable(object):

def __init__(self, *args, **kwargs):
raise Exception('this class is no longer supported; see Betas.md for upgrade information')


class LookupTableItem(models.Model):
class LookupTableItem(object):

def __init__(self, *args, **kwargs):
raise Exception('this class is no longer supported; see Betas.md for upgrade information')
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

setup(
name='django-lookup-tables',
version='0.15.1',
version='0.15.2',
packages=find_packages(),
include_package_data=True,
license='MIT License',
Expand Down

0 comments on commit 72bc8d8

Please sign in to comment.