[Pytest-commit] [pytest-dev/pytest] 21f522: Fix fixture.rst spelling & grammar

Mon Jul 30 06:26:21 EDT 2018

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 21f522278403362908805ea015a39a6acabf2a01
      https://github.com/pytest-dev/pytest/commit/21f522278403362908805ea015a39a6acabf2a01
  Author: Drew <drewrisinger at users.noreply.github.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M doc/en/fixture.rst

  Log Message:
  -----------
  Fix fixture.rst spelling & grammar

Fix a few typos.

  Commit: 254689ff8369adc465f1cc78a38a1e06ed63488c
      https://github.com/pytest-dev/pytest/commit/254689ff8369adc465f1cc78a38a1e06ed63488c
  Author: Drew <drewrisinger at users.noreply.github.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M doc/en/mark.rst

  Log Message:
  -----------
  Fix mark.rst typos & grammar

Fix minor typos

  Commit: 9720c3301aa3296f941c71a0f45bcd7054c0c9fc
      https://github.com/pytest-dev/pytest/commit/9720c3301aa3296f941c71a0f45bcd7054c0c9fc
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M doc/en/fixture.rst

  Log Message:
  -----------
  Merge pull request #3690 from drewrisinger/patch-1

Fix fixture.rst typos & grammar

  Commit: 19de1b7f291d21b4b6e38c8627a79231a2f21cc7
      https://github.com/pytest-dev/pytest/commit/19de1b7f291d21b4b6e38c8627a79231a2f21cc7
  Author: E Hershey <github at ernie.org>
  Date:   2018-07-22 (Sun, 22 Jul 2018)

  Changed paths:
    M doc/en/customize.rst

  Log Message:
  -----------
  typo - PYTEST_ADDOTPS -> PYTEST_ADDOPTS

  Commit: be2afb950ac2e7df8866b66edeaa9294c88e5714
      https://github.com/pytest-dev/pytest/commit/be2afb950ac2e7df8866b66edeaa9294c88e5714
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-07-22 (Sun, 22 Jul 2018)

  Changed paths:
    M doc/en/customize.rst

  Log Message:
  -----------
  Merge pull request #3706 from ehershey/patch-1

typo - $PYTEST_ADDOTPS -> $PYTEST_ADDOPTS

  Commit: f76142508f2b24cdee93453088c6999dc54f99bb
      https://github.com/pytest-dev/pytest/commit/f76142508f2b24cdee93453088c6999dc54f99bb
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-07-22 (Sun, 22 Jul 2018)

  Changed paths:
    M doc/en/mark.rst

  Log Message:
  -----------
  Merge pull request #3694 from drewrisinger/patch-2

Fix mark.rst typos & grammar

  Commit: 2e344d4d63aaf32a759d602aee4e3f69a24e90dd
      https://github.com/pytest-dev/pytest/commit/2e344d4d63aaf32a759d602aee4e3f69a24e90dd
  Author: Bernhard M. Wiedemann <bwiedemann at suse.de>
  Date:   2018-07-23 (Mon, 23 Jul 2018)

  Changed paths:
    M doc/en/conf.py

  Log Message:
  -----------
  Do not claim copyright for future years

When building today's python-pytest-doc openSUSE package
in the year 2033, the documentation .html files state
Copyright 2015-2033 , holger krekel and pytest-dev team.

That cannot be correct, because nobody did anything copyright-worthy
for this file in 2033.

See also https://stackoverflow.com/questions/2390230/do-copyright-dates-need-to-be-updated

Additionally, this change makes the package build reproducible.
See https://reproducible-builds.org/ for why this is good.

  Commit: b7419bd9bb2ad5b609532766ceb77e7b732e1dcf
      https://github.com/pytest-dev/pytest/commit/b7419bd9bb2ad5b609532766ceb77e7b732e1dcf
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-23 (Mon, 23 Jul 2018)

  Changed paths:
    M doc/en/conf.py

  Log Message:
  -----------
  Merge pull request #3710 from bmwiedemann/date

Do not claim copyright for future years

  Commit: 79b4ca92d8bd294b600882a281ec4519bd746680
      https://github.com/pytest-dev/pytest/commit/79b4ca92d8bd294b600882a281ec4519bd746680
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-27 (Fri, 27 Jul 2018)

  Changed paths:
    M pyproject.toml

  Log Message:
  -----------
  Use "pytest" on the CHANGELOG

  Commit: fe06be85905ea9363323a18be489d3619d1fbab9
      https://github.com/pytest-dev/pytest/commit/fe06be85905ea9363323a18be489d3619d1fbab9
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-27 (Fri, 27 Jul 2018)

  Changed paths:
    M pyproject.toml

  Log Message:
  -----------
  Merge pull request #3723 from pytest-dev/nicoddemus-patch-1

Use "pytest" on the CHANGELOG

  Commit: 7f27512a48de0c80c10b876e7d5282fe1c3bcd8a
      https://github.com/pytest-dev/pytest/commit/7f27512a48de0c80c10b876e7d5282fe1c3bcd8a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-28 (Sat, 28 Jul 2018)

  Changed paths:
    A changelog/3727.trivial.rst
    M setup.py

  Log Message:
  -----------
  Pin pluggy to <0.8

  Commit: 317cd41215cc4e6e829f86afdacf0dc15bb43e36
      https://github.com/pytest-dev/pytest/commit/317cd41215cc4e6e829f86afdacf0dc15bb43e36
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-28 (Sat, 28 Jul 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2319.trivial.rst
    R changelog/3402.trivial.rst
    R changelog/3592.doc.rst
    R changelog/3635.trivial.rst
    R changelog/3727.trivial.rst
    R changelog/742.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.4.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/simple.rst

  Log Message:
  -----------
  Preparing release version 3.6.4

  Commit: eaeeedc9c30541e4509043e09de6c5e2f28df070
      https://github.com/pytest-dev/pytest/commit/eaeeedc9c30541e4509043e09de6c5e2f28df070
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-28 (Sat, 28 Jul 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2319.trivial.rst
    R changelog/3402.trivial.rst
    R changelog/3592.doc.rst
    R changelog/3635.trivial.rst
    R changelog/742.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.4.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/simple.rst
    M setup.py

  Log Message:
  -----------
  Merge pull request #3728 from nicoddemus/release-3.6.4

Release 3.6.4

  Commit: b6da5cc54c04e5ee8c1987ae3ec647711ebc625d
      https://github.com/pytest-dev/pytest/commit/b6da5cc54c04e5ee8c1987ae3ec647711ebc625d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-28 (Sat, 28 Jul 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Fix "Pytest" to "pytest" in the CHANGELOG

Now that we have fixed towncrier to render the proper title, seems fitting
to update the others

  Commit: 3f3f6f1be433d45826ae95db7ddbe8c900d3ec62
      https://github.com/pytest-dev/pytest/commit/3f3f6f1be433d45826ae95db7ddbe8c900d3ec62
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Merge pull request #3729 from nicoddemus/fix-changelog-titles

Fix "Pytest" to "pytest" in the CHANGELOG

  Commit: 8d401cdb9df6fe4b349ff246ef3ec93f87254fc7
      https://github.com/pytest-dev/pytest/commit/8d401cdb9df6fe4b349ff246ef3ec93f87254fc7
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    M .pre-commit-config.yaml

  Log Message:
  -----------
  Use upstream rst-backticks hook

  Commit: fe46fbb71954a8d81e7d5441429f9d7464669186
      https://github.com/pytest-dev/pytest/commit/fe46fbb71954a8d81e7d5441429f9d7464669186
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Fix reference to _Result in docs

  Commit: d900a6c8bdaf8465db1f8f377ef874b5ed6c3edc
      https://github.com/pytest-dev/pytest/commit/d900a6c8bdaf8465db1f8f377ef874b5ed6c3edc
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    M .pre-commit-config.yaml

  Log Message:
  -----------
  Merge pull request #3731 from asottile/pygrep_hooks

Use upstream rst-backticks hook

  Commit: 0b522d40a7108e9d0be07c984884f3b0491f44d8
      https://github.com/pytest-dev/pytest/commit/0b522d40a7108e9d0be07c984884f3b0491f44d8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Merge pull request #3734 from nicoddemus/fix-docs

Fix reference to _Result in docs

  Commit: 0e475995720b846db91d02384b61ad8a54e9229d
      https://github.com/pytest-dev/pytest/commit/0e475995720b846db91d02384b61ad8a54e9229d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M CHANGELOG.rst
    R changelog/2319.trivial.rst
    R changelog/3402.trivial.rst
    R changelog/3592.doc.rst
    R changelog/3635.trivial.rst
    R changelog/742.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.4.rst
    M doc/en/conf.py
    M doc/en/customize.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/mark.rst
    M doc/en/reference.rst
    M pyproject.toml
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into merge-master-into-features

  Commit: 8af78f417f19c247df99fc235cc73e1ec5a1ba0e
      https://github.com/pytest-dev/pytest/commit/8af78f417f19c247df99fc235cc73e1ec5a1ba0e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M CHANGELOG.rst
    R changelog/2319.trivial.rst
    R changelog/3402.trivial.rst
    R changelog/3592.doc.rst
    R changelog/3635.trivial.rst
    R changelog/742.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.4.rst
    M doc/en/conf.py
    M doc/en/customize.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/mark.rst
    M doc/en/reference.rst
    M pyproject.toml
    M setup.py

  Log Message:
  -----------
  Merge pull request #3732 from nicoddemus/merge-master-into-features

Merge master into features

Compare: https://github.com/pytest-dev/pytest/compare/fe16f81da14b...8af78f417f19
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.