From 0a608fd63df6ae16cae9cd50fa16707ca5102088 Mon Sep 17 00:00:00 2001 From: Michael Porokhovnichenko Date: Sat, 4 Apr 2015 23:58:13 +0600 Subject: [PATCH] Added django==1.8; fix some bug; test with debug=False; wheel support; changelog --- coverage.rc => .coveragerc | 0 .travis.yml | 6 ++++-- CHANGELOG.rst | 10 ++++++++++ Makefile | 5 +++-- README.rst | 12 +++++++++++- onpay/__init__.py | 2 +- onpay/forms.py | 2 +- onpay/models.py | 4 ++-- setup.cfg | 3 +++ tests.py | 11 ++++++++--- 10 files changed, 43 insertions(+), 12 deletions(-) rename coverage.rc => .coveragerc (100%) create mode 100644 CHANGELOG.rst create mode 100644 setup.cfg diff --git a/coverage.rc b/.coveragerc similarity index 100% rename from coverage.rc rename to .coveragerc diff --git a/.travis.yml b/.travis.yml index 01c53de..bf815d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,10 @@ python: - "3.4" env: - - DJANGO=1.5.9 - - DJANGO=1.6.6 + - DJANGO=1.5.12 + - DJANGO=1.6.11 + - DJANGO=1.7.7 + - DJANGO=1.8 install: - pip install -q Django==$DJANGO diff --git a/CHANGELOG.rst b/CHANGELOG.rst new file mode 100644 index 0000000..07d159c --- /dev/null +++ b/CHANGELOG.rst @@ -0,0 +1,10 @@ +0.2 +--- +* Added CHANGELOG; +* Updated head version of Django (include 1.8); +* Improved pep8; +* Wheel support + +0.1 +--- +* Initial release diff --git a/Makefile b/Makefile index e56e624..7c6e9f2 100644 --- a/Makefile +++ b/Makefile @@ -3,12 +3,13 @@ test: release: python setup.py sdist --format=zip,bztar,gztar register upload + python setup.py bdist_wheel register upload flake8: - flake8 --max-complexity 12 --ignore=E126,E501 onpay + flake8 onpay coverage: - coverage run --include=onpay/* setup.py test + coverage run --rcfile=.coveragerc --include=onpay/* setup.py test coverage html coveralls: diff --git a/README.rst b/README.rst index b8b381d..838a8c8 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ django-onpay ============ -.. image:: https://badge.fury.io/py/django-ulogin.png +.. image:: https://badge.fury.io/py/django-onpay.png :target: http://badge.fury.io/py/django-onpay .. image:: https://travis-ci.org/marazmiki/django-onpay.png?branch=master @@ -12,3 +12,13 @@ django-onpay .. image:: https://pypip.in/d/django-onpay/badge.png :target: https://pypi.python.org/pypi/django-onpay + +.. image:: https://pypip.in/d/django-onpay/badge.png + :target: https://pypi.python.org/pypi/django-onpay + :alt: Latest version on PyPI + +.. image:: https://pypip.in/wheel/django-onpay/badge.svg + :target: https://pypi.python.org/pypi/django-onpay/ + :alt: Wheel Status + + diff --git a/onpay/__init__.py b/onpay/__init__.py index 865e917..cb0371d 100644 --- a/onpay/__init__.py +++ b/onpay/__init__.py @@ -7,4 +7,4 @@ def get_version(): - return '0.1' + return '0.2' diff --git a/onpay/forms.py b/onpay/forms.py index 4429a25..e9c15d0 100644 --- a/onpay/forms.py +++ b/onpay/forms.py @@ -44,5 +44,5 @@ class PayForm(CheckForm): def clean_paymentDateTime(self): try: return parse(self.cleaned_data['paymentDateTime']) - except TypeError: + except (ValueError, TypeError): raise forms.ValidationError('Wrong paymentDateTime value') diff --git a/onpay/models.py b/onpay/models.py index 49174ad..6b13806 100644 --- a/onpay/models.py +++ b/onpay/models.py @@ -51,12 +51,12 @@ class Order(models.Model): (STATE_FAILURE, _('Failed')), (STATE_WAITING, _('Waiting')), (STATE_EXPIRED, _('Expired')), - )) + )) mode = models.IntegerField(_('mode'), default=MODE_LIVE, choices=( (MODE_LIVE, _('live')), (MODE_TEST, _('text')), - )) + )) def mark_as_success(self): self._mark(state=self.STATE_SUCCESS, signal=order_success) diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..b8a1655 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,3 @@ +[bdist_wheel] +universal = 1 + diff --git a/tests.py b/tests.py index 5f31ad0..89c35a9 100755 --- a/tests.py +++ b/tests.py @@ -11,8 +11,9 @@ settings.configure( - DEBUG=True, - ROOT_URLCONF='django_ulogin.tests.urls', + DEBUG=False, + ROOT_URLCONF='onpay.urls', + MIDDLEWARE_CLASSES=(), INSTALLED_APPS=( 'django.contrib.auth', 'django.contrib.contenttypes', @@ -29,6 +30,10 @@ def main(): from django.test.utils import get_runner + import django + + if hasattr(django, 'setup'): + django.setup() find_pattern = 'onpay' @@ -41,4 +46,4 @@ def main(): if __name__ == '__main__': - main() \ No newline at end of file + main()