|
From: Oleg B. <no...@so...> - 2016-09-22 21:38:53
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".
The branch, master has been updated
via 02ed37636dd173e8836d84bd7bf18998d937352b (commit)
from 804bfd1762c8316393c3fa8815a54f73df6bada8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/02ed37636dd173e8836d84bd7bf18998d937352b
commit 02ed37636dd173e8836d84bd7bf18998d937352b
Author: Oleg Broytman <ph...@ph...>
Date: Thu Sep 22 23:37:58 2016 +0300
Remove SQLObjectClass from conftest.py
It's no longer required - we don't have any non-test class named TestXXX.
diff --git a/sqlobject/conftest.py b/sqlobject/conftest.py
index 1d9dc26..bcd2f7b 100644
--- a/sqlobject/conftest.py
+++ b/sqlobject/conftest.py
@@ -3,12 +3,9 @@ This module is used by py.test to configure testing for this
application.
"""
-import py
-import sqlobject
-
try:
import pkg_resources
-except ImportError: # Python 2.2
+except ImportError:
pass
else:
pkg_resources.require('SQLObject')
@@ -65,16 +62,6 @@ def pytest_configure(config):
option = config.option
-class SQLObjectClass(py.test.collect.Class):
- def run(self):
- if (isinstance(self.obj, type) and
- issubclass(self.obj, sqlobject.SQLObject)):
- return []
- return super(SQLObjectClass, self).run()
-
-Class = SQLObjectClass
-
-
def setup_tests():
if option.debug_events:
from sqlobject import events
-----------------------------------------------------------------------
Summary of changes:
sqlobject/conftest.py | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
