mirror of
https://github.com/jazzband/django-ddp.git
synced 2026-03-16 22:40:24 +00:00
Don't include dddp.test as a package (moved out of dddp package).
This commit is contained in:
parent
9572f7fbd8
commit
e2f9887076
29 changed files with 26 additions and 22 deletions
|
|
@ -6,9 +6,9 @@ include requirements*.txt
|
|||
include .gitignore
|
||||
include Makefile
|
||||
exclude tox.ini
|
||||
graft dddp/test/meteor_todos
|
||||
prune dddp/test/build
|
||||
prune dddp/test/meteor_todos/.meteor/local
|
||||
graft tests/meteor_todos
|
||||
prune tests/build
|
||||
prune tests/meteor_todos/.meteor/local
|
||||
graft docs
|
||||
prune docs/_build
|
||||
prune docs/node_modules
|
||||
|
|
|
|||
2
Makefile
2
Makefile
|
|
@ -19,7 +19,7 @@ clean-docs:
|
|||
$(MAKE) -C docs/ clean
|
||||
|
||||
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:
|
||||
find . -type f -name \*.pyc -print0 | xargs -0 rm -f
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ from dddp.main import DDPLauncher
|
|||
# pylint: disable=E0611, F0401
|
||||
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 = [
|
||||
dddp.alea,
|
||||
|
|
|
|||
8
setup.py
8
setup.py
|
|
@ -198,9 +198,9 @@ setuptools.setup(
|
|||
'liveupdate live-update livequery live-query'
|
||||
],
|
||||
license='MIT',
|
||||
packages=setuptools.find_packages(),
|
||||
packages=setuptools.find_packages(exclude=['tests*']),
|
||||
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=[
|
||||
# packages required to run the setup script
|
||||
__requires__,
|
||||
|
|
@ -254,7 +254,7 @@ setuptools.setup(
|
|||
],
|
||||
},
|
||||
classifiers=CLASSIFIERS,
|
||||
test_suite='dddp.test.manage.run_tests',
|
||||
test_suite='tests.manage.run_tests',
|
||||
tests_require=[
|
||||
'requests',
|
||||
'websocket_client',
|
||||
|
|
@ -270,7 +270,7 @@ setuptools.setup(
|
|||
},
|
||||
'build_meteor': {
|
||||
'meteor_builds': [
|
||||
('dddp.test', 'meteor_todos', 'build', []),
|
||||
('tests', 'meteor_todos', 'build', []),
|
||||
],
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
from __future__ import absolute_import, unicode_literals
|
||||
|
||||
from dddp.api import API, Collection, Publication
|
||||
from dddp.test.django_todos import models
|
||||
from django_todos import models
|
||||
|
||||
|
||||
class Task(Collection):
|
||||
|
|
@ -4,7 +4,7 @@ import doctest
|
|||
import os
|
||||
import unittest
|
||||
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'dddp.test.test_project.settings'
|
||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.test_project.settings'
|
||||
|
||||
DOCTEST_MODULES = [
|
||||
]
|
||||
|
|
@ -1,13 +1,14 @@
|
|||
from __future__ import absolute_import
|
||||
import os.path
|
||||
|
||||
from dddp.views import MeteorView
|
||||
import dddp.test
|
||||
import tests
|
||||
|
||||
|
||||
class MeteorTodos(MeteorView):
|
||||
"""Meteor Todos."""
|
||||
|
||||
json_path = os.path.join(
|
||||
os.path.dirname(dddp.test.__file__),
|
||||
os.path.dirname(tests.__file__),
|
||||
'build', 'bundle', 'star.json'
|
||||
)
|
||||
|
|
@ -6,7 +6,8 @@ import sys
|
|||
import dddp
|
||||
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():
|
||||
|
|
@ -38,7 +38,7 @@ INSTALLED_APPS = (
|
|||
'django.contrib.staticfiles',
|
||||
'dddp',
|
||||
'dddp.accounts',
|
||||
'dddp.test.django_todos',
|
||||
'django_todos',
|
||||
)
|
||||
|
||||
MIDDLEWARE_CLASSES = (
|
||||
|
|
@ -51,9 +51,9 @@ MIDDLEWARE_CLASSES = (
|
|||
'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
|
||||
|
|
@ -3,13 +3,13 @@
|
|||
from django.conf import settings
|
||||
from django.conf.urls import patterns, include, url
|
||||
from django.contrib import admin
|
||||
from dddp.test.django_todos.views import MeteorTodos
|
||||
from django_todos.views import MeteorTodos
|
||||
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
# 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'^admin/', include(admin.site.urls)),
|
||||
|
|
@ -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``.
|
||||
|
||||
|
|
@ -8,7 +8,7 @@ https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/
|
|||
"""
|
||||
|
||||
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
|
||||
application = get_wsgi_application()
|
||||
2
tox.ini
2
tox.ini
|
|
@ -120,7 +120,7 @@ install_command=sh -c 'pip install -U "setuptools>=18.5" "wheel>=0.25.0" "pip>=7
|
|||
whitelist_externals=sh
|
||||
|
||||
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 bdist_wheel --dist-dir={toxinidir}/dist/
|
||||
sh -c "cd docs && sphinx-build -b html -d _build/doctrees -D latex_paper_size=a4 . _build/html"
|
||||
|
|
|
|||
Loading…
Reference in a new issue