Merge branch 'release-1.0.0'

nicoddemus · nicoddemus · commit e5e3595195ba · 2018-04-26T20:38:43.000-03:00
diff --git a/.pytest.py b/.pytest.py
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 1.0.1
+
+- Use universal newlines for running Google tests (#33).
+  Thanks @elkin for the PR.
+
 # 0.4.5
 
 - Properly handle fatal errors in Boost.Test.
diff --git a/setup.py b/setup.py
@@ -3,7 +3,8 @@
 
 setup(
     name="pytest-cpp",
-    version='0.4.5',
+    use_scm_version=True,
+    setup_requires=['setuptools_scm'],
     packages=['pytest_cpp'],
     entry_points={
         'pytest11': ['cpp = pytest_cpp.plugin'],
diff --git a/tox.ini b/tox.ini
@@ -7,5 +7,5 @@ deps=pytest
     pytest-xdist
     coverage    
 commands=
-    coverage run --source=pytest_cpp .pytest.py
+    coverage run --source=pytest_cpp -m pytest tests
     py.test -n8 tests
