Skip to content
This repository has been archived by the owner on May 1, 2020. It is now read-only.

Commit

Permalink
Remove django-pipeline from being a dependency. Document better how t…
Browse files Browse the repository at this point in the history
…o run this. Prep for 0.1.1 release
  • Loading branch information
pydanny committed Apr 23, 2014
1 parent fd748d9 commit 7754341
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 11 deletions.
7 changes: 5 additions & 2 deletions HISTORY.rst
Expand Up @@ -3,10 +3,13 @@
History
-------

0.2.0 (2014-04-??)
0.1.1 (2014-04-21)
++++++++++++++++++

* General cleanup
* Fixed second-time run problem by just using LibCloudStorage class
* Made django-pipeline optional
* Removed unnecessary files
* Moved TODO to issue tracker

0.1.0 (2014-04-21)
++++++++++++++++++
Expand Down
6 changes: 5 additions & 1 deletion README.rst
Expand Up @@ -35,7 +35,7 @@ Then use it in a project::

STATIC_URL = 'https://my-assets.cdn/static/'
MEDIA_URL = 'https://my-assets.cdn/media/'
STATICFILES_STORAGE = 'djlibcloud.storage.PipelineStorage'
STATICFILES_STORAGE = 'djlibcloud.storage.LibCloudStorage'
LIBCLOUD_PROVIDERS = {
'amazon_s3': {
'type': 'libcloud.storage.types.Provider.S3',
Expand Down Expand Up @@ -74,6 +74,10 @@ How can I contribute?

Please read http://dj-libcloud.readthedocs.org/en/latest/contributing.html

What about compressors like django-pipeline?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Working on it. Currently the `PipelineCachedCloudStorage` class breaks the second time you run it. See https://github.com/pydanny/dj-libcloud/issues/7

CREDIT
------
Expand Down
2 changes: 1 addition & 1 deletion djlibcloud/__init__.py
@@ -1 +1 @@
__version__ = '0.2.0'
__version__ = '0.1.1'
15 changes: 10 additions & 5 deletions djlibcloud/storage.py
Expand Up @@ -11,7 +11,10 @@
from django.core.exceptions import ImproperlyConfigured
from django.utils.six.moves.urllib.parse import urlparse, urlunparse

from pipeline.storage import PipelineMixin
try:
from pipeline.storage import PipelineMixin
except ImportError: # pragma: no cover
PipelineMixin = None

try:
from email.utils import parsedate_tz
Expand Down Expand Up @@ -253,7 +256,9 @@ def close(self):
self.file.close()


class PipelineCachedCloudStorage(PipelineMixin,
CachedFilesMixin,
LibCloudStorage):
pass
if PipelineMixin:
class PipelineCachedCloudStorage(PipelineMixin,
CachedFilesMixin,
LibCloudStorage):
""" Borked on second run of collectstatic"""
pass
3 changes: 1 addition & 2 deletions requirements.txt
@@ -1,4 +1,3 @@
django>=1.6.0
wheel==0.22.0
apache-libcloud>=0.14.1
django-pipeline>=1.3.24
apache-libcloud>=0.14.1

0 comments on commit 7754341

Please sign in to comment.