From 86b131263ccfd9e9a819ec7788d8fe57a8f751fa Mon Sep 17 00:00:00 2001 From: Maik Hoepfel Date: Wed, 8 Jul 2015 16:57:47 +0200 Subject: [PATCH 1/2] Remove Math from authors The extension has had multiple people working on it now, and Oscaro is the organization ultimately guiding it. I updated the package information to reflect that. I also removed Oscar as a dependecy. It's quite obvious (as is Django). From experience, it also makes a project's installing requirements phase more predictable. --- setup.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/setup.py b/setup.py index c87d3e7..a72410d 100644 --- a/setup.py +++ b/setup.py @@ -16,8 +16,7 @@ name='django-oscar-adyen', version='0.2.6', url='https://github.com/oscaro/django-oscar-adyen', - author='Mathieu Richardoz', - author_email='mr@babik.fr', + author='Oscaro', description='Adyen payment module for django-oscar', long_description=open('README.rst').read(), keywords='payment, django, oscar, adyen', @@ -26,7 +25,6 @@ include_package_data=True, install_requires=[ 'bleach==1.4', - 'django-oscar>=0.7', 'iptools==0.6.1', 'requests>=2.0,<3.0', ], From 4e80dc0844b18598822fedd2ce9edafd40ec1a3a Mon Sep 17 00:00:00 2001 From: Maik Hoepfel Date: Wed, 8 Jul 2015 16:59:54 +0200 Subject: [PATCH 2/2] Test against multiple versions of Oscar and Django To anticipate migrating to Oscar 1.1 and Django 1.8, let's run the tests on Travis already. --- .travis.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index db2b0a1..0e26572 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,16 @@ python: - "3.3" - "3.4" +env: + global: + - PYTHONPATH=.:$PYTHONPATH + matrix: + - DJANGO=Django==1.7.8 OSCAR=django-oscar==1.0.2 + - DJANGO=Django==1.7.8 OSCAR=django-oscar==1.1 + - DJANGO=Django==1.8.2 OSCAR=django-oscar==1.1 + install: - - pip install 'django-oscar>=0.7' + - pip install $DJANGO $OSCAR - pip install -r requirements.txt -env: - - PYTHONPATH=.:$PYTHONPATH - script: py.test tests