From 95ec33dc4b5746c0eb02e3b57cc2d01d3f0bf685 Mon Sep 17 00:00:00 2001 From: Aleksey Date: Mon, 16 Nov 2015 11:51:58 +0300 Subject: [PATCH 1/4] django 1.9 Quick fix for django.VERSION's check. Allow to use not only 1.8 version but higher. --- drf_generators/management/commands/generate.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drf_generators/management/commands/generate.py b/drf_generators/management/commands/generate.py index 9014caf..9a089cb 100644 --- a/drf_generators/management/commands/generate.py +++ b/drf_generators/management/commands/generate.py @@ -47,7 +47,7 @@ def handle_app_config(self, app_config, **options): views = options['views'] if 'views' in options else False urls = options['urls'] if 'urls' in options else False - elif django.VERSION[1] == 8: + elif django.VERSION[1] >= 8: force = options['force'] format = options['format'] depth = options['depth'] @@ -55,7 +55,7 @@ def handle_app_config(self, app_config, **options): views = options['views'] urls = options['urls'] else: - raise CommandError('You must be using Django 1.7 or 1.8') + raise CommandError('You must be using Django 1.7, 1.8 or 1.9') if format == 'viewset': generator = ViewSetGenerator(app_config, force) From 38cbab07d2cf7994bc56823afc318e8808d18c96 Mon Sep 17 00:00:00 2001 From: Aleksey Date: Tue, 24 Nov 2015 07:49:38 +0300 Subject: [PATCH 2/4] Add Django 1.9 to the build matrix Adding Django 1.9 to the build matrix --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b10293c..bf59bb6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,9 @@ env: - DJANGO=1.7 DRF=3.2 - DJANGO=1.8 DRF=3.1 - DJANGO=1.8 DRF=3.2 + - DJANGO=1.9 DRF=3.1 + - DJANGO=1.9 DRF=3.2 + - DJANGO=1.9 DRF=3.3 matrix: exclude: - python: "3.5" @@ -24,4 +27,4 @@ install: before_script: - "pep8 drf_generators --exclude=templates && cd tests" script: - - python manage.py test \ No newline at end of file + - python manage.py test From 47d805b1c6bd3cf3d379c45daa657aba4a638cfd Mon Sep 17 00:00:00 2001 From: Aleksey Date: Tue, 24 Nov 2015 07:54:13 +0300 Subject: [PATCH 3/4] fix as recomended --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bf59bb6..8816f6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ env: - DJANGO=1.8 DRF=3.2 - DJANGO=1.9 DRF=3.1 - DJANGO=1.9 DRF=3.2 - - DJANGO=1.9 DRF=3.3 matrix: exclude: - python: "3.5" From 4be1ca18545401d86ca29532b6a1ab21fb9fcfb1 Mon Sep 17 00:00:00 2001 From: Brobin Date: Thu, 4 Feb 2016 22:21:35 -0600 Subject: [PATCH 4/4] remove py32 and py33, add drf3.3 to the build --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8816f6b..d1f3bc1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ language: python python: - "2.7" - - "3.2" - - "3.3" - "3.4" - "3.5" env: @@ -10,8 +8,8 @@ env: - DJANGO=1.7 DRF=3.2 - DJANGO=1.8 DRF=3.1 - DJANGO=1.8 DRF=3.2 - - DJANGO=1.9 DRF=3.1 - DJANGO=1.9 DRF=3.2 + - DJANGO=1.9 DRF=3.3 matrix: exclude: - python: "3.5"