Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[requires.io] dependency update on master branch #7

Merged
merged 4 commits into from
Nov 26, 2015
Merged

[requires.io] dependency update on master branch #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b18c1eb
[requires.io] dependency update
requires Nov 25, 2015
de3251f
[requires.io] dependency update
requires Nov 25, 2015
dda47c9
[requires.io] dependency update
requires Nov 25, 2015
6def6fd
[requires.io] dependency update
requires Nov 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ git+https://github.com/ad-m/django-atom.git@master#egg=django-atom
git+https://github.com/ad-m/django-teryt-tree.git@master#egg=django-teryt-tree
django-states==1.6.5
django-bootstrap-pagination==1.5.1
cached-property==1.2.0
cached-property==1.3.0
django_localflavor==1.1
jsonfield==1.0.3
django-bleach==0.3.0
Expand Down
2 changes: 1 addition & 1 deletion requirements/production.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Pro-tip: Try not to put anything here. There should be no dependency in
# production that isn't in development.
django==1.8.6
django==1.8.7
-r base.txt

# WSGI Handler
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ passenv = DATABASE_URL TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH DATABASE_URL DJANGO_SE
deps =
-rrequirements/test.txt
dj18: Django>=1.8,<1.9
dj19: Django==1.9rc1
dj19: Django==1.9rc2
dj17: Django>=1.7,<1.8
djmaster: https://github.com/django/django/archive/master.tar.gz
coverage
Expand Down