[Python-modules-commits] [django-nose] 03/12: Convert from git-dpm to patches unapplied format
Michael Fladischer
fladi at moszumanska.debian.org
Tue Oct 17 13:34:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch debian/master
in repository django-nose.
commit fe2364fb84938ed6831f5c44ab8e3dbe4391a32a
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Tue Oct 17 13:51:09 2017 +0200
Convert from git-dpm to patches unapplied format
---
.gitignore | 25 +++++
.travis.yml | 71 ++++++++++++++
PKG-INFO | 155 ------------------------------
debian/.git-dpm | 11 ---
debian/gbp.conf | 4 +-
django_nose.egg-info/PKG-INFO | 155 ------------------------------
django_nose.egg-info/SOURCES.txt | 55 -----------
django_nose.egg-info/dependency_links.txt | 1 -
django_nose.egg-info/not-zip-safe | 1 -
django_nose.egg-info/requires.txt | 1 -
django_nose.egg-info/top_level.txt | 2 -
runtests.sh | 35 +++----
setup.cfg | 16 +--
testapp/settings.py | 14 ++-
tox.ini | 38 ++++++++
15 files changed, 165 insertions(+), 419 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5c9b3f8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,25 @@
+# Python binaries
+*.py[cod]
+
+# Editor backups, OS files
+*.swp
+*~
+.DS_Store
+
+# Distutils cruft
+*.egg-info
+South-*.egg/
+build/
+dist/
+
+# Unit test / coverage reports
+.tox/
+.coverage
+.coverage.*
+.noseids
+nosetests.xml
+htmlcov/
+testapp.sqlite3
+
+# Sphinx documentation build
+docs/_build/*
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..2b3590c
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,71 @@
+sudo: false
+language: python
+env:
+ global:
+ - COVERAGE=1 RUNTEST_ARGS="-v --noinput"
+matrix:
+ include:
+ # Quality checks
+ - env: TOXENV=flake8
+ python: "2.7"
+ - env: TOXENV=docs
+ python: "2.7"
+ # Supported Python / Django versions w/ SQLite
+ - env: TOXENV=py27-django-110
+ python: "2.7"
+ - env: TOXENV=py35-django-110
+ python: "3.5"
+ - env: TOXENV=py27-django-19
+ python: "2.7"
+ - env: TOXENV=py35-django-19
+ python: "3.5"
+ - env: TOXENV=py27-django-18
+ python: "2.7"
+ - env: TOXENV=py34-django-18
+ python: "3.4"
+ # Test with PostgreSQL
+ - env: TOXENV=py27-django-19-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-110-postgres"
+ python: "2.7"
+ - env: TOXENV=py35-django-19-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-110-postgres"
+ python: "3.5"
+ - env: TOXENV=py27-django-19-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-19-postgres"
+ python: "2.7"
+ - env: TOXENV=py35-django-19-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-19-postgres"
+ python: "3.5"
+ - env: TOXENV=py27-django-18-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-18-postgres"
+ python: "2.7"
+ # Test with MySQL
+ - env: TOXENV=py27-django-110-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-110-mysql"
+ python: "2.7"
+ - env: TOXENV=py35-django-110-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-110-mysql"
+ python: "3.5"
+ - env: TOXENV=py27-django-19-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-19-mysql"
+ python: "2.7"
+ - env: TOXENV=py35-django-19-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-19-mysql"
+ python: "3.5"
+ - env: TOXENV=py27-django-18-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-18-mysql"
+ python: "2.7"
+ # Django master is allowed to fail
+ - env: TOXENV=py27-django-master
+ python: "2.7"
+ - env: TOXENV=py35-django-master
+ python: "3.5"
+ - env: TOXENV=py27-django-master-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-master-mysql"
+ python: "2.7"
+ - env: TOXENV=py35-django-master-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-master-postgres"
+ python: "3.5"
+ allow_failures:
+ # Master is allowed to fail
+ - env: TOXENV=py27-django-master
+ - env: TOXENV=py35-django-master
+ - env: TOXENV=py27-django-master-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-master-mysql"
+ - env: TOXENV=py35-django-master-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-master-postgres"
+
+install:
+ - pip install tox coveralls
+before_script:
+ - coverage erase
+ - bash -c "if [[ \"$DATABASE_URL\" == postgres* ]]; then psql -c 'create database \"$TOXENV\";' -U postgres; fi"
+ - bash -c "if [[ \"$DATABASE_URL\" == mysql* ]]; then mysql -e 'create database IF NOT EXISTS \`$TOXENV\`;'; fi"
+script: tox
+after_success: coveralls
diff --git a/PKG-INFO b/PKG-INFO
deleted file mode 100644
index d926585..0000000
--- a/PKG-INFO
+++ /dev/null
@@ -1,155 +0,0 @@
-Metadata-Version: 1.1
-Name: django-nose
-Version: 1.4.4
-Summary: Makes your Django tests simple and snappy
-Home-page: http://github.com/django-nose/django-nose
-Author: Erik Rose
-Author-email: erikrose at grinchcentral.com
-License: BSD
-Description:
- ===========
- django-nose
- ===========
-
-
- **django-nose** provides all the goodness of `nose`_ in your Django tests, like:
-
- * Testing just your apps by default, not all the standard ones that happen to
- be in ``INSTALLED_APPS``
- * Running the tests in one or more specific modules (or apps, or classes, or
- folders, or just running a specific test)
- * Obviating the need to import all your tests into ``tests/__init__.py``.
- This not only saves busy-work but also eliminates the possibility of
- accidentally shadowing test classes.
- * Taking advantage of all the useful `nose plugins`_
-
- .. _nose: https://nose.readthedocs.org/en/latest/
- .. _nose plugins: http://nose-plugins.jottit.com/
-
- It also provides:
-
- * Fixture bundling, an optional feature which speeds up your fixture-based
- tests by a factor of 4
- * Reuse of previously created test DBs, cutting 10 seconds off startup time
- * Hygienic TransactionTestCases, which can save you a DB flush per test
- * Support for various databases. Tested with MySQL, PostgreSQL, and SQLite.
- Others should work as well.
-
- django-nose requires nose 1.2.1 or later, and the `latest release`_ is
- recommended. It follows the `Django's support policy`_, supporting:
-
- * Django 1.8 (LTS) with Python 2.7, 3.4, or 3.5
- * Django 1.9 with Python 2.7, 3.4, or 3.5
- * Django 1.10 with Python 2.7, 3.4, or 3.5
-
- .. _latest release: https://pypi.python.org/pypi/nose
- .. _Django's support policy: https://docs.djangoproject.com/en/1.8/internals/release-process/#supported-versions
-
- Development
- -----------
- :Code: https://github.com/django-nose/django-nose
- :Issues: https://github.com/django-nose/django-nose/issues?state=open
- :Docs: https://django-nose.readthedocs.org
-
-
- Changelog
- ---------
-
- 1.4.4 (2016-06-27)
- ~~~~~~~~~~~~~~~~~~
- * Add Django 1.10 support
- * Drop Django 1.4, 1.7, and Python 2.6 support
- * Drop South support
-
- 1.4.3 (2015-12-28)
- ~~~~~~~~~~~~~~~~~~
- * Add Django 1.9 support
- * Support long options without equals signs, such as "--attr selected"
- * Support nose plugins using callback options
- * Support nose options without default values (jsatt)
- * Remove Django from install dependencies, to avoid accidental upgrades
- (jsocol, willkg)
- * Setting REUSE_DB to an empty value now disables REUSE_DB, instead of
- enabling it (wdoekes)
-
- 1.4.2 (2015-10-07)
- ~~~~~~~~~~~~~~~~~~
- * Warn against using REUSE_DB=1 and FastFixtureTestCase in docs
- * REUSE_DB=1 uses new transaction management in Django 1.7, 1.8 (scottsexton)
- * Try to avoid accidentally using production database with REUSE_DB=1 (alexjg, eroninjapan)
- * Supported Django versions limited to current supported Django version 1.4,
- 1.7, and 1.8, as well as relevant Python versions.
-
- 1.4.1 (2015-06-29)
- ~~~~~~~~~~~~~~~~~~
- * Fix version number (ezarowny)
- * Fix choice options, unbreaking nose-cover (aamirtharaj-rpx, jwhitlock)
- * Support 1.8 app loading system (dgladkov)
- * Support non-ASCII file names (singingwolfboy)
- * Better PEP8'd assertion names (roganov)
-
- 1.4 (2015-04-23)
- ~~~~~~~~~~~~~~~~
- * Django 1.8 support (timc3, adepue, jwhitlock)
- * Support --testrunner option (st4lk)
- * 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
- junk in the DB and clean it up only on ``_pre_setup``. Thus, Django makes
- sure these tests run last. Now django-nose does, too. This means one fewer
- source of failures on existing projects. (Erik Rose)
- * Add support for hygienic TransactionTestCases. (Erik Rose)
- * Support models that are used only for tests. Just put them in any file
- imported in the course of loading tests. No more crazy hacks necessary.
- (Erik Rose)
- * Make the fixture bundler more conservative, fixing some conceivable
- situations in which fixtures would not appear as intended if a
- TransactionTestCase found its way into the middle of a bundle. (Erik Rose)
- * Fix an error that would surface when using SQLAlchemy with connection
- pooling. (Roger Hu)
- * Gracefully ignore the new ``--liveserver`` option introduced in Django 1.4;
- don't let it through to nose. (Adam DePue)
-
- 1.0 (2012-03-12)
- ~~~~~~~~~~~~~~~~
- * New fixture-bundling plugin for avoiding needless fixture setup (Erik Rose)
- * Moved FastFixtureTestCase in from test-utils, so now all the
- fixture-bundling stuff is in one library. (Erik Rose)
- * Added the REUSE_DB setting for faster startup and shutdown. (Erik Rose)
- * Fixed a crash when printing options with certain verbosities. (Daniel Abel)
- * Broke hard dependency on MySQL. Support PostgreSQL. (Roger Hu)
- * Support SQLite, both memory- and disk-based. (Roger Hu and Erik Rose)
- * Nail down versions of the package requirements. (Daniel Mizyrycki)
-
-
-
- _(Older changes can be found in the full documentation)._
-
-Keywords: d,j,a,n,g,o, ,n,o,s,e, ,d,j,a,n,g,o,-,n,o,s,e
-Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Web Environment
-Classifier: Framework :: Django
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-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.4
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Topic :: Software Development :: Testing
diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index b01ccc5..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-805d34fb894946b64255c5e38c50a46e122770b9
-805d34fb894946b64255c5e38c50a46e122770b9
-99d0c63b56756d6b0f1d83e1d827158fa6493b02
-99d0c63b56756d6b0f1d83e1d827158fa6493b02
-django-nose_1.4.4.orig.tar.gz
-0201d22380ac6b801ce2710c6a0c693a0cf1ce71
-44266
-debianTag="debian/%e%v"
-patchedTag="patched/%e%v"
-upstreamTag="upstream/%e%u"
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 45052a1..3879982 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,2 @@
[DEFAULT]
-upstream-branch = upstream
-debian-branch = master
-pristine-tar = True
+debian-branch=debian/master
diff --git a/django_nose.egg-info/PKG-INFO b/django_nose.egg-info/PKG-INFO
deleted file mode 100644
index d926585..0000000
--- a/django_nose.egg-info/PKG-INFO
+++ /dev/null
@@ -1,155 +0,0 @@
-Metadata-Version: 1.1
-Name: django-nose
-Version: 1.4.4
-Summary: Makes your Django tests simple and snappy
-Home-page: http://github.com/django-nose/django-nose
-Author: Erik Rose
-Author-email: erikrose at grinchcentral.com
-License: BSD
-Description:
- ===========
- django-nose
- ===========
-
-
- **django-nose** provides all the goodness of `nose`_ in your Django tests, like:
-
- * Testing just your apps by default, not all the standard ones that happen to
- be in ``INSTALLED_APPS``
- * Running the tests in one or more specific modules (or apps, or classes, or
- folders, or just running a specific test)
- * Obviating the need to import all your tests into ``tests/__init__.py``.
- This not only saves busy-work but also eliminates the possibility of
- accidentally shadowing test classes.
- * Taking advantage of all the useful `nose plugins`_
-
- .. _nose: https://nose.readthedocs.org/en/latest/
- .. _nose plugins: http://nose-plugins.jottit.com/
-
- It also provides:
-
- * Fixture bundling, an optional feature which speeds up your fixture-based
- tests by a factor of 4
- * Reuse of previously created test DBs, cutting 10 seconds off startup time
- * Hygienic TransactionTestCases, which can save you a DB flush per test
- * Support for various databases. Tested with MySQL, PostgreSQL, and SQLite.
- Others should work as well.
-
- django-nose requires nose 1.2.1 or later, and the `latest release`_ is
- recommended. It follows the `Django's support policy`_, supporting:
-
- * Django 1.8 (LTS) with Python 2.7, 3.4, or 3.5
- * Django 1.9 with Python 2.7, 3.4, or 3.5
- * Django 1.10 with Python 2.7, 3.4, or 3.5
-
- .. _latest release: https://pypi.python.org/pypi/nose
- .. _Django's support policy: https://docs.djangoproject.com/en/1.8/internals/release-process/#supported-versions
-
- Development
- -----------
- :Code: https://github.com/django-nose/django-nose
- :Issues: https://github.com/django-nose/django-nose/issues?state=open
- :Docs: https://django-nose.readthedocs.org
-
-
- Changelog
- ---------
-
- 1.4.4 (2016-06-27)
- ~~~~~~~~~~~~~~~~~~
- * Add Django 1.10 support
- * Drop Django 1.4, 1.7, and Python 2.6 support
- * Drop South support
-
- 1.4.3 (2015-12-28)
- ~~~~~~~~~~~~~~~~~~
- * Add Django 1.9 support
- * Support long options without equals signs, such as "--attr selected"
- * Support nose plugins using callback options
- * Support nose options without default values (jsatt)
- * Remove Django from install dependencies, to avoid accidental upgrades
- (jsocol, willkg)
- * Setting REUSE_DB to an empty value now disables REUSE_DB, instead of
- enabling it (wdoekes)
-
- 1.4.2 (2015-10-07)
- ~~~~~~~~~~~~~~~~~~
- * Warn against using REUSE_DB=1 and FastFixtureTestCase in docs
- * REUSE_DB=1 uses new transaction management in Django 1.7, 1.8 (scottsexton)
- * Try to avoid accidentally using production database with REUSE_DB=1 (alexjg, eroninjapan)
- * Supported Django versions limited to current supported Django version 1.4,
- 1.7, and 1.8, as well as relevant Python versions.
-
- 1.4.1 (2015-06-29)
- ~~~~~~~~~~~~~~~~~~
- * Fix version number (ezarowny)
- * Fix choice options, unbreaking nose-cover (aamirtharaj-rpx, jwhitlock)
- * Support 1.8 app loading system (dgladkov)
- * Support non-ASCII file names (singingwolfboy)
- * Better PEP8'd assertion names (roganov)
-
- 1.4 (2015-04-23)
- ~~~~~~~~~~~~~~~~
- * Django 1.8 support (timc3, adepue, jwhitlock)
- * Support --testrunner option (st4lk)
- * 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
- junk in the DB and clean it up only on ``_pre_setup``. Thus, Django makes
- sure these tests run last. Now django-nose does, too. This means one fewer
- source of failures on existing projects. (Erik Rose)
- * Add support for hygienic TransactionTestCases. (Erik Rose)
- * Support models that are used only for tests. Just put them in any file
- imported in the course of loading tests. No more crazy hacks necessary.
- (Erik Rose)
- * Make the fixture bundler more conservative, fixing some conceivable
- situations in which fixtures would not appear as intended if a
- TransactionTestCase found its way into the middle of a bundle. (Erik Rose)
- * Fix an error that would surface when using SQLAlchemy with connection
- pooling. (Roger Hu)
- * Gracefully ignore the new ``--liveserver`` option introduced in Django 1.4;
- don't let it through to nose. (Adam DePue)
-
- 1.0 (2012-03-12)
- ~~~~~~~~~~~~~~~~
- * New fixture-bundling plugin for avoiding needless fixture setup (Erik Rose)
- * Moved FastFixtureTestCase in from test-utils, so now all the
- fixture-bundling stuff is in one library. (Erik Rose)
- * Added the REUSE_DB setting for faster startup and shutdown. (Erik Rose)
- * Fixed a crash when printing options with certain verbosities. (Daniel Abel)
- * Broke hard dependency on MySQL. Support PostgreSQL. (Roger Hu)
- * Support SQLite, both memory- and disk-based. (Roger Hu and Erik Rose)
- * Nail down versions of the package requirements. (Daniel Mizyrycki)
-
-
-
- _(Older changes can be found in the full documentation)._
-
-Keywords: d,j,a,n,g,o, ,n,o,s,e, ,d,j,a,n,g,o,-,n,o,s,e
-Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Web Environment
-Classifier: Framework :: Django
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-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.4
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Topic :: Software Development :: Testing
diff --git a/django_nose.egg-info/SOURCES.txt b/django_nose.egg-info/SOURCES.txt
deleted file mode 100644
index 836b5ec..0000000
--- a/django_nose.egg-info/SOURCES.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-AUTHORS.rst
-CONTRIBUTING.rst
-LICENSE
-MANIFEST.in
-Makefile
-README.rst
-changelog.rst
-contribute.json
-manage.py
-requirements-rtd.txt
-requirements.txt
-runtests.sh
-setup.cfg
-setup.py
-django_nose/__init__.py
-django_nose/fixture_tables.py
-django_nose/plugin.py
-django_nose/runner.py
-django_nose/testcases.py
-django_nose/tools.py
-django_nose/utils.py
-django_nose.egg-info/PKG-INFO
-django_nose.egg-info/SOURCES.txt
-django_nose.egg-info/dependency_links.txt
-django_nose.egg-info/not-zip-safe
-django_nose.egg-info/requires.txt
-django_nose.egg-info/top_level.txt
-django_nose/management/__init__.py
-django_nose/management/commands/__init__.py
-django_nose/management/commands/test.py
-docs/Makefile
-docs/authors.rst
-docs/changelog.rst
-docs/conf.py
-docs/contributing.rst
-docs/index.rst
-docs/installation.rst
-docs/make.bat
-docs/upgrading.rst
-docs/usage.rst
-docs/_static/.keep
-testapp/__init__.py
-testapp/custom_runner.py
-testapp/models.py
-testapp/plugins.py
-testapp/runtests.py
-testapp/settings.py
-testapp/test_for_nose.py
-testapp/test_only_this.py
-testapp/tests.py
-testapp/fixtures/testdata.json
-testapp/migrations/0001_initial.py
-testapp/migrations/__init__.py
-testapp/plugin_t/test_with_plugins.py
-unittests/test_databases.py
\ No newline at end of file
diff --git a/django_nose.egg-info/dependency_links.txt b/django_nose.egg-info/dependency_links.txt
deleted file mode 100644
index 8b13789..0000000
--- a/django_nose.egg-info/dependency_links.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/django_nose.egg-info/not-zip-safe b/django_nose.egg-info/not-zip-safe
deleted file mode 100644
index 8b13789..0000000
--- a/django_nose.egg-info/not-zip-safe
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/django_nose.egg-info/requires.txt b/django_nose.egg-info/requires.txt
deleted file mode 100644
index 18980ba..0000000
--- a/django_nose.egg-info/requires.txt
+++ /dev/null
@@ -1 +0,0 @@
-nose>=1.2.1
diff --git a/django_nose.egg-info/top_level.txt b/django_nose.egg-info/top_level.txt
deleted file mode 100644
index a9b9ba1..0000000
--- a/django_nose.egg-info/top_level.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-django_nose
-testapp
diff --git a/runtests.sh b/runtests.sh
index 588c46c..da6ee27 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -36,13 +36,8 @@ then
fi
export PYTHONPATH=.
-if [ -z $PYTHON ]; then
- export PYTHON=python
-fi
-
-export DJANGO_SETTINGS_MODULE=testapp.settings
-HAS_HOTSHOT=$($PYTHON -c "\
+HAS_HOTSHOT=$(python -c "\
try:
import hotshot
except ImportError:
@@ -151,45 +146,45 @@ django_test() {
TESTAPP_COUNT=6
reset_env
-django_test "$PYTHON /usr/bin/django-admin test $NOINPUT" $TESTAPP_COUNT 'normal settings'
+django_test "./manage.py test $NOINPUT" $TESTAPP_COUNT 'normal settings'
reset_env
export TEST_RUNNER="django_nose.NoseTestSuiteRunner"
-django_test "$PYTHON /usr/bin/django-admin test $NOINPUT" $TESTAPP_COUNT 'test runner from environment'
+django_test "./manage.py test $NOINPUT" $TESTAPP_COUNT 'test runner from environment'
reset_env
-django_test "$PYTHON testapp/runtests.py testapp.test_only_this" 1 'via run_tests API'
+django_test "testapp/runtests.py testapp.test_only_this" 1 'via run_tests API'
reset_env
export NOSE_PLUGINS="testapp.plugins.SanityCheckPlugin"
-django_test "$PYTHON /usr/bin/django-admin test testapp/plugin_t $NOINPUT" 1 'with plugins'
+django_test "./manage.py test testapp/plugin_t $NOINPUT" 1 'with plugins'
reset_env
-django_test "$PYTHON /usr/bin/django-admin test unittests $NOINPUT" 4 'unittests'
+django_test "./manage.py test unittests $NOINPUT" 4 'unittests'
reset_env
-django_test "$PYTHON /usr/bin/django-admin test unittests --verbosity 1 $NOINPUT" 4 'argument option without equals'
+django_test "./manage.py test unittests --verbosity 1 $NOINPUT" 4 'argument option without equals'
reset_env
-django_test "$PYTHON /usr/bin/django-admin test unittests --nose-verbosity=2 $NOINPUT" 4 'argument with equals'
+django_test "./manage.py test unittests --nose-verbosity=2 $NOINPUT" 4 'argument with equals'
reset_env
-django_test "$PYTHON /usr/bin/django-admin test unittests --testrunner=testapp.custom_runner.CustomNoseTestSuiteRunner $NOINPUT" 4 'unittests with testrunner'
+django_test "./manage.py test unittests --testrunner=testapp.custom_runner.CustomNoseTestSuiteRunner $NOINPUT" 4 'unittests with testrunner'
reset_env
-django_test "$PYTHON /usr/bin/django-admin test unittests --attr special $NOINPUT" 1 'select by attribute'
+django_test "./manage.py test unittests --attr special $NOINPUT" 1 'select by attribute'
-#reset_env
-#export REUSE_DB=1
+reset_env
+export REUSE_DB=1
# For the many issues with REUSE_DB=1, see:
# https://github.com/django-nose/django-nose/milestones/Fix%20REUSE_DB=1
-#django_test "$PYTHON /usr/bin/django-admin test $NOINPUT" $TESTAPP_COUNT 'with REUSE_DB=1, call #1' 'can fail'
-#django_test "$PYTHON /usr/bin/django-admin test $NOINPUT" $TESTAPP_COUNT 'with REUSE_DB=1, call #2' 'can fail'
+django_test "./manage.py test $NOINPUT" $TESTAPP_COUNT 'with REUSE_DB=1, call #1' 'can fail'
+django_test "./manage.py test $NOINPUT" $TESTAPP_COUNT 'with REUSE_DB=1, call #2' 'can fail'
if [ "$HAS_HOTSHOT" = "1" ]
then
# Python 3 doesn't support the hotshot profiler. See nose#842.
reset_env
- django_test "$PYTHON /usr/bin/django-admin test $NOINPUT --with-profile --profile-restrict less_output" $TESTAPP_COUNT 'with profile plugin'
+ django_test "./manage.py test $NOINPUT --with-profile --profile-restrict less_output" $TESTAPP_COUNT 'with profile plugin'
fi
diff --git a/setup.cfg b/setup.cfg
index bc1ae5c..6fe40b5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,24 +1,18 @@
[check-manifest]
-ignore =
- .travis.yml
- tox.ini
+ignore =
+ .travis.yml
+ tox.ini
[coverage:run]
branch = True
source = django_nose,testapp,unittests
[coverage:report]
-omit =
- testapp/migrations/*.py
+omit =
+ testapp/migrations/*.py
[flake8]
exclude = .tox/*,build/*
[wheel]
universal = 1
-
-[egg_info]
-tag_build =
-tag_date = 0
-tag_svn_revision = 0
-
diff --git a/testapp/settings.py b/testapp/settings.py
index 1f23cdd..51a157f 100644
--- a/testapp/settings.py
+++ b/testapp/settings.py
@@ -11,13 +11,19 @@ NOSE_PLUGINS - Comma-separated list of plugins to add
from __future__ import print_function
from os import environ, path
+import dj_database_url
+
BASE_DIR = path.dirname(path.dirname(__file__))
+
+def rel_path(*subpaths):
+ """Construct the full path given a relative path."""
+ return path.join(BASE_DIR, *subpaths)
+
DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': path.join(BASE_DIR, 'testapp.sqlite3'),
- }
+ 'default':
+ dj_database_url.config(
+ default='sqlite:///' + rel_path('testapp.sqlite3'))
}
MIDDLEWARE_CLASSES = ()
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..fd3f0ca
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,38 @@
+[tox]
+envlist =
+ {py27,py34,py35}-django-{18,19,110,master}
+ flake8
+ docs
+skip_missing_interpreters = True
+
+[testenv]
+passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH COVERAGE RUNTEST_ARGS DATABASE_URL
+commands =
+ ./runtests.sh {env:RUNTEST_ARGS:}
+ coverage combine
+deps =
+ coveralls
+ dj-database-url
+ django-18: Django>=1.8,<1.9
+ django-19: Django>=1.9,<1.10
+ django-110: Django==1.10b1
+ django-master: https://github.com/django/django/archive/master.tar.gz
+ {py27,py34,py35}-django-{18,19,110,master}-postgres: psycopg2
+ {py27,py34,py35}-django-{18,19,110,master}-mysql: mysqlclient
+
+[testenv:flake8]
+deps =
+ Django
+ pep257==0.7.0
+ pep8==1.6.2
+ flake8==2.5.0
+ flake8-docstrings==0.2.1
+commands = flake8
+
+[testenv:docs]
+changedir = docs
+deps =
+ Sphinx
+ dj-database-url
+ Django
+commands = sphinx-build -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-nose.git
More information about the Python-modules-commits
mailing list