Hello community,
here is the log from the commit of package python-django-nose for
openSUSE:Factory checked in at 2015-05-07 09:22:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-django-nose (Old)
and /work/SRC/openSUSE:Factory/.python-django-nose.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django-nose"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-django-nose/python-django-nose.changes
2013-10-25 11:13:53.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.python-django-nose.new/python-django-nose.changes
2015-05-07 09:22:26.000000000 +0200
@@ -1,0 +2,13 @@
+Mon May 4 10:47:54 UTC 2015 - [email protected]
+
+- update to version 1.4:
+ * Django 1.8 support (timc3, adepue, jwhitlock)
+ * Support --testrunner option (st3lk)
+ * Fix REUSE_DB second run in py3k (edrmp)
+- additional chanes from version 1.3:
+ * Django 1.6 and 1.7 support (conrado, co3k, Nepherhotep,
+ mbertheau)
+ * Python 3.3 and 3.4 testing and support (frewsxcv, jsocol)
+- point the source URL to pypi
+
+-------------------------------------------------------------------
Old:
----
django-nose-1.2.tar.gz
New:
----
django-nose-1.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-django-nose.spec ++++++
--- /var/tmp/diff_new_pack.CX0axq/_old 2015-05-07 09:22:27.000000000 +0200
+++ /var/tmp/diff_new_pack.CX0axq/_new 2015-05-07 09:22:27.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-django-nose
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,13 @@
Name: python-django-nose
-Version: 1.2
+Version: 1.4
Release: 0
Url: http://github.com/jbalogh/django-nose
Summary: Django test runner that uses nose
License: BSD-3-Clause
Group: Development/Languages/Python
-Source: django-nose-%{version}.tar.gz
+Source:
https://pypi.python.org/packages/source/d/django-nose/django-nose-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: python-devel
BuildRequires: python-setuptools
++++++ django-nose-1.2.tar.gz -> django-nose-1.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-nose-1.2/PKG-INFO new/django-nose-1.4/PKG-INFO
--- old/django-nose-1.2/PKG-INFO 2013-07-23 19:25:15.000000000 +0200
+++ new/django-nose-1.4/PKG-INFO 2015-04-24 02:57:40.000000000 +0200
@@ -1,8 +1,8 @@
Metadata-Version: 1.1
Name: django-nose
-Version: 1.2
+Version: 1.4
Summary: Makes your Django tests simple and snappy
-Home-page: http://github.com/jbalogh/django-nose
+Home-page: http://github.com/django-nose/django-nose
Author: Erik Rose
Author-email: [email protected]
License: BSD
@@ -10,8 +10,8 @@
django-nose
===========
- .. image:: https://travis-ci.org/jbalogh/django-nose.png
- :target: https://travis-ci.org/jbalogh/django-nose
+ .. image:: https://travis-ci.org/django-nose/django-nose.png
+ :target: https://travis-ci.org/django-nose/django-nose
Features
--------
@@ -46,7 +46,7 @@
The development version can be installed with... ::
- pip install -e
git://github.com/jbalogh/django-nose.git#egg=django-nose
+ pip install -e
git://github.com/django-nose/django-nose.git#egg=django-nose
Since django-nose extends Django's built-in test command, you should
add it to
your ``INSTALLED_APPS`` in ``settings.py``::
@@ -275,7 +275,7 @@
Older Versions of Django
------------------------
Upgrading from Django <= 1.3 to Django 1.4
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In versions of Django < 1.4 the project folder was in fact a python
package as
well (note the __init__.py in your project root). In Django 1.4, there
is no
such file and thus the project is not a python module.
@@ -294,8 +294,6 @@
django-nose's test runner it will try to find your urls.py file in
`'my_project.my_project.urls'`.
-
-
Upgrading from Django < 1.2
~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -317,7 +315,7 @@
~~~~~~~~~~
If you want to use django-nose with Django 1.1, use
- https://github.com/jbalogh/django-nose/tree/django-1.1 or
+ https://github.com/django-nose/django-nose/tree/django-1.1 or
http://pypi.python.org/pypi/django-nose/0.0.3.
Django 1.0
@@ -328,6 +326,18 @@
Recent Version History
----------------------
+ 1.4 (2015-04-23)
+ * Django 1.8 support (timc3, adepue, jwhitlock)
+ * Support --testrunner option (st3lk)
+ * Fix REUSE_DB second run in py3k (edrmp)
+
+ 1.3 (2014-12-05)
+ * Django 1.6 and 1.7 support (conrado, co3k, Nepherhotep, mbertheau)
+ * Python 3.3 and 3.4 testing and support (frewsxcv, jsocol)
+
+ 1.2 (2013-07-23)
+ * Python 3 support (melinath and jonashaag)
+ * Django 1.5 compat (fabiosantoscode)
1.1 (2012-05-19)
* Django TransactionTestCases don't clean up after themselves; they
leave
@@ -375,5 +385,7 @@
Classifier: Programming Language :: Python :: 2
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
Classifier: Topic :: Software Development :: Testing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-nose-1.2/README.rst
new/django-nose-1.4/README.rst
--- old/django-nose-1.2/README.rst 2013-03-28 05:06:14.000000000 +0100
+++ new/django-nose-1.4/README.rst 2015-04-23 22:57:35.000000000 +0200
@@ -2,8 +2,8 @@
django-nose
===========
-.. image:: https://travis-ci.org/jbalogh/django-nose.png
- :target: https://travis-ci.org/jbalogh/django-nose
+.. image:: https://travis-ci.org/django-nose/django-nose.png
+ :target: https://travis-ci.org/django-nose/django-nose
Features
--------
@@ -38,7 +38,7 @@
The development version can be installed with... ::
- pip install -e git://github.com/jbalogh/django-nose.git#egg=django-nose
+ pip install -e git://github.com/django-nose/django-nose.git#egg=django-nose
Since django-nose extends Django's built-in test command, you should add it to
your ``INSTALLED_APPS`` in ``settings.py``::
@@ -267,7 +267,7 @@
Older Versions of Django
------------------------
Upgrading from Django <= 1.3 to Django 1.4
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In versions of Django < 1.4 the project folder was in fact a python package as
well (note the __init__.py in your project root). In Django 1.4, there is no
such file and thus the project is not a python module.
@@ -286,8 +286,6 @@
django-nose's test runner it will try to find your urls.py file in
`'my_project.my_project.urls'`.
-
-
Upgrading from Django < 1.2
~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -309,7 +307,7 @@
~~~~~~~~~~
If you want to use django-nose with Django 1.1, use
-https://github.com/jbalogh/django-nose/tree/django-1.1 or
+https://github.com/django-nose/django-nose/tree/django-1.1 or
http://pypi.python.org/pypi/django-nose/0.0.3.
Django 1.0
@@ -320,6 +318,18 @@
Recent Version History
----------------------
+1.4 (2015-04-23)
+ * Django 1.8 support (timc3, adepue, jwhitlock)
+ * Support --testrunner option (st3lk)
+ * Fix REUSE_DB second run in py3k (edrmp)
+
+1.3 (2014-12-05)
+ * Django 1.6 and 1.7 support (conrado, co3k, Nepherhotep, mbertheau)
+ * Python 3.3 and 3.4 testing and support (frewsxcv, jsocol)
+
+1.2 (2013-07-23)
+ * Python 3 support (melinath and jonashaag)
+ * Django 1.5 compat (fabiosantoscode)
1.1 (2012-05-19)
* Django TransactionTestCases don't clean up after themselves; they leave
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-nose-1.2/django_nose/__init__.py
new/django-nose-1.4/django_nose/__init__.py
--- old/django-nose-1.2/django_nose/__init__.py 2013-03-28 03:40:25.000000000
+0100
+++ new/django-nose-1.4/django_nose/__init__.py 2015-04-23 22:01:07.000000000
+0200
@@ -1,4 +1,4 @@
-VERSION = (1, 1, 0)
+VERSION = (1, 3, 0)
__version__ = '.'.join(map(str, VERSION))
from django_nose.runner import *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-nose-1.2/django_nose/plugin.py
new/django-nose-1.4/django_nose/plugin.py
--- old/django-nose-1.2/django_nose/plugin.py 2013-06-20 18:22:41.000000000
+0200
+++ new/django-nose-1.4/django_nose/plugin.py 2015-04-23 22:01:07.000000000
+0200
@@ -48,6 +48,7 @@
"""
name = 'django setup'
+ score = 150
def __init__(self, runner):
super(DjangoSetUpPlugin, self).__init__()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-nose-1.2/django_nose/runner.py
new/django-nose-1.4/django_nose/runner.py
--- old/django-nose-1.2/django_nose/runner.py 2013-07-23 19:23:04.000000000
+0200
+++ new/django-nose-1.4/django_nose/runner.py 2015-04-23 22:50:04.000000000
+0200
@@ -13,15 +13,31 @@
from optparse import make_option
from types import MethodType
+import django
from django.conf import settings
from django.core import exceptions
from django.core.management.base import BaseCommand
from django.core.management.color import no_style
from django.core.management.commands.loaddata import Command
-from django.db import connections, transaction, DEFAULT_DB_ALIAS, models
-from django.db.backends.creation import BaseDatabaseCreation
-from django.test.simple import DjangoTestSuiteRunner
-from django.utils.importlib import import_module
+from django.db import connections, transaction, DEFAULT_DB_ALIAS
+
+try:
+ from django.db.backends.base.creation import BaseDatabaseCreation
+except ImportError:
+ # Django < 1.7
+ from django.db.backends.creation import BaseDatabaseCreation
+
+try:
+ from importlib import import_module
+except ImportError:
+ # Django < 1.7 and Python < 2.7
+ from django.utils.importlib import import_module
+
+try:
+ from django.apps import apps
+except ImportError:
+ # Django < 1.7
+ from django.db.models.loading import cache as apps
import nose.core
@@ -37,6 +53,12 @@
return True
return False
+try:
+ from django.test.runner import DiscoverRunner
+except ImportError:
+ # Django < 1.8
+ from django.test.simple import DjangoTestSuiteRunner as DiscoverRunner
+
__all__ = ['BasicNoseRunner', 'NoseTestSuiteRunner']
@@ -121,7 +143,132 @@
o.action != 'help')
-class BasicNoseRunner(DjangoTestSuiteRunner):
+if hasattr(BaseCommand, 'use_argparse'):
+ # Django 1.8 and later uses argparse.ArgumentParser
+ # Translate nose optparse arguments to argparse
+ class BaseRunner(DiscoverRunner):
+
+ # Don't pass the following options to nosetests
+ django_opts = [
+ '--noinput', '--liveserver', '-p', '--pattern', '--testrunner',
+ '--settings']
+
+ #
+ # For optparse -> argparse conversion
+ #
+ # Option strings to remove from Django options if found
+ _argparse_remove_options = (
+ '-p', # Short arg for nose's --plugins, not Django's --patterns
+ '-d', # Short arg for nose's --detailed-errors, not Django's
+ # --debug-sql
+ )
+
+ # Convert nose optparse options to argparse options
+ _argparse_type = {
+ 'int': int,
+ 'float': float,
+ 'complex': complex,
+ 'string': str,
+ }
+ # If optparse has a None argument, omit from call to add_argument
+ _argparse_omit_if_none = (
+ 'action', 'nargs', 'const', 'default', 'type', 'choices',
+ 'required', 'help', 'metavar', 'dest', 'callback', 'callback_args',
+ 'callback_kwargs')
+
+ # Translating callbacks is not supported, because none of the built-in
+ # plugins uses one. If you have a plugin that uses a callback, please
+ # open a ticket or submit a working implementation.
+ _argparse_fail_if_not_none = (
+ 'callback', 'callback_args', 'callback_kwargs')
+
+ @classmethod
+ def add_arguments(cls, parser):
+ """Convert nose's optparse arguments to argparse"""
+ super(BaseRunner, cls).add_arguments(parser)
+
+ # Read optparse options for nose and plugins
+ cfg_files = nose.core.all_config_files()
+ manager = nose.core.DefaultPluginManager()
+ config = nose.core.Config(
+ env=os.environ, files=cfg_files, plugins=manager)
+ config.plugins.addPlugins(list(_get_plugins_from_settings()))
+ options = config.getParser()._get_all_options()
+
+ # Gather existing option strings`
+ django_options = set()
+ for action in parser._actions:
+ for override in cls._argparse_remove_options:
+ if override in action.option_strings:
+ # Emulate parser.conflict_handler='resolve'
+ parser._handle_conflict_resolve(
+ None, ((override, action),))
+ django_options.update(action.option_strings)
+
+ # Process nose optparse options
+ for option in options:
+ # Skip any options also in Django options
+ opt_long = option.get_opt_string()
+ if opt_long in django_options:
+ continue
+ if option._short_opts:
+ opt_short = option._short_opts[0]
+ if opt_short in django_options:
+ continue
+ else:
+ opt_short = None
+
+ # Rename nose's --verbosity to --nose-verbosity
+ if opt_long == '--verbosity':
+ opt_long = '--nose-verbosity'
+
+ # Convert optparse attributes to argparse attributes
+ option_attrs = {}
+ for attr in option.ATTRS:
+ value = getattr(option, attr)
+
+ # Rename options for nose's --verbosity
+ if opt_long == '--nose-verbosity':
+ if attr == 'dest':
+ value = 'nose_verbosity'
+ elif attr == 'metavar':
+ value = 'NOSE_VERBOSITY'
+
+ # Omit arguments that are None, use default
+ if attr in cls._argparse_omit_if_none and value is None:
+ continue
+
+ # Translating callbacks is not supported
+ if attr in cls._argparse_fail_if_not_none:
+ assert value is None, (
+ 'argparse option %s=%s is not supported' %
+ (attr, value))
+ continue
+
+ # Convert type from optparse string to argparse type
+ if attr == 'type':
+ value = cls._argparse_type[value]
+
+ # Pass converted attribute to optparse option
+ option_attrs[attr] = value
+
+ # Add the optparse argument
+ if opt_short:
+ parser.add_argument(opt_short, opt_long, **option_attrs)
+ else:
+ parser.add_argument(opt_long, **option_attrs)
+else:
+ # Django 1.7 and earlier use optparse
+ class BaseRunner(DiscoverRunner):
+ # Replace the builtin options with the merged django/nose options:
+ options = _get_options()
+
+ # Not add following options to nosetests
+ django_opts = ['--noinput', '--liveserver', '-p', '--pattern',
+ '--testrunner']
+
+
+class BasicNoseRunner(BaseRunner):
"""Facade that implements a nose runner in the guise of a Django runner
You shouldn't have to use this directly unless the additions made by
@@ -131,9 +278,6 @@
"""
__test__ = False
- # Replace the builtin command options with the merged django/nose options:
- options = _get_options()
-
def run_suite(self, nose_argv):
result_plugin = ResultPlugin()
plugins_to_add = [DjangoSetUpPlugin(self),
@@ -143,6 +287,12 @@
for plugin in _get_plugins_from_settings():
plugins_to_add.append(plugin)
+ try:
+ django.setup()
+ except AttributeError:
+ # Setup isn't necessary in Django < 1.7
+ pass
+
nose.core.TestProgram(argv=nose_argv, exit=False,
addplugins=plugins_to_add)
return result_plugin.result
@@ -180,7 +330,7 @@
nose_argv.extend(settings.NOSE_ARGS)
# Skip over 'manage.py test' and any arguments handled by django.
- django_opts = ['--noinput', '--liveserver', '-p', '--pattern']
+ django_opts = self.django_opts[:]
for opt in BaseCommand.option_list:
django_opts.extend(opt._long_opts)
django_opts.extend(opt._short_opts)
@@ -231,7 +381,7 @@
connection.close()
-def _skip_create_test_db(self, verbosity=1, autoclobber=False):
+def _skip_create_test_db(self, verbosity=1, autoclobber=False, serialize=True):
"""``create_test_db`` implementation that skips both creation and flushing
The idea is to re-use the perfectly good test DB already created by an
@@ -322,7 +472,7 @@
def _get_models_for_connection(self, connection):
"""Return a list of models for a connection."""
tables = connection.introspection.get_table_list(connection.cursor())
- return [m for m in models.loading.cache.get_models() if
+ return [m for m in apps.get_models() if
m._meta.db_table in tables]
def setup_databases(self):
@@ -374,7 +524,7 @@
# Each connection has its own creation object, so this affects
# only a single connection:
creation.create_test_db = MethodType(
- _skip_create_test_db, creation, creation.__class__)
+ _skip_create_test_db, creation)
Command.handle = _foreign_key_ignoring_handle
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-nose-1.2/django_nose/testcases.py
new/django-nose-1.4/django_nose/testcases.py
--- old/django-nose-1.2/django_nose/testcases.py 2013-03-28
03:40:25.000000000 +0100
+++ new/django-nose-1.4/django_nose/testcases.py 2015-04-23
22:01:07.000000000 +0200
@@ -120,6 +120,7 @@
test.testcases.disable_transaction_methods()
+ self.client = self.client_class()
#self._fixture_setup()
self._urlconf_setup()
mail.outbox = []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-nose-1.2/django_nose.egg-info/PKG-INFO
new/django-nose-1.4/django_nose.egg-info/PKG-INFO
--- old/django-nose-1.2/django_nose.egg-info/PKG-INFO 2013-07-23
19:25:15.000000000 +0200
+++ new/django-nose-1.4/django_nose.egg-info/PKG-INFO 2015-04-24
02:57:40.000000000 +0200
@@ -1,8 +1,8 @@
Metadata-Version: 1.1
Name: django-nose
-Version: 1.2
+Version: 1.4
Summary: Makes your Django tests simple and snappy
-Home-page: http://github.com/jbalogh/django-nose
+Home-page: http://github.com/django-nose/django-nose
Author: Erik Rose
Author-email: [email protected]
License: BSD
@@ -10,8 +10,8 @@
django-nose
===========
- .. image:: https://travis-ci.org/jbalogh/django-nose.png
- :target: https://travis-ci.org/jbalogh/django-nose
+ .. image:: https://travis-ci.org/django-nose/django-nose.png
+ :target: https://travis-ci.org/django-nose/django-nose
Features
--------
@@ -46,7 +46,7 @@
The development version can be installed with... ::
- pip install -e
git://github.com/jbalogh/django-nose.git#egg=django-nose
+ pip install -e
git://github.com/django-nose/django-nose.git#egg=django-nose
Since django-nose extends Django's built-in test command, you should
add it to
your ``INSTALLED_APPS`` in ``settings.py``::
@@ -275,7 +275,7 @@
Older Versions of Django
------------------------
Upgrading from Django <= 1.3 to Django 1.4
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In versions of Django < 1.4 the project folder was in fact a python
package as
well (note the __init__.py in your project root). In Django 1.4, there
is no
such file and thus the project is not a python module.
@@ -294,8 +294,6 @@
django-nose's test runner it will try to find your urls.py file in
`'my_project.my_project.urls'`.
-
-
Upgrading from Django < 1.2
~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -317,7 +315,7 @@
~~~~~~~~~~
If you want to use django-nose with Django 1.1, use
- https://github.com/jbalogh/django-nose/tree/django-1.1 or
+ https://github.com/django-nose/django-nose/tree/django-1.1 or
http://pypi.python.org/pypi/django-nose/0.0.3.
Django 1.0
@@ -328,6 +326,18 @@
Recent Version History
----------------------
+ 1.4 (2015-04-23)
+ * Django 1.8 support (timc3, adepue, jwhitlock)
+ * Support --testrunner option (st3lk)
+ * Fix REUSE_DB second run in py3k (edrmp)
+
+ 1.3 (2014-12-05)
+ * Django 1.6 and 1.7 support (conrado, co3k, Nepherhotep, mbertheau)
+ * Python 3.3 and 3.4 testing and support (frewsxcv, jsocol)
+
+ 1.2 (2013-07-23)
+ * Python 3 support (melinath and jonashaag)
+ * Django 1.5 compat (fabiosantoscode)
1.1 (2012-05-19)
* Django TransactionTestCases don't clean up after themselves; they
leave
@@ -375,5 +385,7 @@
Classifier: Programming Language :: Python :: 2
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
Classifier: Topic :: Software Development :: Testing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-nose-1.2/django_nose.egg-info/SOURCES.txt
new/django-nose-1.4/django_nose.egg-info/SOURCES.txt
--- old/django-nose-1.2/django_nose.egg-info/SOURCES.txt 2013-07-23
19:25:15.000000000 +0200
+++ new/django-nose-1.4/django_nose.egg-info/SOURCES.txt 2015-04-24
02:57:40.000000000 +0200
@@ -21,6 +21,7 @@
django_nose/management/commands/__init__.py
django_nose/management/commands/test.py
testapp/__init__.py
+testapp/custom_runner.py
testapp/plugins.py
testapp/runtests.py
testapp/settings.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-nose-1.2/django_nose.egg-info/requires.txt
new/django-nose-1.4/django_nose.egg-info/requires.txt
--- old/django-nose-1.2/django_nose.egg-info/requires.txt 2013-07-23
19:25:15.000000000 +0200
+++ new/django-nose-1.4/django_nose.egg-info/requires.txt 2015-04-24
02:57:40.000000000 +0200
@@ -1,2 +1,2 @@
nose>=1.2.1
-Django>=1.2
\ No newline at end of file
+Django>=1.4
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-nose-1.2/runtests.sh
new/django-nose-1.4/runtests.sh
--- old/django-nose-1.2/runtests.sh 2013-07-23 19:23:04.000000000 +0200
+++ new/django-nose-1.4/runtests.sh 2015-04-23 22:49:24.000000000 +0200
@@ -1,10 +1,22 @@
-#!/bin/sh
+#!/bin/bash
export PYTHONPATH=.
+PYTHONVERSION=$(python --version 2>&1)
+PYTHONVERSION=${PYTHONVERSION##Python }
+
+function version { echo $@ | gawk -F. '{ printf("%d.%d.%d\n", $1,$2,$3); }'; }
+
django_test() {
TEST="$1"
- $TEST 2>&1 | grep "Ran $2 test" > /dev/null
+ OUTPUT=$($TEST 2>&1)
+ if [ $? -gt 0 ]
+ then
+ echo FAIL: $3
+ $TEST
+ exit 1;
+ fi
+ echo $OUTPUT | grep "Ran $2 test" > /dev/null
if [ $? -gt 0 ]
then
echo FAIL: $3
@@ -26,8 +38,18 @@
}
django_test 'django-admin.py test --settings=testapp.settings' '2' 'normal
settings'
-django_test 'django-admin.py test --settings=testapp.settings_with_south' '2'
'with south in installed apps'
+if [ "$DJANGO" = "Django==1.4.1" -o "$DJANGO" = "Django==1.5" -o "$DJANGO" =
"Django==1.6" ]
+then
+ django_test 'django-admin.py test --settings=testapp.settings_with_south'
'2' 'with south in installed apps'
+fi
+
django_test 'django-admin.py test --settings=testapp.settings_old_style' '2'
'django_nose.run_tests format'
django_test 'testapp/runtests.py testapp.test_only_this' '1' 'via run_tests
API'
django_test 'django-admin.py test --settings=testapp.settings_with_plugins
testapp/plugin_t' '1' 'with plugins'
django_test 'django-admin.py test --settings=testapp.settings unittests' '4'
'unittests'
+django_test 'django-admin.py test --settings=testapp.settings unittests
--testrunner=testapp.custom_runner.CustomNoseTestSuiteRunner' '4' 'unittests'
+if ! [ $(version $PYTHONVERSION) \> $(version 3.0.0) ]
+then
+# Python 3 doesn't support the hotshot profiler. See nose#842.
+django_test 'django-admin.py test --settings=testapp.settings --with-profile'
'2' 'with profile plugin'
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-nose-1.2/setup.py new/django-nose-1.4/setup.py
--- old/django-nose-1.2/setup.py 2013-07-23 19:23:38.000000000 +0200
+++ new/django-nose-1.4/setup.py 2015-04-23 23:05:47.000000000 +0200
@@ -6,19 +6,19 @@
setup(
name='django-nose',
- version='1.2',
+ version='1.4',
description='Makes your Django tests simple and snappy',
long_description=open(os.path.join(ROOT, 'README.rst')).read(),
author='Jeff Balogh',
author_email='[email protected]',
maintainer='Erik Rose',
maintainer_email='[email protected]',
- url='http://github.com/jbalogh/django-nose',
+ url='http://github.com/django-nose/django-nose',
license='BSD',
packages=find_packages(exclude=['testapp', 'testapp/*']),
include_package_data=True,
zip_safe=False,
- install_requires=['nose>=1.2.1', 'Django>=1.2'],
+ install_requires=['nose>=1.2.1', 'Django>=1.4'],
tests_require=['south>=0.7'],
# This blows up tox runs that install django-nose into a virtualenv,
# because it causes Nose to import django_nose.runner before the Django
@@ -41,7 +41,9 @@
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
+ 'Programming Language :: Python :: 3.4',
'Topic :: Software Development :: Testing'
]
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-nose-1.2/testapp/custom_runner.py
new/django-nose-1.4/testapp/custom_runner.py
--- old/django-nose-1.2/testapp/custom_runner.py 1970-01-01
01:00:00.000000000 +0100
+++ new/django-nose-1.4/testapp/custom_runner.py 2015-04-23
22:01:07.000000000 +0200
@@ -0,0 +1,5 @@
+from django_nose import NoseTestSuiteRunner
+
+
+class CustomNoseTestSuiteRunner(NoseTestSuiteRunner):
+ pass
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-nose-1.2/testapp/settings.py
new/django-nose-1.4/testapp/settings.py
--- old/django-nose-1.2/testapp/settings.py 2013-07-23 19:23:04.000000000
+0200
+++ new/django-nose-1.4/testapp/settings.py 2015-04-23 22:01:07.000000000
+0200
@@ -5,6 +5,8 @@
}
}
+MIDDLEWARE_CLASSES = ()
+
INSTALLED_APPS = (
'django_nose',
)
