Merge remote-tracking branch 'origin/master' into release
This commit is contained in:
commit
49b21be77b
@ -12,7 +12,7 @@ from .models import DBFile
|
|||||||
L = logging.getLogger(__name__)
|
L = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
class DBStorage(Storage):
|
class DBFileStorage(Storage):
|
||||||
"""
|
"""
|
||||||
This is the Test Database file upload storage backend.
|
This is the Test Database file upload storage backend.
|
||||||
This is used so that in our test database we always have uploaded
|
This is used so that in our test database we always have uploaded
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# You can set these variables from the command line.
|
# You can set these variables from the command line.
|
||||||
SPHINXOPTS =
|
SPHINXOPTS =
|
||||||
SPHINXBUILD = sphinx-build
|
SPHINXBUILD = sphinx-build
|
||||||
SPHINXPROJ = DjangoDBStorage
|
SPHINXPROJ = DjangoDBFileStorage
|
||||||
SOURCEDIR = .
|
SOURCEDIR = .
|
||||||
BUILDDIR = _build
|
BUILDDIR = _build
|
||||||
|
|
||||||
@ -17,4 +17,4 @@ help:
|
|||||||
# Catch-all target: route all unknown targets to Sphinx using the new
|
# Catch-all target: route all unknown targets to Sphinx using the new
|
||||||
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
|
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
|
||||||
%: Makefile
|
%: Makefile
|
||||||
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
|
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
|
||||||
|
@ -54,9 +54,9 @@ author = u'Tyrel Souza'
|
|||||||
# built documents.
|
# built documents.
|
||||||
#
|
#
|
||||||
# The short X.Y version.
|
# The short X.Y version.
|
||||||
version = u'0.0.4'
|
version = u'0.1.0'
|
||||||
# The full version, including alpha/beta/rc tags.
|
# The full version, including alpha/beta/rc tags.
|
||||||
release = u'0.0.4'
|
release = u'0.1.0'
|
||||||
|
|
||||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||||
# for a list of supported languages.
|
# for a list of supported languages.
|
||||||
|
@ -9,7 +9,7 @@ if "%SPHINXBUILD%" == "" (
|
|||||||
)
|
)
|
||||||
set SOURCEDIR=.
|
set SOURCEDIR=.
|
||||||
set BUILDDIR=_build
|
set BUILDDIR=_build
|
||||||
set SPHINXPROJ=DjangoDBStorage
|
set SPHINXPROJ=DjangoDBFileStorage
|
||||||
|
|
||||||
if "%1" == "" goto help
|
if "%1" == "" goto help
|
||||||
|
|
||||||
|
2
setup.py
2
setup.py
@ -10,7 +10,7 @@ except ImportError:
|
|||||||
|
|
||||||
setup(
|
setup(
|
||||||
name="django-dbfilestorage",
|
name="django-dbfilestorage",
|
||||||
version="0.0.4",
|
version="0.1.0",
|
||||||
description="Database backed file storage for testing.",
|
description="Database backed file storage for testing.",
|
||||||
long_description="Database backed file storage for testing. Stores files as base64 encoded textfields.",
|
long_description="Database backed file storage for testing. Stores files as base64 encoded textfields.",
|
||||||
author="Tyrel Souza",
|
author="Tyrel Souza",
|
||||||
|
@ -8,7 +8,7 @@ from django.test import TestCase, Client
|
|||||||
from django.test.utils import override_settings
|
from django.test.utils import override_settings
|
||||||
|
|
||||||
PROJECT_ROOT = os.path.dirname(os.path.realpath(__file__))
|
PROJECT_ROOT = os.path.dirname(os.path.realpath(__file__))
|
||||||
DEFAULT_FILE_STORAGE = "dbfilestorage.storage.DBStorage"
|
DEFAULT_FILE_STORAGE = "dbfilestorage.storage.DBFileStorage"
|
||||||
|
|
||||||
|
|
||||||
@override_settings(DEFAULT_FILE_STORAGE=DEFAULT_FILE_STORAGE)
|
@override_settings(DEFAULT_FILE_STORAGE=DEFAULT_FILE_STORAGE)
|
||||||
|
Loading…
Reference in New Issue
Block a user