Skip to content

Commit

Permalink
Update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
kmmbvnr committed Nov 1, 2017
1 parent 5b11a41 commit 61a2a46
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 13 deletions.
4 changes: 2 additions & 2 deletions celery/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pytz
django==1.10.5
celery==4.0.2
django-material-pro==0.12.3
django-viewflow-pro=0.12.2.1
django-material-pro==1.1.0
django-viewflow-pro=1.1.0

3 changes: 2 additions & 1 deletion celery/tox.ini
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
[tox]
skipsdist = True
envlist =
py{27,34,35}-{dj18,dj19,dj110}-mt{progit}-vfprogit-celery{3,4}
py{27,34,35}-{dj18,dj19,dj110,dj111}-mt{progit}-vfprogit-celery{3,4}

[testenv]
deps =
pytz
dj18: Django>=1.8,<1.9
dj19: Django>=1.9,<1.10
dj110: Django>=1.10,<1.11
dj111: Django>=1.11,<2.0
celery3: celery>=3,<4
celery4: celery>=4.0,<4.1
mtprogit: git+ssh://git@github.com/kmmbvnr/material-pro.git
Expand Down
6 changes: 3 additions & 3 deletions custom_ui/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pytz
django==1.11.2
django-material==1.0.0
django-viewflow==1.0.0
django==1.11.6
django-material==1.1.0
django-viewflow==1.1.0

3 changes: 2 additions & 1 deletion custom_ui/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
skipsdist = True
envlist =
py{27}-{dj18,dj19,dj110}-mt{progit}-vfprogit
py{34,35}-{dj18,dj19,dj110}-mt{1x,git}-vf
py{34,35}-{dj18,dj19,dj110,dj111}-mt{1x,git}-vf

[testenv]
deps =
pytz
dj18: Django>=1.8,<1.9
dj19: Django>=1.9,<1.10
dj110: Django>=1.10,<1.11
dj111: Django>=1.11,<2.0
mt1x: django-material>=1.0,<2
mtgit: git+https://github.com/viewflow/django-material.git
mtprogit: git+ssh://git@github.com/kmmbvnr/material-pro.git
Expand Down
6 changes: 3 additions & 3 deletions custom_views/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pytz
django==1.10.5
django==1.11.6
django-formtools
django-material==0.12.5
django-viewflow==0.12.2
django-material==1.1.0
django-viewflow==1.1.0

7 changes: 4 additions & 3 deletions custom_views/tox.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[tox]
skipsdist = True
envlist =
py{27}-{dj18,dj19,dj110}-mt{progit}-vfprogit
py{34,35}-{dj18,dj19,dj110}-mt{12,git}-vf
py{27}-{dj18,dj19,dj110,dj111}-mt{progit}-vfprogit
py{34,35}-{dj18,dj19,dj110,dj111}-mt{11,git}-vf

[testenv]
deps =
Expand All @@ -11,7 +11,8 @@ deps =
dj18: Django>=1.8,<1.9
dj19: Django>=1.9,<1.10
dj110: Django>=1.10,<1.11
mt12: django-material>0.12,<0.13
dj111: Django>=1.11,<2.0
mt11: django-material>=1.1,<2.0
mtgit: git+https://github.com/viewflow/django-material.git
mtprogit: git+ssh://git@github.com/kmmbvnr/material-pro.git
vf: git+https://github.com/viewflow/viewflow.git
Expand Down

0 comments on commit 61a2a46

Please sign in to comment.