BOM-1028

Adding tox for django20,21,22
Added constraint for boto.
fixing all quality issues.
added the twine check as suggested

Author: awais786

.travis.yml

@@ -5,13 +5,26 @@ python:
  - 3.5
 
 env:
-  - TOXENV=django18
-  - TOXENV=django19
-  - TOXENV=django110
   - TOXENV=django111
+  - TOXENV=django20
+  - TOXENV=django21
+  - TOXENV=django22
 
 sudo: false
 
+matrix:
+  exclude:
+    - python: 2.7
+      env: TOXENV=django20
+    - python: 2.7
+      env: TOXENV=django21
+    - python: 2.7
+      env: TOXENV=django22
+
+  include:
+  - python: 3.5
+    env: TOXENV=quality
+
 install:
   - pip install -r requirements/travis.txt
 
@@ -30,3 +43,5 @@ deploy:
   on:
     tags: true
     all_branches: true
+    python: 3.5
+    condition: '$TOXENV = quality'

Makefile

@@ -26,11 +26,16 @@ test: clean ## run tests in the current virtualenv
 test-all: ## run tests on every supported Python/Django combination
 	tox
 
+quality: ## Run Quality checks
+	tox -e quality
+
+
 upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
 	pip install -q pip-tools
-	pip-compile --upgrade -o requirements/dev.txt requirements/base.in requirements/dev.in
-	pip-compile --upgrade -o requirements/test.txt requirements/base.in requirements/test.in
-	pip-compile --upgrade -o requirements/travis.txt requirements/travis.in
+	pip-compile --rebuild --upgrade -o requirements/dev.txt requirements/base.in requirements/dev.in
+	pip-compile --rebuild --upgrade -o requirements/test.txt requirements/base.in requirements/test.in
+	pip-compile --rebuild --upgrade -o requirements/travis.txt requirements/travis.in
+	pip-compile --rebuild --upgrade -o requirements/quality.txt requirements/quality.in
 	# Let tox control the django version for tests
 	sed '/^django==/d' requirements/test.txt > requirements/test.tmp
 	mv requirements/test.tmp requirements/test.txt

djpyfs/djpyfs.py

@@ -8,6 +8,7 @@
 3) The ability to create objects with a limited lifetime. A
 task can garbage-collect those objects.
 """
+# pylint: disable=W6100
 
 from __future__ import absolute_import
 
@@ -20,7 +21,6 @@
 from fs.osfs import OSFS
 from fs_s3fs import S3FS
 
-
 if hasattr(settings, 'DJFS'):
     DJFS_SETTINGS = settings.DJFS  # pragma: no cover
 else:
@@ -79,7 +79,8 @@ def patch_fs(fs, namespace, url_method):
     Returns:
         obj: Patched filesystem instance
     """
-    def expire(self, filename, seconds, days=0, expires=True):
+
+    def expire(self, filename, seconds, days=0, expires=True):  # pylint: disable=unused-argument
         """
         Set the lifespan of a file on the filesystem.
 
@@ -135,7 +136,7 @@ def get_s3fs(namespace):
         fullpath = os.path.join(DJFS_SETTINGS['prefix'], fullpath)
     s3fs = S3FS(DJFS_SETTINGS['bucket'], fullpath, aws_secret_access_key=key_id, aws_access_key_id=key_secret)
 
-    def get_s3_url(self, filename, timeout=60):
+    def get_s3_url(self, filename, timeout=60):  # pylint: disable=unused-argument
         """
         Patch method to returns a signed S3 url for the given filename
 

djpyfs/models.py

@@ -1,9 +1,15 @@
+"""
+Database models for django-pyfs
+"""
+# pylint: disable=W6100
 import os
 
 from django.db import models
 from django.utils import timezone
+from django.utils.encoding import python_2_unicode_compatible
 
 
+@python_2_unicode_compatible
 class FSExpirations(models.Model):
     """
     Model to handle expiring temporary files.
@@ -72,7 +78,7 @@ class Meta(object):
         ]
 
     def __str__(self):
-        if self.expires: 
-            return "{} Expires {}".format(os.path.join(self.module, self.filename), str(self.expiration))
+        if self.expires:
+            return u"{} Expires {}".format(os.path.join(self.module, self.filename), str(self.expiration))
         else:
-            return "{} Permanent ({})".format(os.path.join(self.module, self.filename), str(self.expiration))
+            return u"{} Permanent ({})".format(os.path.join(self.module, self.filename), str(self.expiration))

djpyfs/tests.py

@@ -1,14 +1,17 @@
+"""
+Database models for django-pyfs
+"""
+
 from __future__ import absolute_import, unicode_literals
-import six
 
-import shutil
 import os
+import shutil
 import sys
 import unittest
-from io import StringIO
 
 import boto
 import mock
+import six
 from django.test import TestCase
 from django.utils import timezone
 from fs.memoryfs import MemoryFS
@@ -19,7 +22,9 @@
 
 
 class FSExpirationsTest(TestCase):
+    """ Tests for FSExpirations"""
     def setUp(self):
+        super(FSExpirationsTest, self).setUp()
         self.fs = MemoryFS()
         self.test_file_path = '/foo/bar'
         self.expires = True
@@ -29,6 +34,7 @@ def setUp(self):
         self.module = "unittest"
 
     def tearDown(self):
+        super(FSExpirationsTest, self).tearDown()
         self.fs.close()
 
     def test_create_expiration_exists(self):
@@ -105,14 +111,17 @@ def test_str(self):
             try:
                 result = f.__str__()
                 self.assertTrue(isinstance(result, six.string_types))
-            except Exception as e:
+            except Exception as e:  # pylint: disable=broad-except
                 self.fail("__str__ raised an exception! {}".format(e))
 
 
+# pylint: disable=literal-used-as-attribute
 class _BaseFs(TestCase):
+    """Tests for BaseFs"""
     djfs_settings = None
 
     def setUp(self):
+        super(_BaseFs, self).setUp()
         if self.djfs_settings is None:
             raise unittest.SkipTest("Skipping test on base class.")
 
@@ -143,6 +152,7 @@ def setUp(self):
 
     def tearDown(self):
         # Restore original settings
+        super(_BaseFs, self).tearDown()
         djpyfs.DJFS_SETTINGS = self.orig_djpyfs_settings
 
     def test_get_filesystem(self):
@@ -152,6 +162,7 @@ def test_get_filesystem(self):
         fs.getinfo(self.test_dir_name)
         fs.removedir(self.test_dir_name)
 
+    # pylint: disable=no-member
     def test_expire_objects(self):
         expire_secs = 0
         expire_days = 0
@@ -166,7 +177,7 @@ def test_expire_objects(self):
         for curr_fs in (fs1, fs2):
             curr_fs.makedir(self.test_dir_name)
 
-            foo = 'foo'
+            foo = 'foo'  # pylint: disable=blacklisted-name
             curr_fs.settext(self.relative_path_to_test_file, foo, 'utf-8', 'strict')
             curr_fs.settext(self.relative_path_to_secondary_test_file, foo, 'utf-8', 'strict')
 
@@ -217,10 +228,11 @@ def test_patch_fs(self):
         Simple check to make sure the filesystem is patched as expected.
         """
         fs = djpyfs.get_filesystem(self.namespace)
-        self.assertTrue(callable(getattr(fs, 'expire')))
-        self.assertTrue(callable(getattr(fs, 'get_url')))
+        self.assertTrue(callable(getattr(fs, 'expire')))   # pylint: disable=literal-used-as-attribute
+        self.assertTrue(callable(getattr(fs, 'get_url')))  # pylint: disable=literal-used-as-attribute
 
 
+# pylint: disable=test-inherits-tests; literal-used-as-attribute
 class BadFileSystemTestInh(_BaseFs):
     """
     Test filesystem class that uses an unknown filesystem type to make sure all
@@ -253,6 +265,7 @@ def test_patch_fs(self):
             super(BadFileSystemTestInh, self).test_patch_fs()
 
 
+# pylint: disable=test-inherits-tests
 class OsfsTest(_BaseFs):
     """
     Tests the OSFS implementation.
@@ -277,6 +290,7 @@ def tearDown(self):
         self._cleanDirs()
 
 
+# pylint: disable=test-inherits-tests
 class S3Test(_BaseFs):
     """
     Tests the S3FS implementation, without a prefix.
@@ -307,6 +321,8 @@ def setUp(self):
         self._setUpS3()
 
     def _setUpS3(self):
+        """setup class"""
+
         # Start mocking S3
         self.mock_s3 = mock_s3()
         self.mock_s3.start()
@@ -330,6 +346,7 @@ def tearDown(self):
         super(S3Test, self).tearDown()
 
 
+# pylint: disable=test-inherits-tests
 class S3TestPrefix(S3Test):
     """
     Same as S3Test above, but includes a prefix.

example/example/settings.py

@@ -1,10 +1,10 @@
 # Django settings for example project.
 
-## CHANGED
-DJFS = {'type' : 'osfs',
-        'directory_root' : 'sample/static/djpyfs', 
-        'url_root' : '/static/djpyfs'}
-## /CHANGED
+# CHANGED
+DJFS = {'type': 'osfs',
+        'directory_root': 'sample/static/djpyfs',
+        'url_root': '/static/djpyfs'}
+# /CHANGED
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
@@ -17,12 +17,12 @@
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': 'db.sql',                      # Or path to database file if using sqlite3.
-        'USER': '',                      # Not used with sqlite3.
-        'PASSWORD': '',                  # Not used with sqlite3.
-        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
-        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
+        'ENGINE': 'django.db.backends.sqlite3',  # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': 'db.sql',  # Or path to database file if using sqlite3.
+        'USER': '',  # Not used with sqlite3.
+        'PASSWORD': '',  # Not used with sqlite3.
+        'HOST': '',  # Set to empty string for localhost. Not used with sqlite3.
+        'PORT': '',  # Set to empty string for default. Not used with sqlite3.
     }
 }
 
@@ -84,7 +84,7 @@
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+    #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
 # Make this unique, and don't share it with anybody.
@@ -94,10 +94,10 @@
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.Loader',
+    #     'django.template.loaders.eggs.Loader',
 )
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
@@ -125,7 +125,7 @@
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'djpyfs', ## <-- CHANGED
+    'djpyfs',  ## <-- CHANGED
     'sample',
     # Uncomment the next line to enable the admin:
     # 'django.contrib.admin',

example/sample/views.py

@@ -4,7 +4,7 @@
 from django.http import HttpResponse
 from djpyfs import djpyfs
 
-arrow = ["11011", 
+arrow = ["11011",
          "10001", 
          "00000", 
          "11011",