diff options
| author | Bruno Oliveira <nicoddemus@gmail.com> | 2018-10-18 19:23:16 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-18 19:23:16 -0300 |
| commit | b432f1207c6f24d96bc07b8cc1ae1bff9311c74d (patch) | |
| tree | 7fc2ada1aa9203cea226541c49aa2790d6b1a2e6 /changelog | |
| parent | 43c3f596605ad3ccf989a1d0aa41b5fcc872d25b (diff) | |
| parent | e4871f7722d4254b28718e9c27b7e927ecf66191 (diff) | |
| download | pytest-b432f1207c6f24d96bc07b8cc1ae1bff9311c74d.tar.gz | |
Merge pull request #4190 from nicoddemus/merge-master-into-features
Merge master into features
Diffstat (limited to 'changelog')
| -rw-r--r-- | changelog/3533.bugfix.rst | 1 | ||||
| -rw-r--r-- | changelog/4177.bugfix.rst | 1 | ||||
| -rw-r--r-- | changelog/4179.bugfix.rst | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/changelog/3533.bugfix.rst b/changelog/3533.bugfix.rst new file mode 100644 index 000000000..89f136458 --- /dev/null +++ b/changelog/3533.bugfix.rst @@ -0,0 +1 @@ +Fix unescaped XML raw objects in JUnit report for skipped tests diff --git a/changelog/4177.bugfix.rst b/changelog/4177.bugfix.rst new file mode 100644 index 000000000..b26ad4bad --- /dev/null +++ b/changelog/4177.bugfix.rst @@ -0,0 +1 @@ +Pin ``setuptools>=40.0`` to support ``py_modules`` in ``setup.cfg`` diff --git a/changelog/4179.bugfix.rst b/changelog/4179.bugfix.rst new file mode 100644 index 000000000..6f7467f50 --- /dev/null +++ b/changelog/4179.bugfix.rst @@ -0,0 +1 @@ +Restore the tmpdir behaviour of symlinking the current test run. |