diff --git a/README.rst b/README.rst index da3119e..e258f90 100644 --- a/README.rst +++ b/README.rst @@ -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 diff --git a/fkreplace/__init__.py b/mergeobject/__init__.py similarity index 100% rename from fkreplace/__init__.py rename to mergeobject/__init__.py diff --git a/setup.py b/setup.py index 1a8fcbf..e97bce9 100644 --- a/setup.py +++ b/setup.py @@ -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', diff --git a/tests/settings.py b/tests/settings.py index c071f55..3cf9038 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -1,7 +1,6 @@ SECRET_KEY = 'so-secret' INSTALLED_APPS = ( - 'fkreplace', 'tests', ) diff --git a/tests/tests.py b/tests/tests.py index faa045d..7f59427 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -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): diff --git a/tox.ini b/tox.ini index 74849f0..a373248 100644 --- a/tox.ini +++ b/tox.ini @@ -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