From 0803b9267c48bdeacac3f0bc9719e9ad5b84b479 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 23 Jan 2020 20:16:08 +0100 Subject: [PATCH 1/4] TEST: blueyed/pytest@fixture-stack Ref: https://github.com/pytest-dev/pytest/pull/6551 --- .travis.yml | 2 +- tox.ini | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 20fcba839..fcd79aa47 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,7 +99,7 @@ install: - pip install tox==3.9.0 script: - - tox + - tox --force-dep "pytest@git+https://github.com/blueyed/pytest@fixture-stack#egg=pytest" after_success: - | diff --git a/tox.ini b/tox.ini index 2a75506b4..e656ed4dd 100644 --- a/tox.ini +++ b/tox.ini @@ -27,6 +27,8 @@ deps = postgres: psycopg2-binary coverage: coverage-enable-subprocess + pytest + pytest41: pytest>=4.1,<4.2 pytest41: attrs==17.4.0 pytest53: pytest>=5.3,<5.4 From 3b77b5cd56778c4fe47d51862b529bbb519a1340 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Mon, 20 Jan 2020 18:14:25 +0100 Subject: [PATCH 2/4] TEMP: Travis: run all jobs --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fcd79aa47..73a31ddaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ cache: false jobs: fast_finish: true include: - - stage: baseline + - stage: test python: 3.6 env: - TOXENV=py36-dj20-postgres-xdist-coverage From f9b73e3f66713c85c9699efcb6c84f7282f974e1 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 6 Feb 2020 03:55:14 +0100 Subject: [PATCH 3/4] rebuild From a2cc4b56bf4f49c457e840cf5024639e2fba6590 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Tue, 31 Mar 2020 11:51:34 +0200 Subject: [PATCH 4/4] blueyed/pytest@mm-fixture-stack --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 73a31ddaa..e954e0908 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,7 +99,7 @@ install: - pip install tox==3.9.0 script: - - tox --force-dep "pytest@git+https://github.com/blueyed/pytest@fixture-stack#egg=pytest" + - tox --force-dep "pytest@git+https://github.com/blueyed/pytest@mm-fixture-stack#egg=pytest" after_success: - |