Merge branch 'release/0.1.2'

prawn-cake · Sep 19, 2015 · 7904bbf · 7904bbf
2 parents 9368e0b + 36345b4
commit 7904bbf
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 14 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.1.1
+current_version = 0.1.2
 tag = False
 tag_name = {new_version}
 commit = True

diff --git a/Makefile b/Makefile
@@ -2,7 +2,6 @@
 ENV_DIR=$(CURDIR)/.env
 PYTHON=$(ENV_DIR)/bin/python
 NOSE=$(ENV_DIR)/bin/nosetests
-COVERAGE=$(ENV_DIR)/bin/coverage
 PROJECT_NAME=pgclient
 CODE_DIR=$(CURDIR)/$(PROJECT_NAME)
 
@@ -29,15 +28,10 @@ test: env
 .PHONY: system_test
 system_test: env
 # target: test - Run system_test
-	@$(NOSE) $(CODE_DIR)/system_test/system_test.py
+	@$(NOSE) --with-coverage $(CODE_DIR)/system_test/system_test.py
 
 
 .PHONY: test_ci
 test_ci: env
 # target: test_ci - Run tests command adapt for CI systems
-	@$(NOSE) $(CODE_DIR)/tests
-
-.PHONY: test_coverage
-# target: test_coverage - Run tests with coverage
-test_coverage: env
-	@$(COVERAGE) run --source=$(PROJECT_NAME) $(NOSE) $(CODE_DIR)/tests.py
+	@$(NOSE) --with-coverage $(CODE_DIR)/tests
diff --git a/README.md b/README.md
@@ -4,10 +4,12 @@
 [![Coverage Status](https://coveralls.io/repos/prawn-cake/pgclient/badge.svg?branch=master&service=github)](https://coveralls.io/github/prawn-cake/pgclient?branch=master)
 
 
-pgclient - yet another pool-based psycopg2 wrapper. 
+pgclient - yet another pool-based python2/3 compatible psycopg2 wrapper. 
 
 The client is fully based on thread-safe connections pool and safe transactions executing
 
+*Tested on python2.7+, python3.4+*
+
 
 Quick start
 ===========

diff --git a/pgclient/__init__.py b/pgclient/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.1.1'
+__version__ = '0.1.2'
diff --git a/pgclient/client.py b/pgclient/client.py
@@ -51,7 +51,7 @@ def _get_cursor(self, cursor_factory=None):
             conn.commit()
         except psycopg2.DatabaseError as err:
             conn.rollback()
-            raise psycopg2.DatabaseError(err.message)
+            raise psycopg2.DatabaseError(str(err))
         finally:
             self.release_conn(conn)
 

diff --git a/pgclient/system_test/system_test.py b/pgclient/system_test/system_test.py
@@ -115,7 +115,7 @@ def test_rollback_transaction(self):
                         self.TABLE_NAME),
                     (None, ))
                 print('abc')
-        self.assertIn('null value in column', err.exception.message)
+        self.assertIn('null value in column', str(err.exception))
         print('transaction finished')
 
     def test_connection_pool_overflow(self):

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='pgclient',
-    version='0.1.1',
+    version='0.1.2',
     packages=['pgclient'],
     url='https://github.com/prawn-cake/pgclient',
     license='MIT',