Merge pull request #13 from gmr/master

Prep for 1.2

.gitignore

@@ -1,6 +1,8 @@
 # Editor
 *.swp
 *.swo
+.idea
+.vscode
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

.travis.yml

@@ -4,20 +4,22 @@ sudo: false
 language: python
 python:
   - 2.7
-  - pypy
-  - 3.4
   - 3.5
+  - 3.6
+  - 3.7-dev
+  - pypy
+  - pypy3
 install:
   - pip install -r test-requirements.txt
-  - pip install -e .
+  - pip install -r requirements.txt
 script: nosetests
 after_success:
   - codecov
 deploy:
   distributions: sdist bdist_wheel
   provider: pypi
   on:
-    python: 2.7
+    python: 3.6
     tags: true
     all_branches: true
   user: sprockets

dev-requirements.txt

@@ -1,6 +1,3 @@
--r requirements.txt
--r test-requirements.txt
-flake8>=2.1,<3
 sphinx>=1.2,<2
 sphinx-rtd-theme>=0.1,<1.0
 sphinxcontrib-httpdomain>=1.2,<2

docs/index.rst

@@ -34,10 +34,13 @@ http://localhost:8000/whatever provided that *whatever* is not an integer.
 
 Version History
 ---------------
-* `1.1.3`_
+
+* `1.2.0`_
 
   - Extend raven pin so that we can use python 3.7
   - Advertise python 3.7 support
+  - Drop python 3.4 from support matrix
+  - Remove unused import of urllib.parse
 
 * `1.1.2`_
 
@@ -104,8 +107,8 @@ License
 .. _1.1.0: https://github.com/sprockets/sprockets.mixins.sentry/compare/1.0.0...1.1.0
 .. _1.1.1: https://github.com/sprockets/sprockets.mixins.sentry/compare/1.1.0...1.1.1
 .. _1.1.2: https://github.com/sprockets/sprockets.mixins.sentry/compare/1.1.1...1.1.2
-.. _1.1.3: https://github.com/sprockets/sprockets.mixins.sentry/compare/1.1.2...1.1.3
-.. _Next Release: https://github.com/sprockets/sprockets.mixins.sentry/compare/1.1.3...HEAD
+.. _1.2.0: https://github.com/sprockets/sprockets.mixins.sentry/compare/1.1.2...1.2.0
+.. _Next Release: https://github.com/sprockets/sprockets.mixins.sentry/compare/1.2.0...HEAD
 
 .. |Version| image:: https://badge.fury.io/py/sprockets.mixins.sentry.svg?
    :target: http://badge.fury.io/py/sprockets.mixins.sentry

setup.py

@@ -29,7 +29,7 @@ def read_requirements_file(req_name):
 
 setuptools.setup(
     name='sprockets.mixins.sentry',
-    version='1.1.3',
+    version='1.2.0',
     description='A RequestHandler mixin for sending exceptions to Sentry',
     long_description=codecs.open('README.rst', encoding='utf-8').read(),
     url='https://github.com/sprockets/sprockets.mixins.sentry.git',
@@ -45,7 +45,6 @@ def read_requirements_file(req_name):
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',

sprockets/mixins/sentry/__init__.py

@@ -4,36 +4,31 @@
 A RequestHandler mixin for sending exceptions to Sentry
 
 """
-version_info = (1, 1, 2)
-__version__ = '.'.join(str(v) for v in version_info)
-
-
 import logging
 import math
 import os
 import re
 import sys
 import time
-try:
-    from urllib import parse
-except ImportError:  # pragma no cover
-    import urlparse as parse
 
 import raven
 from raven.processors import SanitizePasswordsProcessor
 from tornado import web
 
+LOGGER = logging.getLogger(__name__)
+SENTRY_CLIENT = 'sentry_client'
+
+version_info = (1, 2, 0)
+__version__ = '.'.join(str(v) for v in version_info)
+
+
 if sys.version_info[0] == 3:
     string_types = str
     text_type = str
 else:
     string_types = basestring
     text_type = unicode
 
-
-LOGGER = logging.getLogger(__name__)
-SENTRY_CLIENT = 'sentry_client'
-
 # This matches the userinfo production from RFC3986 with some extra
 # leniancy to account for poorly formed URLs.  For example, it lets
 # you include braces and other things in the password section.

test-requirements.txt

@@ -2,3 +2,4 @@ coverage>=3.7,<4
 codecov
 mock>=1.0.1,<2
 nose>=1.3,<2
+flake8>=2.1,<3