Skip to content

Commit

Permalink
Updates to support Django-1.8 and py3
Browse files Browse the repository at this point in the history
  • Loading branch information
odero committed Nov 11, 2015
1 parent d460c5c commit 2ccf2ea
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 11 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ language: python

python:
- "2.7"
- "3.3"
- "3.4"

# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
install: pip install -r requirements-test.txt
Expand Down
7 changes: 7 additions & 0 deletions django_pesapal/tests.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

from django.test import TestCase


class UserModelTestCase(TestCase):

pass
6 changes: 5 additions & 1 deletion django_pesapal/urls.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# -*- coding: utf-8 -*-

from __future__ import absolute_import

from django.conf.urls import patterns, url

import views
from . import views

urlpatterns = patterns(
'',
Expand Down
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Django>=1.7,<=1.7.8
wheel==0.23.0
oauth2==1.5.211
requests==2.1
Django>=1.7
wheel==0.26.0
oauth2==1.9.0
requests[security]>=2.8.1

# Custom requirements
git+https://github.com/dcramer/django-uuidfield.git@9bd27e9#egg=django-uuidfield
6 changes: 5 additions & 1 deletion sandbox/sandbox/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@
PESAPAL_OAUTH_CALLBACK_URL ='transaction_completed'
PESAPAL_OAUTH_SIGNATURE_METHOD ='SignatureMethod_HMAC_SHA1'
PESAPAL_TRANSACTION_DEFAULT_REDIRECT_URL = 'payment'
PESAPAL_DEMO = True
PESAPAL_OAUTH_CALLBACK_URL = 'transaction_completed'
PESAPAL_OAUTH_SIGNATURE_METHOD = 'SignatureMethod_HMAC_SHA1'
PESAPAL_TRANSACTION_DEFAULT_REDIRECT_URL = 'transaction_completed'
PESAPAL_TRANSACTION_FAILED_REDIRECT_URL = ''
PESAPAL_ITEM_DESCRIPTION = False
PESAPAL_TRANSACTION_MODEL = 'testapp.Transaction'
Expand All @@ -128,4 +132,4 @@
try:
from local_config import *
except ImportError:
pass
pass
9 changes: 5 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
packages=find_packages(exclude=['sandbox*']),
package_data={'django_pesapal': ['templates/django_pesapal/*.html']},
install_requires=[
'Django>=1.7,<=1.7.8',
'oauth2==1.5.211',
'Django>=1.7',
'oauth2==1.9.0',
'django-uuidfield<=0.6.0',
'requests==2.1',
'requests[security]==2.8.1',
],
dependency_links=[
"https://github.com/dcramer/django-uuidfield/archive/9bd27e9.zip#egg=django-uuidfield-0.6.0",
Expand All @@ -55,7 +55,8 @@
'Natural Language :: English',
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.3',
'Topic :: Internet :: WWW/HTTP',
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
],
)
)
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py27, py33
envlist = py27, py33, py34

[testenv]
setenv =
Expand Down

0 comments on commit 2ccf2ea

Please sign in to comment.