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

Bump django-jsonview #40

Merged
merged 4 commits into from
Aug 14, 2015
Merged

Bump django-jsonview #40

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
3e59965
bump requirement
JBKahn Aug 14, 2015
46d54f6
bump in test file too
JBKahn Aug 14, 2015
81aa1b2
test against Django 1.8.3 as well
JBKahn Aug 14, 2015
1a18711
update supported django versions to test in travis
JBKahn Aug 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ python:
- "3.4"

env:
- DJANGO_VERSION=1.4.15
- DJANGO_VERSION=1.6.7
- DJANGO_VERSION=1.7.0
- DJANGO_VERSION=1.4.21
- DJANGO_VERSION=1.7.9
- DJANGO_VERSION=1.8.3
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you mind actually matching this up with the officially supported Django versions? Currently 1.4.x, 1.7.x, and 1.8.x - feel free to bump the 1.4.x / 1.7.x to the latest release as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do.

On Fri, Aug 14, 2015, 8:32 AM Michael Warkentin [email protected]
wrote:

In .travis.yml
#40 (comment)
:

@@ -10,6 +10,7 @@ env:

  • DJANGO_VERSION=1.4.15
  • DJANGO_VERSION=1.6.7
  • DJANGO_VERSION=1.7.0
      • DJANGO_VERSION=1.8.3

Would you mind actually matching this up with the officially supported
Django versions? Currently 1.4.x, 1.7.x, and 1.8.x - feel free to bump the
1.4.x / 1.7.x to the latest release as well.

—
Reply to this email directly or view it on GitHub
https://github.com/mwarkentin/django-watchman/pull/40/files#r37071695.


# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
install: pip install -r requirements-test.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements-test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
django
django-jsonview==0.3.0
django-jsonview==0.5.0

coverage
coveralls
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
include_package_data=True,
install_requires=[
'django',
'django-jsonview==0.4.3',
'django-jsonview==0.5.0',
],
license="BSD",
zip_safe=False,
Expand Down