From 75cf8601f9bd6639e98af4e44f057803ad849f76 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 16 Sep 2018 13:23:46 +0200 Subject: [PATCH 01/16] TEMP: only single job --- .travis.yml | 55 +---------------------------------------------------- 1 file changed, 1 insertion(+), 54 deletions(-) diff --git a/.travis.yml b/.travis.yml index 627305e83..332a27803 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,61 +7,8 @@ jobs: include: # py37 is not available in trusty dist, and requires sudo=true with xenial. - stage: test - python: 3.7 - env: TOXENV=py37-dj21-sqlite - dist: xenial - sudo: true - - - python: 3.6 - env: TOXENV=py36-djmaster-sqlite - - python: 3.6 - env: TOXENV=py36-dj20-postgres - - python: 3.6 - env: TOXENV=py36-dj111-sqlite - - - python: 3.5 - env: TOXENV=py35-dj110-postgres - - - python: 3.4 - env: TOXENV=py34-dj19-sqlite_file - - - python: 2.7 - env: TOXENV=py27-dj111-mysql_innodb - - python: 2.7 - env: TOXENV=py27-dj111-mysql_myisam - - python: 2.7 - env: TOXENV=py27-dj18-postgres - - # pypy/pypy3: not included with coverage reports (much slower then). - - python: pypy - env: TOXENV=pypy-dj111-sqlite_file SKIP_COVERAGE=1 - - python: pypy3 - env: TOXENV=pypy3-dj110-sqlite SKIP_COVERAGE=1 - - - python: 3.6 - env: TOXENV=checkqa,docs SKIP_COVERAGE=1 - - - stage: test_release python: 3.6 - env: TOXENV=py36-dj20-postgres SKIP_COVERAGE=1 - - - stage: release - script: skip - install: skip - after_success: true - deploy: - provider: pypi - user: blueyed - password: - secure: "FY7qbX/N0XRcH8hVk00SsQWvNIkuxKvY7Br4ghRnHvleHG3YulJ7WbJnik+9eoBGeMfJeNyzBfVjpeo1ZIq9IZBiyTdNfG/sZFsC5LOoG/CPxPH3nD9JktI2HoBMnlSbGg/MMHjY+wXuOY647U/3qNedcnQmGztYt6QWi5DRxu8=" - on: - tags: true - distributions: "sdist bdist_wheel" - - # NOTE: does not show up in "allowed failures" section, but is allowed to - # fail (for the "test" stage). - allow_failures: - - env: TOXENV=py36-djmaster-sqlite + env: TOXENV=py36-dj21-sqlite stages: - name: test From f31a22978ecc115ddf07b8d1c93ef1e22531d68b Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 16 Sep 2018 13:46:17 +0200 Subject: [PATCH 02/16] 8eae2242df3ea8471187587e81ee97de3f65b7b0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 332a27803..1c03760be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ install: if [[ "$SKIP_COVERAGE" != "1" ]]; then PYTEST_DJANGO_COVERAGE=1 export PYTEST_ADDOPTS='--cov=pytest_django --cov=tests --cov=pytest_django_test --cov-report=term-missing:skip-covered' - export _PYTESTDJANGO_TOX_EXTRA_DEPS='pytest-cov==2.5.1' + export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/pytest-dev/pytest-cov/archive/8eae2242df3ea8471187587e81ee97de3f65b7b0.tar.gz' else PYTEST_DJANGO_COVERAGE=0 fi From 70c4277b61859436b8182a318c0a3bb23cc7f77c Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 16 Sep 2018 13:53:14 +0200 Subject: [PATCH 03/16] bad => 00441a99282ad7ba2be9d7b983d6a28f49f0f14e --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1c03760be..c2c4f1765 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ install: if [[ "$SKIP_COVERAGE" != "1" ]]; then PYTEST_DJANGO_COVERAGE=1 export PYTEST_ADDOPTS='--cov=pytest_django --cov=tests --cov=pytest_django_test --cov-report=term-missing:skip-covered' - export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/pytest-dev/pytest-cov/archive/8eae2242df3ea8471187587e81ee97de3f65b7b0.tar.gz' + export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/pytest-dev/pytest-cov/archive/00441a99282ad7ba2be9d7b983d6a28f49f0f14e.tar.gz' else PYTEST_DJANGO_COVERAGE=0 fi From 8702bf84f98a45e41ef868209a156728b3fca557 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 16 Sep 2018 13:56:56 +0200 Subject: [PATCH 04/16] good => 5735d9b34470508b0656d55d7c267fec2b3dbad4 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c2c4f1765..fc10d0cd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ install: if [[ "$SKIP_COVERAGE" != "1" ]]; then PYTEST_DJANGO_COVERAGE=1 export PYTEST_ADDOPTS='--cov=pytest_django --cov=tests --cov=pytest_django_test --cov-report=term-missing:skip-covered' - export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/pytest-dev/pytest-cov/archive/00441a99282ad7ba2be9d7b983d6a28f49f0f14e.tar.gz' + export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/pytest-dev/pytest-cov/archive/5735d9b34470508b0656d55d7c267fec2b3dbad4.tar.gz' else PYTEST_DJANGO_COVERAGE=0 fi From 9512df7408f8c8af9450d099c60c1ed004b3ad6f Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 16 Sep 2018 14:01:14 +0200 Subject: [PATCH 05/16] bad => 58c3ef15075a24077a2395b0edf0a6952c956d33 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fc10d0cd7..22e8183ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ install: if [[ "$SKIP_COVERAGE" != "1" ]]; then PYTEST_DJANGO_COVERAGE=1 export PYTEST_ADDOPTS='--cov=pytest_django --cov=tests --cov=pytest_django_test --cov-report=term-missing:skip-covered' - export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/pytest-dev/pytest-cov/archive/5735d9b34470508b0656d55d7c267fec2b3dbad4.tar.gz' + export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/pytest-dev/pytest-cov/archive/58c3ef15075a24077a2395b0edf0a6952c956d33.tar.gz' else PYTEST_DJANGO_COVERAGE=0 fi From 240c34ea3dd0edcb787611a166c6869d26bca02e Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 16 Sep 2018 14:07:18 +0200 Subject: [PATCH 06/16] skip (missig abspath) => bdfd9c3907f66430fd8d9e9569ae4c3d214a8b33 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 22e8183ea..b89715b7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,8 +24,8 @@ install: # Setup coverage tracking. if [[ "$SKIP_COVERAGE" != "1" ]]; then PYTEST_DJANGO_COVERAGE=1 - export PYTEST_ADDOPTS='--cov=pytest_django --cov=tests --cov=pytest_django_test --cov-report=term-missing:skip-covered' - export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/pytest-dev/pytest-cov/archive/58c3ef15075a24077a2395b0edf0a6952c956d33.tar.gz' + export PYTEST_ADDOPTS='-x --cov=pytest_django --cov=tests --cov=pytest_django_test --cov-report=term-missing:skip-covered' + export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/pytest-dev/pytest-cov/archive/bdfd9c3907f66430fd8d9e9569ae4c3d214a8b33.tar.gz' else PYTEST_DJANGO_COVERAGE=0 fi From d2e32959712f22dece7ce6c6cc2530e9337603b6 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 16 Sep 2018 14:12:16 +0200 Subject: [PATCH 07/16] bad => 6b1e878f3654d3758bd7f3fefcc90b0b828d158e --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b89715b7b..4373923e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ install: if [[ "$SKIP_COVERAGE" != "1" ]]; then PYTEST_DJANGO_COVERAGE=1 export PYTEST_ADDOPTS='-x --cov=pytest_django --cov=tests --cov=pytest_django_test --cov-report=term-missing:skip-covered' - export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/pytest-dev/pytest-cov/archive/bdfd9c3907f66430fd8d9e9569ae4c3d214a8b33.tar.gz' + export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/pytest-dev/pytest-cov/archive/6b1e878f3654d3758bd7f3fefcc90b0b828d158e.tar.gz' else PYTEST_DJANGO_COVERAGE=0 fi From 71fc3d862b04fa56016eaaafd5eaf674e805efed Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 16 Sep 2018 14:18:46 +0200 Subject: [PATCH 08/16] 2.6.0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4373923e0..cd8ed77a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ install: if [[ "$SKIP_COVERAGE" != "1" ]]; then PYTEST_DJANGO_COVERAGE=1 export PYTEST_ADDOPTS='-x --cov=pytest_django --cov=tests --cov=pytest_django_test --cov-report=term-missing:skip-covered' - export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/pytest-dev/pytest-cov/archive/6b1e878f3654d3758bd7f3fefcc90b0b828d158e.tar.gz' + export _PYTESTDJANGO_TOX_EXTRA_DEPS='pytest-cov==2.6.0' else PYTEST_DJANGO_COVERAGE=0 fi From a670bb79c0a3c26f81fa5602e038feefa6c1d4d7 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 16 Sep 2018 14:19:06 +0200 Subject: [PATCH 09/16] -- --cov-branch --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cd8ed77a7..7e122f3cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ install: # Setup coverage tracking. if [[ "$SKIP_COVERAGE" != "1" ]]; then PYTEST_DJANGO_COVERAGE=1 - export PYTEST_ADDOPTS='-x --cov=pytest_django --cov=tests --cov=pytest_django_test --cov-report=term-missing:skip-covered' + export PYTEST_ADDOPTS='-x --cov-branch --cov=pytest_django --cov=tests --cov=pytest_django_test --cov-report=term-missing:skip-covered' export _PYTESTDJANGO_TOX_EXTRA_DEPS='pytest-cov==2.6.0' else PYTEST_DJANGO_COVERAGE=0 From 56b3999cba6f349b46d9b7213d19eb879e704fc7 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 16 Sep 2018 14:24:14 +0200 Subject: [PATCH 10/16] .coveragerc: data_file=.coverage.eager --- .coveragerc | 1 + 1 file changed, 1 insertion(+) diff --git a/.coveragerc b/.coveragerc index 318dad712..31efa91f2 100644 --- a/.coveragerc +++ b/.coveragerc @@ -2,5 +2,6 @@ parallel = true source = . branch = true +data_file = .coverage.eager [report] include = pytest_django/*,pytest_django_test/*,tests/* From 22589f1f8d2194f84a9d9caf8802ab36d5bafbdd Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 16 Sep 2018 14:37:59 +0200 Subject: [PATCH 11/16] try blueyed/pytest-cov --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7e122f3cd..586b86e66 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ install: if [[ "$SKIP_COVERAGE" != "1" ]]; then PYTEST_DJANGO_COVERAGE=1 export PYTEST_ADDOPTS='-x --cov-branch --cov=pytest_django --cov=tests --cov=pytest_django_test --cov-report=term-missing:skip-covered' - export _PYTESTDJANGO_TOX_EXTRA_DEPS='pytest-cov==2.6.0' + export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/blueyed/pytest-cov/archive/6d2adf7.tar.gz' else PYTEST_DJANGO_COVERAGE=0 fi From 5d517558227321363448e07482217816ed330d0f Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 16 Sep 2018 14:43:38 +0200 Subject: [PATCH 12/16] fixup! try blueyed/pytest-cov --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 586b86e66..29bf20a96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ install: if [[ "$SKIP_COVERAGE" != "1" ]]; then PYTEST_DJANGO_COVERAGE=1 export PYTEST_ADDOPTS='-x --cov-branch --cov=pytest_django --cov=tests --cov=pytest_django_test --cov-report=term-missing:skip-covered' - export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/blueyed/pytest-cov/archive/6d2adf7.tar.gz' + export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/blueyed/pytest-cov/archive/fba2d77.tar.gz' else PYTEST_DJANGO_COVERAGE=0 fi From 8cc0913b023f1dca20264be01f8b644b3325e855 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 16 Sep 2018 14:51:07 +0200 Subject: [PATCH 13/16] fix-combine@f1e517b: Central: remove combining_cov --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 29bf20a96..05677a158 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ install: if [[ "$SKIP_COVERAGE" != "1" ]]; then PYTEST_DJANGO_COVERAGE=1 export PYTEST_ADDOPTS='-x --cov-branch --cov=pytest_django --cov=tests --cov=pytest_django_test --cov-report=term-missing:skip-covered' - export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/blueyed/pytest-cov/archive/fba2d77.tar.gz' + export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/blueyed/pytest-cov/archive/f1e517b.tar.gz' else PYTEST_DJANGO_COVERAGE=0 fi From 9734e38ae3d129bc7bb22ce907e68929f4e94477 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 16 Sep 2018 16:02:18 +0200 Subject: [PATCH 14/16] fix-combine@48d6656: Central.combining_cov: skip load --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 05677a158..c9a477583 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ install: if [[ "$SKIP_COVERAGE" != "1" ]]; then PYTEST_DJANGO_COVERAGE=1 export PYTEST_ADDOPTS='-x --cov-branch --cov=pytest_django --cov=tests --cov=pytest_django_test --cov-report=term-missing:skip-covered' - export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/blueyed/pytest-cov/archive/f1e517b.tar.gz' + export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/blueyed/pytest-cov/archive/48d6656.tar.gz' else PYTEST_DJANGO_COVERAGE=0 fi From 653699ac593b20f8881306480301c8ac35fc3d74 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 16 Sep 2018 16:44:58 +0200 Subject: [PATCH 15/16] fix-combine@3d8cf61: make self.cov_config absolute --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c9a477583..f02cc8df3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ install: if [[ "$SKIP_COVERAGE" != "1" ]]; then PYTEST_DJANGO_COVERAGE=1 export PYTEST_ADDOPTS='-x --cov-branch --cov=pytest_django --cov=tests --cov=pytest_django_test --cov-report=term-missing:skip-covered' - export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/blueyed/pytest-cov/archive/48d6656.tar.gz' + export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/blueyed/pytest-cov/archive/3d8cf61.tar.gz' else PYTEST_DJANGO_COVERAGE=0 fi From f36d62c836cf0ee7775c36e4fe38d5cbd21fe008 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 16 Sep 2018 17:08:12 +0200 Subject: [PATCH 16/16] fix-combine@23c7759: Make data_file absolute --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f02cc8df3..55a55a1aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ install: if [[ "$SKIP_COVERAGE" != "1" ]]; then PYTEST_DJANGO_COVERAGE=1 export PYTEST_ADDOPTS='-x --cov-branch --cov=pytest_django --cov=tests --cov=pytest_django_test --cov-report=term-missing:skip-covered' - export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/blueyed/pytest-cov/archive/3d8cf61.tar.gz' + export _PYTESTDJANGO_TOX_EXTRA_DEPS='https://github.com/blueyed/pytest-cov/archive/23c7759.tar.gz' else PYTEST_DJANGO_COVERAGE=0 fi