[Pytest-commit] [pytest-dev/pytest] 7277fb: Fix SMTP port in fixture docs

[Bruno Oliveira]

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 7277fbdb2048655ff1d52d9ca046a14aa05e5f90
      https://github.com/pytest-dev/pytest/commit/7277fbdb2048655ff1d52d9ca046a14aa05e5f90
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M doc/en/fixture.rst

  Log Message:
  -----------
  Fix SMTP port in fixture docs

Also add timeout to avoid regen getting stuck due
to connection problems

Fix #2509


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

  Changed paths:
    M tasks/requirements.txt

  Log Message:
  -----------
  Add wheel to tasks/requirements.txt: required for package creation


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

  Changed paths:
    M CHANGELOG.rst
    R changelog/2434.bugfix
    R changelog/2440.bugfix
    R changelog/2464.bugfix
    R changelog/2469.bugfix
    R changelog/2474.trivial
    R changelog/2475.bugfix
    R changelog/2486.bugfix
    R changelog/2493.doc
    R changelog/2499.trivial
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.3.rst
    M doc/en/assert.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/parametrize.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/tmpdir.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Preparing release version 3.1.3


Compare: https://github.com/pytest-dev/pytest/compare/6908d93ba1c4...b63f6770a17a