From 32b9b7e38cf182682b5fbb5aea4a013e4a767d5f Mon Sep 17 00:00:00 2001 From: Kelvin Jayanoris Date: Sun, 2 Jun 2019 17:22:45 +0300 Subject: [PATCH 1/8] Upgrade packages --- requirements/dev.txt | 97 +++++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 46 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index bcad2ea..adaed05 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -2,72 +2,77 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile requirements/dev.in +# pip-compile --upgrade requirements/dev.in # +-e file:///home/mosh/projects/vega appdirs==1.4.3 # via black -astroid==2.0.4 # via pylint -attrs==18.2.0 # via black +astroid==2.2.5 # via pylint +attrs==19.1.0 # via black backcall==0.1.0 # via ipython -black==18.9b0 -certifi==2018.11.29 # via requests +backports.csv==1.0.7 # via tablib +black==19.3b0 +certifi==2019.3.9 # via requests chardet==3.0.4 # via requests click==7.0 # via black -coverage==4.5.2 -decorator==4.3.0 # via ipython, traitlets -defusedxml==0.5.0 # via python3-openid +coverage==4.5.3 +decorator==4.4.0 # via ipython, traitlets +defusedxml==0.6.0 # via odfpy, python3-openid django-allauth==0.39.1 django-braces==1.13.0 django-crispy-forms==1.7.2 -django-filter==2.0.0 -django-tables2==2.0.3 -django==2.1.7 # via django-allauth, django-filter, django-tables2, model-mommy +django-filter==2.1.0 +django-tables2==2.0.6 +django==2.2.1 # via django-allauth, django-filter, django-tables2, model-mommy +entrypoints==0.3 # via flake8 et-xmlfile==1.0.1 # via openpyxl -filelock==3.0.10 # via tox -flake8==3.6.0 +filelock==3.0.12 # via tox +flake8==3.7.7 idna==2.8 # via requests -ipdb==0.11 +importlib-metadata==0.17 # via pluggy +ipdb==0.12 ipython-genutils==0.2.0 # via traitlets -ipython==7.1.1 # via ipdb -isort==4.3.4 -jdcal==1.4 # via openpyxl -jedi==0.13.1 # via ipython -lazy-object-proxy==1.3.1 # via astroid +ipython==7.5.0 # via ipdb +isort==4.3.20 +jdcal==1.4.1 # via openpyxl +jedi==0.13.3 # via ipython +lazy-object-proxy==1.4.1 # via astroid mccabe==0.6.1 # via flake8, pylint model-mommy==1.6.0 oauthlib==3.0.1 # via requests-oauthlib -odfpy==1.3.6 # via tablib -openpyxl==2.5.10 # via tablib -parso==0.3.1 # via jedi +odfpy==1.4.0 # via tablib +openpyxl==2.6.2 # via tablib +parso==0.4.0 # via jedi pep8==1.7.1 -pexpect==4.6.0 # via ipython +pexpect==4.7.0 # via ipython pickleshare==0.7.5 # via ipython -pluggy==0.8.0 # via tox -prompt-toolkit==2.0.7 # via ipython -psycopg2-binary==2.7.6.1 +pluggy==0.12.0 # via tox +prompt-toolkit==2.0.9 # via ipython +psycopg2-binary==2.8.2 ptyprocess==0.6.0 # via pexpect -py==1.7.0 # via tox -pycodestyle==2.4.0 # via flake8 -pyflakes==2.0.0 # via flake8 -pygments==2.2.0 # via ipython -pylint-django==2.0.2 -pylint-plugin-utils==0.4 # via pylint-django -pylint==2.1.1 +py==1.8.0 # via tox +pycodestyle==2.5.0 # via flake8 +pyflakes==2.1.1 # via flake8 +pygments==2.4.2 # via ipython +pylint-django==2.0.9 +pylint-plugin-utils==0.5 # via pylint-django +pylint==2.3.1 python3-openid==3.1.0 # via django-allauth -pytz==2018.7 # via django -pyyaml==4.2b4 # via tablib +pytz==2019.1 # via django +pyyaml==5.1 # via tablib requests-oauthlib==1.2.0 # via django-allauth -requests==2.21.0 # via django-allauth, requests-oauthlib -six==1.11.0 # via astroid, model-mommy, prompt-toolkit, tox, traitlets -tablib==0.12.1 +requests==2.22.0 # via django-allauth, requests-oauthlib +six==1.12.0 # via astroid, model-mommy, prompt-toolkit, tox, traitlets +sqlparse==0.3.0 # via django +tablib==0.13.0 toml==0.10.0 # via black, tox -tox==3.5.3 +tox==3.12.1 traitlets==4.3.2 # via ipython -typed-ast==1.1.0 # via astroid -unicodecsv==0.14.1 # via tablib -urllib3==1.24.1 # via requests -virtualenv==16.1.0 # via tox +typed-ast==1.3.5 # via astroid +urllib3==1.25.3 # via requests +virtualenv==16.6.0 # via tox wcwidth==0.1.7 # via prompt-toolkit -wrapt==1.10.11 # via astroid -xlrd==1.1.0 # via tablib +wrapt==1.11.1 # via astroid +xlrd==1.2.0 # via tablib xlwt==1.3.0 # via tablib -yapf==0.24.0 +yapf==0.27.0 +zipp==0.5.1 # via importlib-metadata From bc685b1177f26ad968a9216f8e55a78c441f6baa Mon Sep 17 00:00:00 2001 From: Kelvin Jayanoris Date: Sun, 2 Jun 2019 17:29:29 +0300 Subject: [PATCH 2/8] Remove unnecessary pass --- vega_admin/mixins.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/vega_admin/mixins.py b/vega_admin/mixins.py index a3ab17e..5407c6b 100644 --- a/vega_admin/mixins.py +++ b/vega_admin/mixins.py @@ -33,8 +33,6 @@ class VegaFormMixin(VegaFormKwargsMixin): Adds some nice stuff to formviews used in create/update/delete views """ - pass - class VegaOrderedQuerysetMixin: """ From dfed77cb496aa0c7322c6071f7ee3416a8319983 Mon Sep 17 00:00:00 2001 From: Kelvin Jayanoris Date: Sun, 2 Jun 2019 17:37:20 +0300 Subject: [PATCH 3/8] Add django 2.2 tests --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 8d23c67..449c563 100644 --- a/tox.ini +++ b/tox.ini @@ -25,6 +25,7 @@ deps = coverage django20: Django>=2.0,<2.1 django21: Django>=2.1,<2.2 + django22: Django>=2.2,<2.3 basepython = py36: python3.6 py37: python3.7 From 5da9b702d6673962a2df76e17f7fa7f423086a73 Mon Sep 17 00:00:00 2001 From: Kelvin Jayanoris Date: Sun, 2 Jun 2019 17:37:36 +0300 Subject: [PATCH 4/8] Ensure user objects exist for test --- tests/contrib/users/test_views.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/contrib/users/test_views.py b/tests/contrib/users/test_views.py index faa8c1d..0d69b8a 100644 --- a/tests/contrib/users/test_views.py +++ b/tests/contrib/users/test_views.py @@ -61,5 +61,6 @@ def test_list_view_ordering_off(self): """ Test VEGA_FORCE_ORDERING=False """ + mommy.make("auth.User", _quantity=3) res = self.client.get("/auth.user/list/") self.assertFalse(res.context["object_list"].ordered) From 2b05adda870791e72164980240581fb3ec99a07d Mon Sep 17 00:00:00 2001 From: Kelvin Jayanoris Date: Sun, 2 Jun 2019 17:55:47 +0300 Subject: [PATCH 5/8] fix requirements --- requirements/dev.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index adaed05..b00cc28 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,7 +4,6 @@ # # pip-compile --upgrade requirements/dev.in # --e file:///home/mosh/projects/vega appdirs==1.4.3 # via black astroid==2.2.5 # via pylint attrs==19.1.0 # via black @@ -22,7 +21,7 @@ django-braces==1.13.0 django-crispy-forms==1.7.2 django-filter==2.1.0 django-tables2==2.0.6 -django==2.2.1 # via django-allauth, django-filter, django-tables2, model-mommy +# django==2.2.1 # via django-allauth, django-filter, django-tables2, model-mommy entrypoints==0.3 # via flake8 et-xmlfile==1.0.1 # via openpyxl filelock==3.0.12 # via tox From 2468114868f98a4276d7649b3944037b0811196a Mon Sep 17 00:00:00 2001 From: Kelvin Jayanoris Date: Sun, 2 Jun 2019 17:57:33 +0300 Subject: [PATCH 6/8] Ensure django 2.2 tests run --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 449c563..f0a55f0 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ envlist = flake8 pylint - py{36,37}-django{20,21} + py{36,37}-django{20,21,22} [testenv:flake8] deps = From 036d7ed4084c52dab5a431bbbf692b36679c9cbc Mon Sep 17 00:00:00 2001 From: Kelvin Jayanoris Date: Sun, 2 Jun 2019 18:16:50 +0300 Subject: [PATCH 7/8] Add django back to requirements --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index b00cc28..2bcd692 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -21,7 +21,7 @@ django-braces==1.13.0 django-crispy-forms==1.7.2 django-filter==2.1.0 django-tables2==2.0.6 -# django==2.2.1 # via django-allauth, django-filter, django-tables2, model-mommy +django==2.2.1 # via django-allauth, django-filter, django-tables2, model-mommy entrypoints==0.3 # via flake8 et-xmlfile==1.0.1 # via openpyxl filelock==3.0.12 # via tox From acd5bd7e768ff98bca1b842e7e875cb22f961579 Mon Sep 17 00:00:00 2001 From: Kelvin Jayanoris Date: Sun, 2 Jun 2019 18:17:14 +0300 Subject: [PATCH 8/8] Install appropriate django version for tox env --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index f0a55f0..7964bfd 100644 --- a/tox.ini +++ b/tox.ini @@ -23,14 +23,14 @@ commands = [testenv] deps = coverage - django20: Django>=2.0,<2.1 - django21: Django>=2.1,<2.2 - django22: Django>=2.2,<2.3 basepython = py36: python3.6 py37: python3.7 commands = pip install -r requirements/dev.txt + django20: pip install Django>=2.0,<2.1 + django21: pip install Django>=2.1,<2.2 + django22: pip install Django>=2.2,<2.3 coverage erase coverage run --include="vega_admin/**.*" --omit="tests/**.*,vega_admin/migrations/**.*" manage.py test {toxinidir}/tests coverage report