Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/django 1.8 support #1

Open
wants to merge 97 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
eb175ee
Removing creation.__class__ parameter. Fix jbalogh/django-nose#122
edrmp Oct 31, 2013
2462def
Fix #190 (erroneous 'assert_*' names in some cases)
roganov Mar 13, 2015
c1bc29c
Run tests on django 1.8
Apr 2, 2015
5c93691
Convert nose optparse options to argparse
jwhitlock Apr 8, 2015
8610026
adds FastFixtureLiveServerTestCase
Apr 12, 2015
8965fcb
update readme with FastFixtureLiveServerTestCase
Apr 12, 2015
140c49e
Merge pull request #196 from jwhitlock/178_fix_argparse_v2
jwhitlock Apr 23, 2015
edbde65
Merge pull request #145 from edrmp/master
jwhitlock Apr 23, 2015
1d3cfd4
Version 1.4
jwhitlock Apr 23, 2015
e776ac5
upgrade __version__ in __init__.py to 1.4.0
ezarowny Apr 24, 2015
ea0cf09
Merge pull request #204 from ezarowny/update-init
jwhitlock Apr 24, 2015
c84ba27
Support optparse type=choice
jwhitlock Apr 24, 2015
4f0fad5
Stop using transaction.commit_unless_managed, add keepdb kwarg to _sk…
Apr 28, 2015
573231d
Support commit_unless_managed for older Django versions
Apr 28, 2015
9ec77df
Merge pull request #206 from jwhitlock/203_handle_choices_type
jwhitlock Apr 29, 2015
a8a40cf
Merge pull request #1 from scottsexton/197-legacy_transaction_mgt
Apr 30, 2015
5dadf96
Merge branch 'master' of https://github.com/django-nose/django-nose
Apr 30, 2015
9288184
use new app loading system when possbile, fixes django-nose for curre…
dgladkov May 6, 2015
65a1a15
Use unicode_literals future import
singingwolfboy Jun 15, 2015
4bc6ec9
coding: utf-8
singingwolfboy Jun 16, 2015
9b5be95
add tox build config, configure travis to use tox
dgladkov Jun 26, 2015
d567374
update build matrix for python versions supported in django-master
dgladkov Jun 26, 2015
e32a601
minor tox config fix
dgladkov Jun 26, 2015
95790e3
Merge pull request #210 from dgladkov/master
jwhitlock Jun 26, 2015
eec1eac
Merge pull request #215 from singingwolfboy/unicode_literals
jwhitlock Jun 26, 2015
eac95aa
Merge pull request #191 from roganov/master
jwhitlock Jun 29, 2015
c9b243a
Release v1.4.1
jwhitlock Jun 29, 2015
112f48f
Add Makefile, coverage
jwhitlock Jun 30, 2015
3c76f84
Add coveralls badge
jwhitlock Jun 30, 2015
808b970
pyflakes and PEP8
jwhitlock Jun 30, 2015
ce8357d
Improve source package
jwhitlock Jun 30, 2015
2cb552f
Update TravisCI config
jwhitlock Jun 30, 2015
4817fbf
Merge test settings
jwhitlock Jun 30, 2015
65c5e44
Add Django models and model tests
jwhitlock Jul 1, 2015
4c8ce36
Py3-friendlier constructs
jwhitlock Jul 1, 2015
1885682
Tune output capturing in runtests.sh
jwhitlock Jul 1, 2015
61fc4ef
Rearrange Travis builds
jwhitlock Jul 1, 2015
d90002b
Start conversion to Sphinx
jwhitlock Jul 1, 2015
b750630
Combine and reformat changelog
jwhitlock Jul 1, 2015
4a2e152
Sync contribute.json license with rest of project
jwhitlock Jul 1, 2015
dbf7126
Migrate README.rst to Sphinx docs
jwhitlock Jul 1, 2015
5c81105
Fix runtests.sh
jwhitlock Jul 1, 2015
9cbe498
In runtests.sh -v, display Django settings
jwhitlock Jul 2, 2015
2542da7
Reduce tests to supported versions
jwhitlock Jul 2, 2015
5349fdc
Add postgres, mysql tests on TravisCI
jwhitlock Jul 2, 2015
8d8923b
Add MIDDLEWARE_CLASSES to runtests.py
jwhitlock Jul 2, 2015
0e6197b
Merge pull request #218 from jwhitlock/update_tools
jwhitlock Jul 2, 2015
1ff0fc6
Merge branch 'upstream_master'
scottsexton Jul 7, 2015
7cf2d6b
Merge pull request #207 from scottsexton/197-legacy_transaction_mgt
jwhitlock Jul 7, 2015
f3e6701
All database tests passing
jwhitlock Jul 7, 2015
2e9517f
Update docs w/ unreleased changes
jwhitlock Jul 7, 2015
4bcdd76
Fixed broken links to nose documentation
franciscoruiz Jul 16, 2015
990c856
Merge pull request #222 from franciscoruiz/patch-1
jwhitlock Jul 16, 2015
9410403
replace broken nose URL
aristide-n Jul 27, 2015
0768337
Merge pull request #225 from aristiden7o/patch-1
jwhitlock Jul 27, 2015
9245deb
Remove gawk dependency
jwhitlock Aug 5, 2015
5ad928e
REUSE_DB=1 tests run but are allowed to fail
jwhitlock Aug 5, 2015
a835216
Add warnings for features with known issues
jwhitlock Oct 7, 2015
10b490e
Bump requirements with no code changes
jwhitlock Oct 7, 2015
4d9d7c4
Update to coverage 4.0
jwhitlock Oct 7, 2015
013190b
Update static analysis tools
jwhitlock Oct 7, 2015
a9f74d7
Test Django 1.9 pre-release
jwhitlock Oct 7, 2015
acdc88d
Fix missing quote
jwhitlock Oct 7, 2015
03b3129
Add requirements file for ReadTheDocs
jwhitlock Oct 7, 2015
4c5a1e4
Switch to retina-ready shields.io
jwhitlock Oct 7, 2015
ede3a17
Add provisional Django 1.9 support
jwhitlock Oct 7, 2015
498d32f
Null out connection cache on backend objects
Oct 21, 2012
a893caf
Close current database connections
eroninjapan Mar 1, 2015
7a33093
Update docs for issue #76 progress
jwhitlock Oct 7, 2015
eca356f
Release v1.4.2
jwhitlock Oct 7, 2015
646106a
Delete whitespace for pep257 0.7.0
jwhitlock Nov 4, 2015
4da2450
Remove more whitespace for pep257
jwhitlock Nov 4, 2015
20150ad
Ignore optparse default when translating for argparse
jsatt Nov 4, 2015
656d503
Merge pull request #241 from jsatt/ignore-optparse-default
jwhitlock Nov 5, 2015
b89fba1
Django 1.9 is released, update test matrix
jwhitlock Dec 2, 2015
307f083
Don't explicitly require Django. Fix #239.
jsocol Dec 4, 2015
326f9e1
Fix docs environment re: installing django
willkg Dec 14, 2015
00d855d
Merge pull request #251 from willkg/248-fix
jwhitlock Dec 14, 2015
a4df260
Fix that REUSE_DB=(empty) means false. And correct internal documenta…
wdoekes Dec 18, 2015
1ab32cb
Merge pull request #253 from wdoekes/wjd-fix-reusedb-empty-250
jwhitlock Dec 18, 2015
c177631
Add Django 1.8 test arguments
jwhitlock Dec 2, 2015
f37d91a
Handle long options without an equals sign
jwhitlock Dec 2, 2015
a5a0fb7
Hard-code options with arguments for Django 1.7
jwhitlock Dec 2, 2015
4f036ca
Convert optparse callback to argparse
jwhitlock Dec 2, 2015
e89d705
Add Django 1.9 test arguments
jwhitlock Dec 28, 2015
65a1d5d
Test selection by attribute
jwhitlock Dec 28, 2015
b94199d
Release 1.4.3
jwhitlock Dec 28, 2015
91d1106
Remove support for Django 1.4, 1.7, and py2.6
jwhitlock Dec 28, 2015
7f205f1
Drop compatibility code for Django 1.7 and earlier
jwhitlock Jan 6, 2016
4034b6e
Drop optparse-compatible BaseRunner
jwhitlock Jan 6, 2016
0a9e12e
Organize imports in runner.py
jwhitlock Jan 6, 2016
9ecfc4d
Support Django 1.10 test class
jwhitlock Jan 6, 2016
96d4bc1
add django 1.8 support
May 17, 2016
94ceb39
type in import
May 17, 2016
00d72e9
Merge branch 'master' into feature/django-1.8-support
May 18, 2016
e0ac0fb
block TransactionManagementError between tests
Jun 5, 2016
83463a0
fix typo
Jun 5, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,27 @@
*.pyc
.idea/

# Python binaries
*.py[cod]

# Editor backups, OS files
*.swp
*~
*.egg-info
.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/*
62 changes: 39 additions & 23 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,43 @@
sudo: false
language: python
python:
- "2.6"
- "2.7"
- "3.2"
- "3.3"
- "3.4"
env:
- DJANGO="Django>=1.4,<1.5"
- DJANGO="Django>=1.6,<1.7"
- DJANGO="Django>=1.7,<1.8"
global:
- COVERAGE=1 RUNTEST_ARGS="-v --noinput"
matrix:
# Quality checks
- TOXENV=flake8
- TOXENV=docs
# Supported Python / Django versions w/ SQLite
- TOXENV=py27-django-19
- TOXENV=py35-django-19
- TOXENV=py27-django-18
- TOXENV=py34-django-18
# Test with PostgreSQL
- TOXENV=py27-django-19-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-19-postgres"
- TOXENV=py35-django-19-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-19-postgres"
- TOXENV=py27-django-18-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-18-postgres"
# Test with MySQL
- TOXENV=py27-django-19-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-19-mysql"
- TOXENV=py35-django-19-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-19-mysql"
- TOXENV=py27-django-18-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-18-mysql"
# Django master is allowed to fail
- TOXENV=py27-django-master
- TOXENV=py35-django-master
- TOXENV=py27-django-master-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-master-mysql"
- TOXENV=py35-django-master-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-master-postgres"
matrix:
exclude:
- python: "3.2"
env: DJANGO="Django>=1.4,<1.5"
- python: "3.3"
env: DJANGO="Django>=1.4,<1.5"
- python: "3.4"
env: DJANGO="Django>=1.4,<1.5"
- python: "2.6"
env: DJANGO="Django>=1.7,<1.8"
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:
- if [ $DJANGO = 'Django>=1.4,<1.5' -o $DJANGO = 'Django>=1.6,<1.7' ]; then pip install south; fi
- pip install "$DJANGO"
- pip install -e .
script:
- ./runtests.sh
- 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
61 changes: 61 additions & 0 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
=======
Credits
=======

**django-nose** was created by Jeff Balogh in 2009, which is a really long time
ago in the Django world. It keeps running because of the contributions of
volunteers. Thank you to everyone who uses django-nose, keeps your projects
up-to-date, files detailed bugs, and submits patches.

Maintainers
-----------
* Jeff Balogh (`jbalogh <https://github.com/jbalogh>`_)
* Erik Rose (`erikrose <https://github.com/erikrose>`_)
* James Socol (`jscol <https://github.com/jsocol>`_)
* Rob Hudson (`robhudson <https://github.com/robhudson>`_)
* John Whitlock (`jwhitlock <https://github.com/jwhitlock>`_)

Contributors
------------
These non-maintainers have contributed code to a django-nose release:

* Adam DePue (`adepue <https://github.com/adepue>`_)
* Alexey Evseev (`st4lk <https://github.com/st4lk>`_)
* Alex (`alexjg <https://github.com/alexjg>`_)
* Antti Kaihola (`akaihola <https://github.com/akaihola>`_)
* Ash Christopher (`ashchristopher <https://github.com/ashchristopher>`_)
* Blake Winton (`bwinton <https://github.com/bwinton>`_)
* Brad Pitcher (`brad <https://github.com/brad>`_)
* Camilo Nova (`camilonova <https://github.com/camilonova>`_)
* Carl Meyer (`carljm <https://github.com/carljm>`_)
* Conrado Buhrer (`conrado <https://github.com/conrado>`_)
* David Baumgold (`singingwolfboy <https://github.com/singingwolfboy>`_)
* David Cramer (`dcramer <https://github.com/dcramer>`_)
* Dmitry Gladkov (`dgladkov <https://github.com/dgladkov>`_)
* Ederson Mota (`edrmp <https://github.com/edrmp>`_)
* Eric Zarowny (`ezarowny <https://github.com/ezarowny>`_)
* Eron Villarreal (`eroninjapan <https://github.com/eroninjapan>`_)
* Fred Wenzel (`fwenzel <https://github.com/fwenzel>`_)
* Fábio Santos (`fabiosantoscode <https://github.com/fabiosantoscode>`_)
* Ionel Cristian Mărieș (`ionelmc <https://github.com/ionelmc>`_)
* Jeremy Satterfield (`jsatt <https://github.com/jsatt>`_)
* Johan Euphrosine (`proppy <https://github.com/proppy>`_)
* Kyle Robertson (`dvelyk <https://github.com/dvelyk>`_)
* Marius Gedminas (`mgedmin <https://github.com/mgedmin>`_)
* Martin Chase (`outofculture <https://github.com/outofculture>`_)
* Matthias Bauer (`moeffju <https://github.com/moeffju>`_)
* Michael Elsdörfer (`miracle2k <https://github.com/miracle2k>`_)
* Michael Kelly (`Osmose <https://github.com/Osmose>`_)
* Peter Baumgartner (`ipmb <https://github.com/ipmb>`_)
* Radek Simko (`radeksimko <https://github.com/radeksimko>`_)
* Ramiro Morales (`ramiro <https://github.com/ramiro>`_)
* Rob Madole (`robmadole <https://github.com/robmadole>`_)
* Roger Hu (`rogerhu <https://github.com/rogerhu>`_)
* Ross Lawley (`rozza <https://github.com/rozza>`_)
* Scott Sexton (`scottsexton <https://github.com/scottsexton>`_)
* Stephen Burrows (`melinath <https://github.com/melinath>`_)
* Sverre Johansen (`sverrejoh <https://github.com/sverrejoh>`_)
* Tim Child (`timc3 <https://github.com/timc3>`_)
* Walter Doekes (`wdoekes <https://github.com/wdoekes>`_)
* Will Kahn-Greene (`willkg <https://github.com/willkg>`_)
* Yegor Roganov (`roganov <https://github.com/roganov>`_)
137 changes: 137 additions & 0 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
============
Contributing
============

Contributions are welcome, and they are greatly appreciated! Every
little bit helps, and credit will always be given.

You can contribute in many ways:

Types of Contributions
----------------------

Report Bugs
~~~~~~~~~~~

Report bugs at https://github.com/django-nose/django-nose/issues.

If you are reporting a bug, please include:

* The version of django, nose, and django-nose you are using, and any other
applicable packages (``pip freeze`` will show current versions)
* Any details about your local setup that might be helpful in troubleshooting.
* Detailed steps to reproduce the bug.

When someone submits a pull request to fix your bug, please try it out and
report if it worked for you.

Fix Bugs
~~~~~~~~

Look through the GitHub issues for bugs. Anything untagged or tagged with "bug"
is open to whoever wants to implement it.

Implement Features
~~~~~~~~~~~~~~~~~~

Look through the GitHub issues for features. Anything untagged ot tagged with
"feature" is open to whoever wants to implement it.

django-nose is built on nose, which supports plugins. Consider implementing
your feature as a plugin, maintained by the community using that feature,
rather than adding to the django-nose codebase.

Write Documentation
~~~~~~~~~~~~~~~~~~~

django-nose could always use more documentation, whether as part of the
official django-nose, as code comments, or even on the web in blog posts,
articles, and such.

Submit Feedback
~~~~~~~~~~~~~~~

The best way to send feedback is to file an issue at
https://github.com/django-nose/django-nose/issues.

If you are proposing a feature:

* Explain in detail how it would work.
* Keep the scope as narrow as possible, to make it easier to implement.
* Remember that this is a volunteer-driven project, and that contributions
are welcome :)

Get Started!
------------

Ready to contribute? Here's how to set up django-nose
for local development.

1. Fork the `django-nose` repo on GitHub.
2. Clone your fork locally::

$ git clone [email protected]:your_name_here/django-nose.git

3. Install your local copy into a virtualenv. Assuming you have
virtualenvwrapper installed, this is how you set up your fork for local
development::

$ mkvirtualenv django-nose
$ cd django-nose/
$ pip install -r requirements.txt
$ ./manage.py migrate

4. Create a branch for local development::

$ git checkout -b name-of-your-bugfix-or-feature

Now you can make your changes locally.

5. Make sure existing tests continue to pass with your new code::

$ make qa

6. When you're done making changes, check that your changes pass flake8 and the
tests, including testing other Python versions with tox::

$ make qa-all

6. Commit your changes and push your branch to GitHub::

$ git add .
$ git commit -m "Your detailed description of your changes."
$ git push origin name-of-your-bugfix-or-feature

7. Submit a pull request through the GitHub website.

Pull Request Guidelines
-----------------------

Before you submit a pull request, check that it meets these guidelines:

1. The pull request should be in a branch.
2. The pull request should include tests.
3. You agree to license your contribution under the BSD license.
4. If the pull request adds functionality, the docs should be updated.
5. Make liberal use of `git rebase` to ensure clean commits on top of master.
6. The pull request should pass QA tests and work for supported Python / Django
combinations. Check
https://travis-ci.org/django-nose/django-nose/pull_requests
and make sure that the tests pass for all supported Python versions.

Tips
----

The django-nose testapp uses django-nose, so all of the features are available.
To run a subset of tests::

$ ./manage.py test testapp/tests.py

To mark failed tests::

$ ./manage.py test --failed

To re-run only the failed tests::

$ ./manage.py test --failed

21 changes: 17 additions & 4 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
include AUTHORS.rst
include CONTRIBUTING.rst
include LICENSE
include Makefile
include README.rst
include changelog.rst
include contribute.json
include manage.py
include requirements.txt
include requirements-rtd.txt
include runtests.sh
include changelog.txt
recursive-exclude django_nose *.py[co]
recursive-include testapp *
recursive-exclude testapp *.py[co]

recursive-include docs Makefile conf.py *.rst make.bat .keep
recursive-include django_nose *.py
recursive-include testapp *.py
recursive-include testapp/fixtures *.json
recursive-include unittests *.py

recursive-exclude * *.py[co]
recursive-exclude * __pycache__
Loading