Merge pull request #4 from studio3104/setuptools_scm

Adopt `setuptools_scm` for versioning by git tag

Author: studio3104

pytest_chalice/__init__.py

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*
+
+from pkg_resources import get_distribution, DistributionNotFound
+
+
+try:
+    __version__ = get_distribution(__name__).version
+except DistributionNotFound:
+    pass

pytest_chalice/fixtures.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+
+import pytest
+
+from .handlers import RequestHandler
+
+
+@pytest.fixture
+def client(app):
+    yield RequestHandler(app)

pytest_chalice.py renamed to pytest_chalice/handlers.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import pytest
-
 import json
 from logging import getLogger
 import re
@@ -88,8 +86,3 @@ def request(path, headers={}, body=''):
             return ResponseHandler(response)
 
         return request
-
-
-@pytest.fixture
-def client(app):
-    yield RequestHandler(app)

pytest_chalice/plugin.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+
+from .fixtures import client  # noqa
+
+
+def pytest_configure(config):
+    config.addinivalue_line(
+        'markers',
+        'app: A Chalice application object',
+    )

setup.py

@@ -3,7 +3,7 @@
 
 import os
 import codecs
-from setuptools import setup
+from setuptools import find_packages, setup
 
 
 def read(fname):
@@ -13,21 +13,26 @@ def read(fname):
 
 setup(
     name='pytest-chalice',
-    version='0.0.1',
+    license='MIT',
+
     author='Satoshi SUZUKI',
     author_email='[email protected]',
     maintainer='Satoshi SUZUKI',
     maintainer_email='[email protected]',
-    license='MIT',
+
     url='https://github.com/studio3104/pytest-chalice',
     description='A set of py.test fixtures for AWS Chalice',
     long_description=read('README.rst'),
-    py_modules=['pytest_chalice'],
+    packages=find_packages(exclude=['docs', 'tests']),
     python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
     install_requires=[
         'chalice>=1.8.0',
         'pytest>=3.5.0',
     ],
+
+    setup_requires=['setuptools_scm'],
+    use_scm_version=True,
+
     classifiers=[
         'Development Status :: 4 - Beta',
         'Framework :: Pytest',
@@ -46,9 +51,10 @@ def read(fname):
         'Operating System :: OS Independent',
         'License :: OSI Approved :: MIT License',
     ],
+
     entry_points={
         'pytest11': [
-            'chalice = pytest_chalice',
+            'chalice = pytest_chalice.plugin',
         ],
     },
 )