add internal nose2 (not available on precise) and update internal six

for processing tests
qgis · Feb 6, 2016 · 1ae03be · 1ae03be
1 parent 8cdd723
commit 1ae03be
Show file tree

Hide file tree

Showing 111 changed files with 11,266 additions and 59 deletions.
diff --git a/debian/control.in b/debian/control.in
@@ -38,13 +38,15 @@ Build-Depends:
  python-qt4 (>= 4.1.0),
  python-qt4-dev,
  python-qt4-sql,
+ python-yaml, python-mock,
 #precise saucy wheezy# python,
 #precise saucy# python-central (>= 0.5),
 #saucy wheezy# python-dev,
 #saucy# libpython2.7-dev,
 #sid stretch jessie trusty utopic vivid wily# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
 #sid stretch jessie wily# pyqt4.qsci-dev,
 #sid stretch jessie trusty utopic vivid wily# python-pyspatialite,
+#sid wheezy jessie stretch trusty vivid wily# python-nose2,
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
  libosgearth-dev,

diff --git a/debian/rules b/debian/rules
@@ -70,7 +70,7 @@ CMAKE_OPTS := \
 	-DWITH_INTERNAL_PYGMENTS=FALSE \
 	-DWITH_INTERNAL_DATEUTIL=FALSE \
 	-DWITH_INTERNAL_PYTZ=FALSE \
-	-DWITH_INTERNAL_SIX=FALSE \
+	-DWITH_INTERNAL_YAML=FALSE \
 	-DQT_TAG_FILE=/usr/share/qt4/doc/html/qt.tags \
 	-DQT_DOC_URL=/usr/share/qt4/doc/html/
 
@@ -91,6 +91,12 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	MAKEFLAGS += -j$(NUMJOBS)
 endif
 
+ifneq (,$(findstring $(DISTRIBUTION),"precise"))
+	CMAKE_OPTS += -DWITH_INTERNAL_NOSE2=TRUE -DWITH_INTERNAL_SIX=TRUE
+else
+	CMAKE_OPTS += -DWITH_INTERNAL_NOSE2=FALSE -DWITH_INTERNAL_SIX=FALSE
+endif
+
 ifneq (,$(findstring $(DISTRIBUTION),"wheezy precise"))
 	CMAKE_OPTS += -DWITH_PYSPATIALITE=TRUE
 endif

diff --git a/python/ext-libs/CMakeLists.txt b/python/ext-libs/CMakeLists.txt
@@ -33,7 +33,7 @@ MACRO(EXT_PYLIB lib)
   ENDIF(WITH_INTERNAL_${ulib})
 ENDMACRO(EXT_PYLIB lib)
 
-FOREACH(pkg httplib2 jinja2 markupsafe owslib pygments dateutil pytz yaml)
+FOREACH(pkg httplib2 jinja2 markupsafe owslib pygments dateutil pytz yaml nose2)
   EXT_PYLIB(${pkg})
 ENDFOREACH(pkg)
 

diff --git a/python/ext-libs/nose2-0.5.0.egg-info/PKG-INFO b/python/ext-libs/nose2-0.5.0.egg-info/PKG-INFO
@@ -0,0 +1,75 @@
+Metadata-Version: 1.1
+Name: nose2
+Version: 0.5.0
+Summary: nose2 is the next generation of nicer testing for Python
+Home-page: https://github.com/nose-devs/nose2
+Author: Jason Pellerin
+Author-email: jpellerin+nose@gmail.com
+License: UNKNOWN
+Description: .. image:: https://travis-ci.org/nose-devs/nose2.png?branch=master
+            :target: https://travis-ci.org/nose-devs/nose2
+            :alt: Build Status
+
+        .. image:: https://coveralls.io/repos/nose-devs/nose2/badge.png?branch=master
+            :target: https://coveralls.io/r/nose-devs/nose2?branch=master
+            :alt: Coverage Status
+
+        .. image:: https://landscape.io/github/nose-devs/nose2/master/landscape.png
+           :target: https://landscape.io/github/nose-devs/nose2/master
+           :alt: Code Health
+
+        .. image:: https://pypip.in/v/nose2/badge.png
+            :target: https://crate.io/packages/nose2/
+            :alt: Latest PyPI version
+
+        .. image:: https://pypip.in/d/nose2/badge.png
+            :target: https://crate.io/packages/nose2/
+            :alt: Number of PyPI downloads
+
+        .. image:: https://www.versioneye.com/user/projects/52037a30632bac57a00257ea/badge.png
+            :target: https://www.versioneye.com/user/projects/52037a30632bac57a00257ea/
+            :alt: Dependencies Status    
+
+        Welcome to nose2
+        ================
+
+        nose2 is the next generation of nicer testing for Python, based
+        on the plugins branch of unittest2. nose2 aims to improve on nose by:
+
+         * providing a better plugin api
+         * being easier for users to configure
+         * simplifying internal interfaces and processes
+         * supporting Python 2 and 3 from the same codebase, without translation
+         * encourging greater community involvement in its development
+
+        In service of some those goals, some features of nose *will not* be
+        supported in nose2. See `differences`_ for a thorough rundown.
+
+        In time -- once unittest2 supports plugins -- nose2 should be able to
+        become just a collection of plugins and configuration defaults. For
+        now, it provides a plugin api similar to the one in the unittest2
+        plugins branch, and overrides various unittest2 objects.
+
+        You are witnesses at the new birth of nose, mark 2. Hope you enjoy our
+        new direction!
+
+        .. _differences: http://readthedocs.org/docs/nose2/en/latest/differences.html
+
+Keywords: unittest,testing,tests
+Platform: UNKNOWN
+Classifier: Development Status :: 3 - Alpha
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.2
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Software Development :: Testing
diff --git a/...1.7.3-py2.7.egg-info/dependency_links.txt → ...nose2-0.5.0.egg-info/dependency_links.txt b/...1.7.3-py2.7.egg-info/dependency_links.txt → ...nose2-0.5.0.egg-info/dependency_links.txt
diff --git a/python/ext-libs/nose2-0.5.0.egg-info/entry_points.txt b/python/ext-libs/nose2-0.5.0.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+[console_scripts]
+nose2 = nose2:discover
+nose2-2.7 = nose2:discover
+
diff --git a/python/ext-libs/nose2-0.5.0.egg-info/requires.txt b/python/ext-libs/nose2-0.5.0.egg-info/requires.txt
@@ -0,0 +1,3 @@
+
+[coverage_plugin]
+cov-core>=1.12
diff --git a/python/ext-libs/nose2-0.5.0.egg-info/top_level.txt b/python/ext-libs/nose2-0.5.0.egg-info/top_level.txt
@@ -0,0 +1 @@
+nose2
diff --git a/python/ext-libs/nose2/__init__.py b/python/ext-libs/nose2/__init__.py
@@ -0,0 +1 @@
+from nose2.main import discover, main
diff --git a/python/ext-libs/nose2/__main__.py b/python/ext-libs/nose2/__main__.py
@@ -0,0 +1,12 @@
+"""Main entry point"""
+
+import sys
+if sys.argv[0].endswith("__main__.py"):
+    sys.argv[0] = "nose2"
+
+__unittest = True
+
+
+if __name__ == '__main__':
+    from nose2 import discover
+    discover()
diff --git a/python/ext-libs/nose2/backports/__init__.py b/python/ext-libs/nose2/backports/__init__.py