From 15c18269717f812ca7424708bc47c36aaa5b3018 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Wed, 3 Apr 2019 12:06:33 +0530 Subject: [PATCH 1/7] #dropthedot --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4f35e5b4..befcff2d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ env: script: - flake8 -- py.test --cov -v --tb=native +- pytest --cov -v --tb=native - coverage report -m after_success: From bb1e0d095ca3342ed0c728ec4b4f5d384c1f1857 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Wed, 3 Apr 2019 12:06:49 +0530 Subject: [PATCH 2/7] Use the newer tool:pytest section for pytest --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 7d167bb9..1e03a4af 100644 --- a/setup.cfg +++ b/setup.cfg @@ -7,7 +7,7 @@ tag = True [bumpversion:file:README.md] -[pytest] +[tool:pytest] DJANGO_SETTINGS_MODULE = settings.test_settings addopts = --reuse-db norecursedirs = .tox .git */migrations/* */static/* docs venv @@ -18,7 +18,7 @@ exclude = .tox,.git,*/migrations/*,*/static/*,docs,venv [coverage:run] source = junction/ -omit = +omit = *tests* *commands* *migrations* From eafbb3f8b84337e8a37f52f0da646aac0e7319b1 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Wed, 3 Apr 2019 12:59:38 +0530 Subject: [PATCH 3/7] Minimal dependency upgrades for fixing pytest runs --- requirements-dev.txt | 22 +++++++++------------- requirements.txt | 2 +- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 3a386fe1..68084f58 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,27 +2,23 @@ # Testing # ------------------------------------------------- -# Fix for travis CI tests failing -# Ref: https://github.com/FactoryBoy/factory_boy/issues/334#issuecomment-267696136 -fake-factory==0.7.4 -factory-boy==2.7.0 +factory-boy==2.11.1 -flake8==2.4.1 -pytest-django==2.9.1 -pytest-cov==2.2.1 -pytest-flakes==1.0.0 +flake8==3.7.7 +pytest-django==3.4.8 +pytest-flakes==4.0.0 -coverage==4.1 +coverage==4.5.3 # Documentation # -------------------------------------------------- -mkdocs==0.15.3 +mkdocs==1.0.4 bumpversion==0.5.3 # Debugging # -------------------------------------------------- -ipdb==0.9.0 +ipdb==0.12 # Patch for html5lib - issue #520 -html5lib<0.99999999 -bleach<2.0.0 +html5lib==1.0.1 +bleach==3.1.0 diff --git a/requirements.txt b/requirements.txt index aee6dfb1..b5d381fe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,7 +22,7 @@ hashids==1.1.0 # Django Model Helpers # ------------------------------------------------- django-uuid-upload-path==1.0.0 -Pillow==2.9.0 +Pillow==6.0.0 # Auth # ------------------------------------------------- From 08b7ceb83ad5be9e8fa6f5a026c46a54f1e15100 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Wed, 3 Apr 2019 13:03:27 +0530 Subject: [PATCH 4/7] We're still Python 2. :( --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b5d381fe..a81dc30b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,7 +22,7 @@ hashids==1.1.0 # Django Model Helpers # ------------------------------------------------- django-uuid-upload-path==1.0.0 -Pillow==6.0.0 +Pillow==5.4.1 # Auth # ------------------------------------------------- From b3ced1fca395e38e210e047b1112856c6b0242b5 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Wed, 3 Apr 2019 13:09:22 +0530 Subject: [PATCH 5/7] Use older flake8 to not need code changes --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 68084f58..c4b0bbf5 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,7 +4,7 @@ # ------------------------------------------------- factory-boy==2.11.1 -flake8==3.7.7 +flake8==2.4.1 pytest-django==3.4.8 pytest-flakes==4.0.0 From a061a31d366ce206ef7c0f37b8c5cae5a6b6a683 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Wed, 3 Apr 2019 14:00:12 +0530 Subject: [PATCH 6/7] Bump down pytest-flakes to make things work --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index c4b0bbf5..ad5fa5c2 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -6,7 +6,7 @@ factory-boy==2.11.1 flake8==2.4.1 pytest-django==3.4.8 -pytest-flakes==4.0.0 +pytest-flakes==2.0.0 coverage==4.5.3 From 3f31197caa57fadf81f5420437fceaa62b62470e Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Wed, 3 Apr 2019 14:10:29 +0530 Subject: [PATCH 7/7] Re-add pytest-cov --- requirements-dev.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements-dev.txt b/requirements-dev.txt index ad5fa5c2..2fdd7590 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -7,6 +7,7 @@ factory-boy==2.11.1 flake8==2.4.1 pytest-django==3.4.8 pytest-flakes==2.0.0 +pytest-cov==2.6.1 coverage==4.5.3