Skip to content

Commit

Permalink
Merge pull request #150 from bradjasper/setup
Browse files Browse the repository at this point in the history
Use setuptools and prep for wheel distribution
  • Loading branch information
paltman committed Dec 11, 2015
2 parents a4a0510 + 4e28494 commit 0298de2
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
2 changes: 2 additions & 0 deletions setup.cfg
@@ -0,0 +1,2 @@
[bdist_wheel]
universal = 1
15 changes: 9 additions & 6 deletions setup.py
@@ -1,5 +1,6 @@
from distutils.core import setup
from distutils.core import Command
from setuptools import setup


class TestCommand(Command):
user_options = []
Expand All @@ -12,21 +13,23 @@ def finalize_options(self):

def run(self):
from django.conf import settings
settings.configure(DATABASES={'default': {'NAME': ':memory:',
'ENGINE': 'django.db.backends.sqlite3'}},
INSTALLED_APPS=('jsonfield',))
settings.configure(
DATABASES={'default': {'NAME': ':memory:', 'ENGINE': 'django.db.backends.sqlite3'}},
INSTALLED_APPS=('jsonfield',)
)
from django.core.management import call_command
import django

if django.VERSION[:2] >= (1, 7):
django.setup()
call_command('test', 'jsonfield')

setup(name='jsonfield',

setup(
name='jsonfield',
version='1.0.3',
packages=['jsonfield'],
license='MIT',
include_package_data=True,
author='Brad Jasper',
author_email='bjasper@gmail.com',
url='https://github.com/bradjasper/django-jsonfield/',
Expand Down

0 comments on commit 0298de2

Please sign in to comment.