Commit Graph

10486 Commits

Author SHA1 Message Date
Bruno Oliveira 3d470555e8
Merge pull request #7190 from hroncok/backport-7179 2020-05-07 22:25:40 -03:00
Bruno Oliveira 2a5ca51fe8 [4.6] Merge pull request #7179 from asottile/py39 2020-05-07 23:22:29 +02:00
Bruno Oliveira 020831d868
Merge pull request #6884 from fermezz/use-github-actions
Fix travis config and coverage report.
2020-03-26 12:42:55 -03:00
Fernando Mez c5831ac98f Fix CI config and coverage report 2020-03-12 16:58:33 -03:00
Bruno Oliveira f606fef19d
[4.6] Remove usage of parser module, deprecated in Python 3.9 (#6408)
[4.6] Remove usage of parser module, deprecated in Python 3.9
2020-01-06 13:07:40 -03:00
Bruno Oliveira 24898e0640 Remove usage of parser module, deprecated in Python 3.9
Fix #6404
2020-01-06 08:58:39 -03:00
Anthony Sottile b39b867967
Merge pull request #6391 from asottile/release-4.6.9
Preparing release version 4.6.9
2020-01-04 15:59:26 -05:00
Anthony Sottile f6a5578d5c Preparing release version 4.6.9 2020-01-04 04:40:51 -08:00
Bruno Oliveira 3f94cc9e35
Merge pull request #6392 from hugovk/4.6-maintenance-2020
4.6: Update copyright year to 2020
2020-01-04 07:21:11 -03:00
Hugo 897f1a3ef4 Update copyright year 2020-01-04 09:53:49 +02:00
Hugo 035f51ab71 Update copyright year to 2020 2020-01-03 01:01:32 +02:00
Bruno Oliveira 621028c58d
[4.6] Fix assertion rewriting module detection for egg dists (#6368)
[4.6] Fix assertion rewriting module detection for egg dists
2019-12-26 13:37:00 -03:00
Felix Yan d622f12f69
Fix compatibility for Python 2 2019-12-25 19:44:39 +08:00
Bruno Oliveira e49282f72c Fix assertion rewriting module detection for egg dists
Fix #6301
2019-12-25 19:43:28 +08:00
Anthony Sottile 197c996345
Merge pull request #6360 from asottile/release-4.6.8
Preparing release version 4.6.8
2019-12-19 15:55:16 -08:00
Anthony Sottile 2d398d8706 Preparing release version 4.6.8 2019-12-19 14:42:09 -08:00
Anthony Sottile 9ab4032f74
Merge pull request #6345 from nightlark/patch-1
Pin the colorama version only for Python 3.4
2019-12-19 14:38:59 -08:00
Ryan Mast 53b08730e4 Pin the colorama version only for Python 3.4 2019-12-14 10:10:16 -03:00
Bruno Oliveira 1deb60f02f
Ensure colorama version is no newer than 0.4.1 (#6340)
Ensure colorama version is no newer than 0.4.1
2019-12-13 08:42:59 -03:00
Bruno Oliveira fb8395d93f Create CHANGELOG for #6340 2019-12-13 07:46:12 -03:00
Ryan Mast b08c599bad
Ensure colorama versions is no newer than 0.4.1 2019-12-12 21:09:21 -08:00
Bruno Oliveira 51fd451dc9
[4.6] Bugfix 5430 pass logs to junit report (#6338)
[4.6] Bugfix 5430 pass logs to junit report
2019-12-12 19:03:58 -03:00
Bruno Oliveira 1d021540a3 Drop 3.4 testing on Azure
Azure no longer supports testing on Python 3.4
2019-12-12 16:47:47 -03:00
Bruno Oliveira 8bfe434f75 Drop validation against multiple xmlfamilies
This was not backported to 4.6 before, so had to adapt the test slightly
to the old method of validation.
2019-12-12 16:44:07 -03:00
Bruno Oliveira f9ebe3c607 Bugfix 5430 pass logs to junit report (#6274)
Bugfix 5430 pass logs to junit report
2019-12-12 16:39:19 -03:00
Bruno Oliveira bd54116d03
[4.6] Add hostname and timestamp to JUnit XML testsuite tag (#5… (#6332)
[4.6] Add hostname and timestamp to JUnit XML testsuite tag (#5692)
2019-12-10 18:11:28 -03:00
Bruno Oliveira 8b9482e39c Add hostname and timestamp to JUnit XML testsuite tag (#5692)
Add hostname and timestamp to JUnit XML testsuite tag

Conflicts:
  	testing/test_junitxml.py
2019-12-10 17:27:22 -03:00
Bruno Oliveira 943f4ac236
Release version 4.6.7 (#6318)
Release version 4.6.7
2019-12-05 22:44:59 -03:00
Bruno Oliveira 6f43eee106 Preparing release version 4.6.7 2019-12-05 15:29:25 -05:00
Bruno Oliveira e1f3c0f9c3
[4.6] Include <testsuites> root tag in generated XML (#5550) (#6295)
[4.6] Include <testsuites> root tag in generated XML (#5550)
2019-11-30 12:13:57 -03:00
Bruno Oliveira 192f6992d2 Include <testsuites> root tag in generated XML (#5550)
Include <testsuites> root tag in generated XML
2019-11-30 11:30:43 -03:00
Daniel Hahler 6465244269
[4.6] Upgrade black (#6209) 2019-11-16 19:25:01 +01:00
Daniel Hahler 097acaf11b re-run black 2019-11-16 19:17:01 +01:00
Daniel Hahler 3d8649b206 Remove (now) unnecessary fmt: off 2019-11-16 19:15:56 +01:00
Daniel Hahler a8c16d9b75 pre-commit: upgrade black
This brings https://github.com/psf/black/pull/826, which helps with
https://github.com/psf/black/issues/601.
2019-11-16 19:15:54 +01:00
Bruno Oliveira 3edf417969
[4.6] Review rm_rf handling of FileNotFoundErrors (#6050)
[4.6] Review rm_rf handling of FileNotFoundErrors
2019-10-23 20:19:05 -03:00
Bruno Oliveira 0084fd9783 Review rm_rf handling of FileNotFoundErrors (#6044)
Review rm_rf handling of FileNotFoundErrors
Conflicts:
 	 src/_pytest/pathlib.py
  	testing/test_tmpdir.py
2019-10-23 19:36:35 -03:00
Daniel Hahler e89efa8325
Merge pull request #5957 from blueyed/4.6-comment-off
[4.6] ci: add codecov.yml to turn comments off
2019-10-15 02:14:31 +02:00
Daniel Hahler 3edcc71c41 ci: add codecov.yml to turn comments off
The only benefit for me is to get notified about finished builds, but
that might happen to early anyway.  Apart from that they are rather big
and distract from actual comments.

(cherry picked from commit d50198a3ff)
2019-10-14 22:32:27 +02:00
Bruno Oliveira 866daf57fe
Release 4.6.6 (#5947)
Release 4.6.6
2019-10-13 11:55:23 -03:00
Bruno Oliveira 5b499bafb2 Preparing release version 4.6.6 2019-10-11 17:02:08 -04:00
Bruno Oliveira 62c0d82d64 Use 'python3' instead of 'python3.6' on tox
This allows us to use python3.7+ to use tox
2019-10-11 16:58:40 -04:00
Bruno Oliveira d526053af3 Add changelog entry for #5902 2019-10-11 16:57:32 -04:00
Bruno Oliveira 2c7614a0e1
[4.6] Replace importlib_metadata with importlib.metadata on Pyt… (#5945)
[4.6] Replace importlib_metadata with importlib.metadata on Python 3.8+ (#5539)
2019-10-11 12:54:28 -03:00
Bruno Oliveira b9a8465ce4
Replace importlib_metadata with importlib.metadata on Python 3.8+ (#5539) 2019-10-11 17:10:01 +02:00
Bruno Oliveira 1cc974c95d
[4.6] Fix warnings with attrs 19.2 and fix object assertions (#… (#5944)
[4.6] Fix warnings with attrs 19.2 and fix object assertions (#5902)
2019-10-11 11:13:37 -03:00
Bruno Oliveira c03e46f1ad
Fix warnings with attrs 19.2 and fix object assertions (#5902)
Fix warnings with attrs 19.2 and fix object assertions
2019-10-11 15:26:23 +02:00
Bruno Oliveira f2d87dcf6c
Merge pull request #5809 from goerz/pastebin
Fix "lexer" being used when uploading to bpaste.net
2019-09-01 09:34:16 -03:00
Michael Goerz 914441557c Fix "lexer" being used when uploading to bpaste.net
Closes #5806.
2019-09-01 00:38:11 -04:00
Anthony Sottile 8aba863a63
Merge pull request #5801 from asottile/flake8_2020
[4.6] fixes for python4
2019-08-29 10:30:54 -07:00