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.

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

Merge branch drop-support-django1.6 #101

Merged
merged 20 commits into from
Dec 17, 2015

Conversation

zhang-z
Copy link
Contributor

@zhang-z zhang-z commented Dec 14, 2015

No description provided.

zhang-z and others added 20 commits December 7, 2015 11:17
…django1.6

Drop support for Django 1.6 and below (Django 1.9 not supported yet)
…django1.6

Fix a RemovedInDjango110Warning in unittest
Conflicts:
	notifications/__init__.py
	notifications/templatetags/notifications_tags.py
	notifications/tests/settings.py
	notifications/tests/urls.py
	setup.py
@yangyubo
Copy link
Member

@zhang-z Wonderful job! I can confirm following changes are fine:

  1. setup.py (from distutils to setuptools)
  2. notifications/__init__.py
  3. notifications/tests/tests.py (just PEP 8 stuff)
  4. notifications/models.py
  5. Code formatting changes
  6. Docs

Tests were passed by running manage.py test on my virtualenv.

@LegoStormtroopr can you take a look at notifications/templatetags/notifications_tags.py in changeset 72a6105 to make sure it won't affect live updater?

@yangyubo
Copy link
Member

@zhang-z @LegoStormtroopr I've compared notifications/templatetags/notifications_tags.py line by line, and confirmed that the only difference is PEP8 compliance.

So I'm gonna to merge this PR.

yangyubo added a commit that referenced this pull request Dec 17, 2015
Merge branch drop-support-django1.6
@yangyubo yangyubo merged commit c29345f into django-notifications:master Dec 17, 2015
@LegoStormtroopr
Copy link
Contributor

Sorry about that, I had a read and it looked ok, I hadn't had a chance to run tests, but as you said it was all PEP8 changes. Thanks.

Merry Christmas 🎄

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants