Merge pull request pytest-dev#3656 from nicoddemus/release-3.6.3

Release 3.6.3
robertschweizer · Jul 4, 2018 · b64c266 · b64c266
2 parents 3ed8e28 + 73d787d
commit b64c266
Show file tree

Hide file tree

Showing 16 changed files with 133 additions and 77 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -8,6 +8,52 @@
 
 .. towncrier release notes start
 
+Pytest 3.6.3 (2018-07-04)
+=========================
+
+Bug Fixes
+---------
+
+- Fix ``ImportWarning`` triggered by explicit relative imports in
+  assertion-rewritten package modules. (`#3061
+  <https://github.com/pytest-dev/pytest/issues/3061>`_)
+
+- Fix error in ``pytest.approx`` when dealing with 0-dimension numpy
+  arrays. (`#3593 <https://github.com/pytest-dev/pytest/issues/3593>`_)
+
+- No longer raise ``ValueError`` when using the ``get_marker`` API. (`#3605
+  <https://github.com/pytest-dev/pytest/issues/3605>`_)
+
+- Fix problem where log messages with non-ascii characters would not
+  appear in the output log file.
+  (`#3630 <https://github.com/pytest-dev/pytest/issues/3630>`_)
+
+- No longer raise ``AttributeError`` when legacy marks can't be stored in
+  functions. (`#3631 <https://github.com/pytest-dev/pytest/issues/3631>`_)
+
+
+Improved Documentation
+----------------------
+
+- The description above the example for ``@pytest.mark.skipif`` now better
+  matches the code. (`#3611
+  <https://github.com/pytest-dev/pytest/issues/3611>`_)
+
+
+Trivial/Internal Changes
+------------------------
+
+- Internal refactoring: removed unused ``CallSpec2tox ._globalid_args``
+  attribute and ``metafunc`` parameter from ``CallSpec2.copy()``. (`#3598
+  <https://github.com/pytest-dev/pytest/issues/3598>`_)
+
+- Silence usage of ``reduce`` warning in Python 2 (`#3609
+  <https://github.com/pytest-dev/pytest/issues/3609>`_)
+
+- Fix usage of ``attr.ib`` deprecated ``convert`` parameter. (`#3653
+  <https://github.com/pytest-dev/pytest/issues/3653>`_)
+
+
 Pytest 3.6.2 (2018-06-20)
 =========================
 

diff --git a/HOWTORELEASE.rst b/HOWTORELEASE.rst
@@ -10,10 +10,6 @@ taking a lot of time to make a new one.
     pytest releases must be prepared on **Linux** because the docs and examples expect
     to be executed in that platform.
 
-#. Install development dependencies in a virtual environment with::
-
-    pip3 install -U -r tasks/requirements.txt
-
 #. Create a branch ``release-X.Y.Z`` with the version for the release.
 
    * **patch releases**: from the latest ``master``;
@@ -22,9 +18,19 @@ taking a lot of time to make a new one.
 
    Ensure your are in a clean work tree.
 
-#. Generate docs, changelog, announcements and a **local** tag::
+#. Install development dependencies in a virtual environment with::
+
+    $ pip3 install -U -r tasks/requirements.txt
+
+#. Generate docs, changelog, announcements, and a **local** tag::
+
+    $ invoke generate.pre-release <VERSION>
+
+#. Execute pre-commit on all files to ensure the docs are conformant and commit your results::
+
+    $ pre-commit run --all-files
+    $ git commit -am "Fix files with pre-commit"
 
-     invoke generate.pre-release <VERSION>
 
 #. Open a PR for this branch targeting ``master``.
 

diff --git a/changelog/3061.bugfix.rst b/changelog/3061.bugfix.rst
diff --git a/changelog/3593.bugfix.rst b/changelog/3593.bugfix.rst
diff --git a/changelog/3598.trivial.rst b/changelog/3598.trivial.rst
diff --git a/changelog/3605.bugfix.rst b/changelog/3605.bugfix.rst
diff --git a/changelog/3609.trivial.rst b/changelog/3609.trivial.rst
diff --git a/changelog/3611.doc.rst b/changelog/3611.doc.rst
diff --git a/changelog/3630.bugfix.rst b/changelog/3630.bugfix.rst
diff --git a/changelog/3631.bugfix.rst b/changelog/3631.bugfix.rst
diff --git a/changelog/3653.trivial.rst b/changelog/3653.trivial.rst
diff --git a/doc/en/announce/index.rst b/doc/en/announce/index.rst
@@ -6,6 +6,7 @@ Release announcements
    :maxdepth: 2
 
 
+   release-3.6.3
    release-3.6.2
    release-3.6.1
    release-3.6.0

diff --git a/doc/en/announce/release-3.6.3.rst b/doc/en/announce/release-3.6.3.rst
@@ -0,0 +1,28 @@
+pytest-3.6.3
+=======================================
+
+pytest 3.6.3 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at http://doc.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* AdamEr8
+* Anthony Sottile
+* Bruno Oliveira
+* Jean-Paul Calderone
+* Jon Dufresne
+* Marcelo Duarte Trevisani
+* Ondřej Súkup
+* Ronny Pfannschmidt
+* T.E.A de Souza
+* Victor
+* victor
+
+
+Happy testing,
+The pytest Development Team
diff --git a/doc/en/builtin.rst b/doc/en/builtin.rst
@@ -90,7 +90,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
             monkeypatch.setitem(mapping, name, value)
             monkeypatch.delitem(obj, name, raising=True)
             monkeypatch.setenv(name, value, prepend=False)
-            monkeypatch.delenv(name, value, raising=True)
+            monkeypatch.delenv(name, raising=True)
             monkeypatch.syspath_prepend(path)
             monkeypatch.chdir(path)