Skip to content

Commit

Permalink
Merge e2eaca2 into 42eae06
Browse files Browse the repository at this point in the history
  • Loading branch information
jwhitlock committed Jul 2, 2019
2 parents 42eae06 + e2eaca2 commit c344d46
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 23 deletions.
15 changes: 12 additions & 3 deletions CONTRIBUTING.rst
Expand Up @@ -2,6 +2,15 @@
Contributing
============

.. image:: https://jazzband.co/static/img/jazzband.svg
:target: https://jazzband.co/
:alt: Jazzband

This is a `Jazzband <https://jazzband.co>`_ project. By contributing you agree
to abide by the
`Contributor Code of Conduct <https://jazzband.co/about/conduct>`_ and follow the
`guidelines <https://jazzband.co/about/guidelines>`_.

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

Expand All @@ -13,7 +22,7 @@ Types of Contributions
Report Bugs
~~~~~~~~~~~

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

If you are reporting a bug, please include:

Expand Down Expand Up @@ -52,7 +61,7 @@ Submit Feedback
~~~~~~~~~~~~~~~

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

If you are proposing a feature:

Expand Down Expand Up @@ -116,7 +125,7 @@ Before you submit a pull request, check that it meets these guidelines:
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
https://travis-ci.org/jazzband/django-nose/pull_requests
and make sure that the tests pass for all supported Python versions.

Tips
Expand Down
18 changes: 11 additions & 7 deletions README.rst
Expand Up @@ -6,13 +6,17 @@ django-nose
:alt: The PyPI package
:target: https://pypi.python.org/pypi/django-nose

.. image:: https://img.shields.io/travis/django-nose/django-nose/master.svg
.. image:: https://img.shields.io/travis/jazzband/django-nose/master.svg
:alt: TravisCI Build Status
:target: https://travis-ci.org/django-nose/django-nose
:target: https://travis-ci.org/jazzband/django-nose

.. image:: https://img.shields.io/coveralls/django-nose/django-nose/master.svg
.. image:: https://img.shields.io/coveralls/jazzband/django-nose/master.svg
:alt: Coveralls Test Coverage
:target: https://coveralls.io/r/django-nose/django-nose?branch=master
:target: https://coveralls.io/r/jazzband/django-nose?branch=master

.. image:: https://jazzband.co/static/img/badge.svg
:alt: Jazzband
:target: https://jazzband.co/

.. Omit badges from docs
Expand Down Expand Up @@ -65,7 +69,7 @@ The development version can be installed with... :

.. code-block:: shell
$ pip install -e git://github.com/django-nose/django-nose.git#egg=django-nose
$ pip install -e git://github.com/jazzband/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``:
Expand All @@ -86,6 +90,6 @@ Then set ``TEST_RUNNER`` in ``settings.py``:
Development
-----------
:Code: https://github.com/django-nose/django-nose
:Issues: https://github.com/django-nose/django-nose/issues?state=open
:Code: https://github.com/jazzband/django-nose
:Issues: https://github.com/jazzband/django-nose/issues?state=open
:Docs: https://django-nose.readthedocs.io
12 changes: 6 additions & 6 deletions contribute.json
Expand Up @@ -2,17 +2,17 @@
"name": "django-nose",
"description": "Django test runner using nose.",
"repository": {
"url": "https://github.com/django-nose/django-nose",
"url": "https://github.com/jazzband/django-nose",
"license": "BSD",
"tests": "https://travis-ci.org/django-nose/django-nose"
"tests": "https://travis-ci.org/jazzband/django-nose"
},
"participate": {
"home": "https://github.com/django-nose/django-nose",
"docs": "https://github.com/django-nose/django-nose"
"home": "https://github.com/jazzband/django-nose",
"docs": "https://github.com/jazzband/django-nose"
},
"bugs": {
"list": "https://github.com/django-nose/django-nose/issues",
"report": "https://github.com/django-nose/django-nose/issues/new"
"list": "https://github.com/jazzband/django-nose/issues",
"report": "https://github.com/jazzband/django-nose/issues/new"
},
"keywords": [
"django",
Expand Down
2 changes: 1 addition & 1 deletion docs/installation.rst
Expand Up @@ -11,7 +11,7 @@ The development version can be installed with... :

.. code-block:: shell
$ pip install -e git://github.com/django-nose/django-nose.git#egg=django-nose
$ pip install -e git://github.com/jazzband/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``:
Expand Down
2 changes: 1 addition & 1 deletion docs/upgrading.rst
Expand Up @@ -42,7 +42,7 @@ Django 1.1
~~~~~~~~~~

If you want to use django-nose with Django 1.1, use
https://github.com/django-nose/django-nose/tree/django-1.1 or
https://github.com/jazzband/django-nose/tree/django-1.1 or
http://pypi.python.org/pypi/django-nose/0.0.3.

Django 1.0
Expand Down
6 changes: 3 additions & 3 deletions docs/usage.rst
Expand Up @@ -13,9 +13,9 @@ Enabling Database Reuse
-----------------------

.. warning:: There are several
`open issues <https://github.com/django-nose/django-nose/milestones/Fix%20REUSE_DB=1>`_
`open issues <https://github.com/jazzband/django-nose/milestones/Fix%20REUSE_DB=1>`_
with this feature, including
`reports of data loss <https://github.com/django-nose/django-nose/issues/76>`_.
`reports of data loss <https://github.com/jazzband/django-nose/issues/76>`_.

You can save several seconds at the beginning and end of your test suite by
reusing the test database from the last run. To do this, set the environment
Expand All @@ -36,7 +36,7 @@ Enabling Fast Fixtures
----------------------

.. warning:: There are several
`known issues <https://github.com/django-nose/django-nose/milestones/Fix%20FastFixtureTestCase>`_
`known issues <https://github.com/jazzband/django-nose/milestones/Fix%20FastFixtureTestCase>`_
with this feature.

django-nose includes a fixture bundler which drastically speeds up your tests
Expand Down
2 changes: 1 addition & 1 deletion runtests.sh
Expand Up @@ -177,7 +177,7 @@ django_test "./manage.py test unittests --attr special $NOINPUT" 1 'select by at
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
# https://github.com/jazzband/django-nose/milestones/Fix%20REUSE_DB=1
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'

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -44,7 +44,7 @@ def get_long_description(title):
author_email='me@jeffbalogh.org',
maintainer='Erik Rose',
maintainer_email='erikrose@grinchcentral.com',
url='http://github.com/django-nose/django-nose',
url='http://github.com/jazzband/django-nose',
license='BSD',
packages=find_packages(exclude=['testapp', 'testapp/*']),
include_package_data=True,
Expand Down

0 comments on commit c344d46

Please sign in to comment.