Don't include dddp.test as a package (moved out of dddp package).

This commit is contained in:
Tyson Clugg 2016-01-06 15:02:33 +11:00
parent 9572f7fbd8
commit e2f9887076
29 changed files with 26 additions and 22 deletions

View file

@ -6,9 +6,9 @@ include requirements*.txt
include .gitignore include .gitignore
include Makefile include Makefile
exclude tox.ini exclude tox.ini
graft dddp/test/meteor_todos graft tests/meteor_todos
prune dddp/test/build prune tests/build
prune dddp/test/meteor_todos/.meteor/local prune tests/meteor_todos/.meteor/local
graft docs graft docs
prune docs/_build prune docs/_build
prune docs/node_modules prune docs/node_modules

View file

@ -19,7 +19,7 @@ clean-docs:
$(MAKE) -C docs/ clean $(MAKE) -C docs/ clean
clean-dist: clean-dist:
rm -rf "${SDIST}" "${WHEEL}" dddp/test/build/ dddp/test/meteor_todos/.meteor/local/ rm -rf "${SDIST}" "${WHEEL}" tests/build/ tests/meteor_todos/.meteor/local/
clean-pyc: clean-pyc:
find . -type f -name \*.pyc -print0 | xargs -0 rm -f find . -type f -name \*.pyc -print0 | xargs -0 rm -f

View file

@ -16,7 +16,7 @@ from dddp.main import DDPLauncher
# pylint: disable=E0611, F0401 # pylint: disable=E0611, F0401
from six.moves.urllib_parse import urljoin from six.moves.urllib_parse import urljoin
os.environ['DJANGO_SETTINGS_MODULE'] = 'dddp.test.test_project.settings' os.environ['DJANGO_SETTINGS_MODULE'] = 'test_project.settings'
DOCTEST_MODULES = [ DOCTEST_MODULES = [
dddp.alea, dddp.alea,

View file

@ -198,9 +198,9 @@ setuptools.setup(
'liveupdate live-update livequery live-query' 'liveupdate live-update livequery live-query'
], ],
license='MIT', license='MIT',
packages=setuptools.find_packages(), packages=setuptools.find_packages(exclude=['tests*']),
include_package_data=True, # install data files specified in MANIFEST.in include_package_data=True, # install data files specified in MANIFEST.in
zip_safe=False, # TODO: Move dddp.test into it's own package. zip_safe=True,
setup_requires=[ setup_requires=[
# packages required to run the setup script # packages required to run the setup script
__requires__, __requires__,
@ -254,7 +254,7 @@ setuptools.setup(
], ],
}, },
classifiers=CLASSIFIERS, classifiers=CLASSIFIERS,
test_suite='dddp.test.manage.run_tests', test_suite='tests.manage.run_tests',
tests_require=[ tests_require=[
'requests', 'requests',
'websocket_client', 'websocket_client',
@ -270,7 +270,7 @@ setuptools.setup(
}, },
'build_meteor': { 'build_meteor': {
'meteor_builds': [ 'meteor_builds': [
('dddp.test', 'meteor_todos', 'build', []), ('tests', 'meteor_todos', 'build', []),
], ],
}, },
}, },

View file

@ -1,5 +1,7 @@
from __future__ import absolute_import, unicode_literals
from dddp.api import API, Collection, Publication from dddp.api import API, Collection, Publication
from dddp.test.django_todos import models from django_todos import models
class Task(Collection): class Task(Collection):

View file

@ -4,7 +4,7 @@ import doctest
import os import os
import unittest import unittest
os.environ['DJANGO_SETTINGS_MODULE'] = 'dddp.test.test_project.settings' os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.test_project.settings'
DOCTEST_MODULES = [ DOCTEST_MODULES = [
] ]

View file

@ -1,13 +1,14 @@
from __future__ import absolute_import
import os.path import os.path
from dddp.views import MeteorView from dddp.views import MeteorView
import dddp.test import tests
class MeteorTodos(MeteorView): class MeteorTodos(MeteorView):
"""Meteor Todos.""" """Meteor Todos."""
json_path = os.path.join( json_path = os.path.join(
os.path.dirname(dddp.test.__file__), os.path.dirname(tests.__file__),
'build', 'bundle', 'star.json' 'build', 'bundle', 'star.json'
) )

View file

@ -6,7 +6,8 @@ import sys
import dddp import dddp
dddp.greenify() dddp.greenify()
os.environ['DJANGO_SETTINGS_MODULE'] = 'dddp.test.test_project.settings' os.environ['DJANGO_SETTINGS_MODULE'] = 'test_project.settings'
sys.path.insert(0, os.path.dirname(__file__))
def run_tests(): def run_tests():

View file

@ -38,7 +38,7 @@ INSTALLED_APPS = (
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'dddp', 'dddp',
'dddp.accounts', 'dddp.accounts',
'dddp.test.django_todos', 'django_todos',
) )
MIDDLEWARE_CLASSES = ( MIDDLEWARE_CLASSES = (
@ -51,9 +51,9 @@ MIDDLEWARE_CLASSES = (
'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware',
) )
ROOT_URLCONF = 'dddp.test.test_project.urls' ROOT_URLCONF = 'test_project.urls'
WSGI_APPLICATION = 'dddp.test.test_project.wsgi.application' WSGI_APPLICATION = 'test_project.wsgi.application'
# Database # Database

View file

@ -3,13 +3,13 @@
from django.conf import settings from django.conf import settings
from django.conf.urls import patterns, include, url from django.conf.urls import patterns, include, url
from django.contrib import admin from django.contrib import admin
from dddp.test.django_todos.views import MeteorTodos from django_todos.views import MeteorTodos
urlpatterns = patterns( urlpatterns = patterns(
'', '',
# Examples: # Examples:
# url(r'^$', 'dddp.test.test_project.views.home', name='home'), # url(r'^$', 'test_project.views.home', name='home'),
# url(r'^blog/', include('blog.urls')), # url(r'^blog/', include('blog.urls')),
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),

View file

@ -1,5 +1,5 @@
""" """
WSGI config for dddp.test.test_project project. WSGI config for test_project project.
It exposes the WSGI callable as a module-level variable named ``application``. It exposes the WSGI callable as a module-level variable named ``application``.
@ -8,7 +8,7 @@ https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/
""" """
import os import os
os.environ["DJANGO_SETTINGS_MODULE"] = "dddp.test.test_project.settings" os.environ["DJANGO_SETTINGS_MODULE"] = "test_project.settings"
from django.core.wsgi import get_wsgi_application from django.core.wsgi import get_wsgi_application
application = get_wsgi_application() application = get_wsgi_application()

View file

@ -120,7 +120,7 @@ install_command=sh -c 'pip install -U "setuptools>=18.5" "wheel>=0.25.0" "pip>=7
whitelist_externals=sh whitelist_externals=sh
commands = commands =
check-manifest --ignore "dddp/test/build*,dddp/test/meteor_todos/.meteor/local*" check-manifest --ignore "tests/build*,tests/meteor_todos/.meteor/local*"
{envpython} setup.py --no-user-cfg sdist --dist-dir={toxinidir}/dist/ {envpython} setup.py --no-user-cfg sdist --dist-dir={toxinidir}/dist/
{envpython} setup.py --no-user-cfg bdist_wheel --dist-dir={toxinidir}/dist/ {envpython} setup.py --no-user-cfg bdist_wheel --dist-dir={toxinidir}/dist/
sh -c "cd docs && sphinx-build -b html -d _build/doctrees -D latex_paper_size=a4 . _build/html" sh -c "cd docs && sphinx-build -b html -d _build/doctrees -D latex_paper_size=a4 . _build/html"