Merge pull request #11 from 4Catalyzer/freshen

Drop six. Add some love.

.travis.yml

@@ -0,0 +1,28 @@
+sudo: false
+
+language: python
+python:
+  - "2.7"
+  - "3.4"
+  - "3.5"
+  - "pypy"
+
+env:
+  - TOXENV=py-base
+  - TOXENV=py-s3
+
+cache:
+  directories:
+    - $HOME/.cache/pip
+
+before_install:
+  - pip install -U pip
+install:
+  - pip install -U tox
+
+script:
+  - python setup.py test
+
+branches:
+  only:
+    - master

README.md

@@ -1,4 +1,6 @@
-# flask-annex 
-Efficient integration of external storage services for Flask.
+# Flask-Annex [![PyPI][pypi-badge]][pypi]
+Efficient integration of external storage services for
+[Flask](http://flask.pocoo.org/).
 
-[![PyPI version](https://badge.fury.io/py/Flask-Annex.svg)](http://badge.fury.io/py/Flask-Annex)
+[pypi-badge]: https://img.shields.io/pypi/v/Flask-Annex.svg
+[pypi]: https://pypi.python.org/pypi/Flask-Annex

flask_annex/__init__.py

@@ -1,8 +1,6 @@
 from .base import AnnexBase
 from . import utils
 
-__all__ = ('Annex',)
-
 # -----------------------------------------------------------------------------
 
 

flask_annex/base.py

@@ -1,6 +1,6 @@
 from abc import ABCMeta, abstractmethod
-from six import with_metaclass
 
+from .compat import with_metaclass
 from . import utils
 
 # -----------------------------------------------------------------------------

flask_annex/compat.py

@@ -0,0 +1,24 @@
+import sys
+
+# -----------------------------------------------------------------------------
+
+PY2 = sys.version_info[0] == 2
+
+# -----------------------------------------------------------------------------
+
+if PY2:
+    string_types = (str, unicode)  # flake8: noqa
+else:
+    string_types = (str,)
+
+
+# From six.
+def with_metaclass(meta, *bases):
+    """Create a base class with a metaclass."""
+    # This requires a bit of explanation: the basic idea is to make a dummy
+    # metaclass for one level of class instantiation that replaces itself with
+    # the actual metaclass.
+    class metaclass(meta):
+        def __new__(cls, name, this_bases, d):
+            return meta(name, bases, d)
+    return type.__new__(metaclass, 'temporary_class', (), {})

flask_annex/file.py

@@ -3,11 +3,9 @@
 import glob
 import os
 import shutil
-from six import string_types
 
 from .base import AnnexBase
-
-__all__ = ('FileAnnex',)
+from .compat import string_types
 
 # -----------------------------------------------------------------------------
 
@@ -77,5 +75,5 @@ def send_file(self, key):
         return flask.send_from_directory(
             self._root_path, key,
             as_attachment=True,
-            attachment_filename=os.path.basename(key)
+            attachment_filename=os.path.basename(key),
         )

flask_annex/s3.py

@@ -2,11 +2,9 @@
 from boto.s3.key import Key
 import flask
 import mimetypes
-from six import string_types
 
 from .base import AnnexBase
-
-__all__ = ('S3Annex',)
+from .compat import string_types
 
 # -----------------------------------------------------------------------------
 
@@ -16,11 +14,12 @@
 
 
 class S3Annex(AnnexBase):
-    def __init__(self, access_key_id, secret_access_key, bucket_name,
-                 url_expires_in=DEFAULT_URL_EXPIRES_IN):
+    def __init__(
+            self, access_key_id, secret_access_key, bucket_name,
+            url_expires_in=DEFAULT_URL_EXPIRES_IN):
         self._connection = S3Connection(access_key_id, secret_access_key)
         self._bucket = self._connection.get_bucket(
-            bucket_name, validate=False
+            bucket_name, validate=False,
         )
 
         self._url_expires_in = url_expires_in

flask_annex/utils.py

@@ -1,7 +1,5 @@
 import os
 
-__all__ = ('get_config_from_env',)
-
 # -----------------------------------------------------------------------------
 
 

setup.cfg

@@ -1,2 +1,2 @@
-[metadata]
-description-file = README.md
+[wheel]
+universal=1

setup.py

@@ -1,4 +1,26 @@
-from setuptools import setup
+from setuptools import Command, setup
+import subprocess
+
+# -----------------------------------------------------------------------------
+
+
+def system(command):
+    class SystemCommand(Command):
+        user_options = []
+
+        def initialize_options(self):
+            pass
+
+        def finalize_options(self):
+            pass
+
+        def run(self):
+            subprocess.check_call(command, shell=True)
+
+    return SystemCommand
+
+
+# -----------------------------------------------------------------------------
 
 setup(
     name="Flask-Annex",
@@ -18,15 +40,22 @@
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
-        'Topic :: Software Development :: Libraries :: Python Modules'
+        'Topic :: Software Development :: Libraries :: Python Modules',
     ),
     keywords='storage s3 flask',
     packages=('flask_annex',),
     install_requires=(
-        'Flask',
-        'six'
+        'Flask >= 0.10',
     ),
     extras_require={
-        's3': ('boto',)
-    }
+        's3': ('boto >= 2.38.0',),
+    },
+    cmdclass={
+        'clean': system('rm -rf build dist *.egg-info'),
+        'package': system('python setup.py pandoc sdist bdist_wheel'),
+        'pandoc': system('pandoc README.md -o README.rst'),
+        'publish': system('twine upload dist/*'),
+        'release': system('python setup.py clean package publish'),
+        'test': system('tox'),
+    },
 )

tox.ini

@@ -0,0 +1,11 @@
+[tox]
+envlist = py{27,35}-{base,s3}
+
+[testenv]
+deps =
+    flake8
+
+commands =
+    s3: pip install .[s3]
+
+    flake8 .