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.

Sign up for GitHub

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

Jump to bottom

doc: mention addopts to set --ds; typos #283

Merged
merged 1 commit into from
Oct 16, 2015
Merged

doc: mention addopts to set --ds; typos #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions docs/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ Compatibility

* Settings defined in `pytest.ini`/`tox.ini`/`setup.cfg` used to override
`DJANGO_SETTINGS_MODULE` defined in the environment. Previously the order was
undocmented. Now, instead the settings from the environment will be used
instead. If you previously relied on overriding the enviornment variable, you
can instead specify `addopts = --ds=yourtestsettings` in the ini-file which
will use the test settings. See `PR #199
undocumented. Now, instead the settings from the environment will be used
instead. If you previously relied on overriding the environment variable,
you can instead specify `addopts = --ds=yourtestsettings` in the ini-file
which will use the test settings. See `PR #199
<https://github.com/pytest-dev/pytest-django/pull/199>`_.

* Support for Django 1.9.
Expand Down
9 changes: 6 additions & 3 deletions docs/configuring_django.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,12 @@ Example contents of pytest.ini::
Order of choosing settings
--------------------------

If `--ds`, the environment variable and the pytest.ini configuration is used at
the same time, pytest-django will first prefer using settings from the command
line option `--ds`, then the environment variable and last the pytest.ini.
When the command option `--ds`, the environment variable and the pytest.ini
configuration is used at the same time, pytest-django will prefer using
settings from the command line option `--ds`, then the environment variable and
last the pytest.ini.
You can use `addopts = --ds=yourtestsettings` in your pytest configuration
to automatically add the `--ds` option.

Using django-configurations
---------------------------
Expand Down