Merge pull request #67 from nicoddemus/setuptools_scm

Setuptools scm

Author: nicoddemus

.gitignore

@@ -20,7 +20,7 @@ sdist/
 var/
 *.egg-info/
 .installed.cfg
-*.egg
+*.egg*
 
 # Installer logs
 pip-log.txt
@@ -54,3 +54,5 @@ docs/_build/
 
 # Virtual Envs
 .env*
+
+_pytest_mock_version.py

.travis.yml

@@ -1,14 +1,25 @@
 language: python
 python:
   - "3.5"
-  - "nightly"
+  - "3.6-dev"
 
 install:
   - pip install tox coveralls
 
 script:
-  - if [[ $TRAVIS_PYTHON_VERSION != nightly ]]; then tox; fi
-  - if [[ $TRAVIS_PYTHON_VERSION == nightly ]]; then tox -e py36-pytest28,py36-pytest29,py36-pytest30; fi
+  - if [[ $TRAVIS_PYTHON_VERSION != 3.6-dev ]]; then tox; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == 3.6-dev ]]; then tox -e py36-pytest28,py36-pytest29,py36-pytest30; fi
 
 after_success:
   - coveralls
+
+deploy:
+  provider: pypi
+  user: nicoddemus
+  password:
+    secure: bB4adUZVIkt31cmNklskyIDNehujKToGnStnlunp7P8CBF6CGeNqkYU17emAPvfZbTb/ClUpiO9r6AD1ej32Uyr+I8qUyhuYtHG3JGp+WRR/tw+ytAZIJ9i+PMjBv1RAdyLENJ/Tx0LKHKsABr8dQIieLFqKZJuT77f/5ZkvI/U=
+  on:
+    tags: true
+    distributions: sdist bdist_wheel
+    repo: pytest-dev/pytest-mock
+    condition: $TRAVIS_PYTHON_VERSION = 3.5

pytest_mock.py

@@ -7,7 +7,8 @@
 except ImportError:
     import unittest.mock as mock_module
 
-version = '1.2'
+from _pytest_mock_version import version
+__version__ = version
 
 
 class MockFixture(object):

setup.py

@@ -2,25 +2,22 @@
 
 from setuptools import setup
 
-with open('pytest_mock.py') as f:
-    m = re.search("version = '(.*)'", f.read())
-    assert m is not None
-    version = m.group(1)
 
 setup(
     name='pytest-mock',
-    version=version,
     entry_points={
         'pytest11': ['pytest_mock = pytest_mock'],
     },
-    py_modules=['pytest_mock'],
+    py_modules=['pytest_mock', '_pytest_mock_version'],
     platforms='any',
     install_requires=[
         'pytest>=2.7',
     ],
     extras_require={
         ':python_version=="2.6" or python_version=="2.7"': ['mock'],
     },
+    use_scm_version={'write_to': '_pytest_mock_version.py'},
+    setup_requires=['setuptools_scm'],
     url='https://github.com/pytest-dev/pytest-mock/',
     license='MIT',
     author='Bruno Oliveira',

tox.ini

@@ -8,8 +8,7 @@ deps =
     pytest27: pytest~=2.7
     pytest28: pytest~=2.8
     pytest29: pytest~=2.9
-    # temporary until 3.0.3 is released
-    pytest30: git+https://github.com/pytest-dev/pytest@master
+    pytest30: pytest~=3.0
 commands =
     coverage run --append --source=pytest_mock.py -m pytest test_pytest_mock.py