Skip to content

Improve 'configuring' docs #642

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

Merged
merged 2 commits into from
Sep 8, 2018
Merged

Conversation

adamchainz
Copy link
Member

Tidy wording and improve syntax highlighting - single backticks had been used in some places instead of double, giving italics rather than code highlighting.

Tidy wording and improve syntax highlighting - single backticks had been used in some places instead of double, giving italics rather than code highlighting.
@adamchainz adamchainz requested a review from blueyed August 31, 2018 13:32

* The command line option ``--ds``
* The environment variable ``DJANGO_SETTINGS_MODULE``
* The configuration file - ``pytest.ini``, or file that Pytest finds such as
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/Pytest/pytest/

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

``tox.ini``

If you want to override from the configuration file, you can use
``addopts = --ds=yourtestsettings``.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mention that DJANGO_SETTINGS_MODULE is the name to be used in the config? (when not overriding)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reworded a bit.

@codecov-io
Copy link

Codecov Report

Merging #642 into master will increase coverage by 7.61%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #642      +/-   ##
==========================================
+ Coverage   85.09%   92.71%   +7.61%     
==========================================
  Files          33       33              
  Lines        1812     1812              
  Branches      154      154              
==========================================
+ Hits         1542     1680     +138     
+ Misses        214       94     -120     
+ Partials       56       38      -18
Flag Coverage Δ
#dj110 84.82% <ø> (?)
#dj111 87.25% <ø> (?)
#dj18 85.7% <ø> (?)
#dj19 84.6% <ø> (?)
#dj20 85.09% <ø> (ø) ⬆️
#dj21 81.07% <ø> (?)
#mysql_innodb 85.32% <ø> (?)
#mysql_myisam 85.04% <ø> (?)
#postgres 88.52% <ø> (+3.42%) ⬆️
#py27 90.23% <ø> (?)
#py34 84.6% <ø> (?)
#py35 84.82% <ø> (?)
#py36 85.65% <ø> (+0.55%) ⬆️
#py37 81.07% <ø> (?)
#sqlite 86.81% <ø> (?)
#sqlite_file 84.6% <ø> (?)
Impacted Files Coverage Δ
pytest_django/fixtures.py 97.22% <0%> (+1.11%) ⬆️
tests/test_fixtures.py 99.59% <0%> (+1.6%) ⬆️
tests/test_django_settings_module.py 100% <0%> (+1.78%) ⬆️
tests/test_environment.py 100% <0%> (+2.17%) ⬆️
tests/test_db_setup.py 100% <0%> (+4.39%) ⬆️
pytest_django/plugin.py 86.47% <0%> (+4.5%) ⬆️
tests/test_urls.py 100% <0%> (+8.33%) ⬆️
tests/conftest.py 100% <0%> (+8.92%) ⬆️
tests/test_database.py 99.16% <0%> (+13.33%) ⬆️
pytest_django_test/settings_base.py 85.71% <0%> (+14.28%) ⬆️
... and 8 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7d5b2d9...9da0e2a. Read the comment docs.

@blueyed blueyed merged commit aaa00ad into pytest-dev:master Sep 8, 2018
@blueyed
Copy link
Contributor

blueyed commented Sep 8, 2018

Thanks!

@adamchainz adamchainz deleted the configuring_docs branch January 11, 2019 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants