Release 2.0.0 #254 Update changelog, version string , use pytest instead of py.test in makefile

dhoomakethu · dhoomakethu · commit a4480f64ee29 · 2018-09-21T19:30:24.000+05:30
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,4 +1,4 @@
-Version 2.0.0rc2
+Version 2.0.0
 -----------------------------------------------------------
 **Note This is a Major release and might affect your existing Async client implementation. Refer examples on how to use the latest async clients.**
 
diff --git a/Makefile b/Makefile
@@ -39,7 +39,7 @@ check: install
 
 test: install
 	@pip install --quiet --requirement=requirements-tests.txt
-	@py.test --cov=pymodbus/ --cov-report term-missing
+	@pytest --cov=pymodbus/ --cov-report term-missing
 	@coverage report --fail-under=90
 
 tox: install
diff --git a/pymodbus/version.py b/pymodbus/version.py
@@ -41,7 +41,7 @@ def __str__(self):
         return '[%s, version %s]' % (self.package, self.short())
 
 
-version = Version('pymodbus', 2, 0, 0, "rc2")
+version = Version('pymodbus', 2, 0, 0)
 
 
 version.__name__ = 'pymodbus'  # fix epydoc error

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Version 2.0.0rc2`
	`1`	`+Version 2.0.0`
`2`	`2`	`-----------------------------------------------------------`
`3`	`3`	`Note This is a Major release and might affect your existing Async client implementation. Refer examples on how to use the latest async clients.`
`4`	`4`