Merge pull request #4 from pmitros/master

Updating fork to pmitros/django-pyfs master

.gitignore

@@ -52,3 +52,5 @@ coverage.xml
 # Sphinx documentation
 docs/_build/
 
+# Emacs backups
+*~
\ No newline at end of file

MANIFEST.in

+include README.md
+recursive-include djpyfs *py
+recursive-include example *py
\ No newline at end of file

README.md

@@ -22,7 +22,7 @@ expire after a few minutes. Another use case was memoization.
 
 Note that expired files are not automatically removed. To remove them,
 call `expire_objects()`. In our system, we had a cron job do
-this. Celery, manual removals, etc. are all options. 
+this for a while. Celery, manual removals, etc. are all options. 
 
 To configure a django-pyfs to use static files, set a parameter in
 Django settings: 
@@ -63,9 +63,7 @@ Good next steps would be to:
 * Add better test support. Django does nice things with resetting 
   DBs to a know state for testing. It'd be nice to do the same here. 
 
-State: This code is tested and has worked well in a range of
-settings. I did just tease it out of a couple of projects which were
-using it, so there may be issues associated with this, but it does
-appear to work. Much of the codebase could use a cleanup -- it's not
-pretty. I also cannot commit to long-term interface stability (but 
-older versions ought to continue to work). . 
+State: This code is tested and has worked well in a range of settings,
+and is currently deployed on edx.org. However, it doesn't have test
+cases and similar, so can't be considered truly production-ready. The
+expiration functionality, in particular, we are not using right now.

djpyfs/models.py

@@ -55,21 +55,13 @@ class FSExpirations(models.Model):
         return cls.objects.filter(expires=True, expiration__lte = expiration_lte)
 
     class Meta:
+        app_label = 'djpyfs'
         unique_together = (("module","filename"))
-        ## FIXME: We'd like to create an index first on expiration than on expires (so we can 
-        ## search for objects where expires=True and expiration is before now). Django 1.5 
-        ## supports this, but 1.4 does not. 
-        ## 
-        ## I'm putting this in in preparation for 1.5. This is
-        ## slightly redundant, since documentation is unclear about
-        ## order of the joint index.
-        ##
-        ## When 1.5 comes out, we can drop the index on expiration. 
-        if django.get_version()>='1.5':
-            index_together = [
-                ["expires","expiration"], 
-                ["expiration","expires"]
-                ]
+        # We'd like to create an index first on expiration than on expires (so we can
+        # search for objects where expires=True and expiration is before now).
+        index_together = [
+            ["expiration", "expires"],
+            ]
 
     def __str__(self):
         if self.expires: 

djpyfs/tests.py

-"""
-This file demonstrates writing tests using the unittest module. These will pass
-when you run "manage.py test".
-
-Replace this with more appropriate tests for your application.
-"""
-
-from django.test import TestCase
-
-
-class SimpleTest(TestCase):
-    def test_basic_addition(self):
-        """
-        Tests that 1 + 1 always equals 2.
-        """
-        self.assertEqual(1 + 1, 2)

djpyfs/views.py

-# Create your views here.

setup.py

 #!/usr/bin/env python
 
-from distutils.core import setup
-
-setup(name='django-pyfs',
-      version='1.0',
-      description='Django pyfilesystem integration',
-      author='Piotr Mitros',
-      author_email='pmitros@edx.org',
-      url='http://mitros.org/p/',
-      packages=['djpyfs'],
-     )
+import os
+from setuptools import setup
+
+fname = os.path.join(os.path.dirname(__file__), "README.md")
+
+if os.path.exists(fname):
+    ld = open(fname).read()
+else:
+    ld = "Django pyfilesystem integration"
+
+setup(
+    name='django-pyfs',
+    version='1.0.4',
+    description='Django pyfilesystem integration',
+    author='Piotr Mitros',
+    author_email='pmitros@edx.org',
+    packages=['djpyfs'],
+    license = "AGPLv3",
+    url = "https://github.com/edx/django-pyfs",
+    long_description = ld,
+    classifiers = [
+        "Development Status :: 4 - Beta",
+        "Topic :: Software Development :: Libraries :: Python Modules",
+        "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)",
+    ],
+    install_requires=['fs'],
+)