mergeobject

This commit is contained in:
James Turk 2015-05-29 15:31:29 -04:00
parent 6abb5fe763
commit 84764f727b
6 changed files with 9 additions and 8 deletions

View File

@ -1,5 +1,7 @@
**EXPERIMENTAL**
automatically replace foreign keys as part of a merge operation
tested on Django 1.7 and 1.8
somewhat tested on Django 1.7 and 1.8
very likely has some unsupported edge cases

View File

@ -1,16 +1,16 @@
from setuptools import setup
setup(
name='fkreplace',
name='mergeobject',
version="0.1.0",
package_dir={'fkreplace': 'fkreplace'},
packages=['fkreplace'],
package_dir={'mergeobject': 'mergeobject'},
packages=['mergeobject'],
description='',
long_description='',
author='James Turk',
author_email='james.p.turk@gmail.com',
license='BSD',
url='https://github.com/jamesturk/fkreplace/',
url='https://github.com/jamesturk/django-mergeobject/',
platforms=["any"],
classifiers=[
'License :: OSI Approved :: BSD License',

View File

@ -1,7 +1,6 @@
SECRET_KEY = 'so-secret'
INSTALLED_APPS = (
'fkreplace',
'tests',
)

View File

@ -1,6 +1,6 @@
from django.test import TestCase
from .models import Person, Number, SSN, Group
from fkreplace import merge, OneToOneConflict, KEEP, DELETE
from mergeobject import merge, OneToOneConflict, KEEP, DELETE
class MergeTests(TestCase):
def setUp(self):

View File

@ -3,7 +3,7 @@ envlist = py27-django17, py34-django17, py27-django18, py34-django18, flake8
[testenv:flake8]
deps = flake8
commands = flake8 --ignore=E402,E731 fkreplace
commands = flake8 --ignore=E402,E731 mergeobject
[django17]
deps = Django==1.7.8