Skip to content
Snippets Groups Projects
Commit 9d263587 authored by Vladimir Iakovlev's avatar Vladimir Iakovlev Committed by GitHub
Browse files

Merge pull request #71 from ivanistheone/fix/argparse

Changes needed to support Django 1.10
parents 4e6fbd03 4380243d
No related branches found
No related tags found
No related merge requests found
...@@ -10,6 +10,7 @@ env: ...@@ -10,6 +10,7 @@ env:
- DJANGO_VERSION=1.7 - DJANGO_VERSION=1.7
- DJANGO_VERSION=1.8 - DJANGO_VERSION=1.8
- DJANGO_VERSION=1.9 - DJANGO_VERSION=1.9
- DJANGO_VERSION=1.10
matrix: matrix:
exclude: exclude:
- python: "3.3" - python: "3.3"
...@@ -22,6 +23,8 @@ matrix: ...@@ -22,6 +23,8 @@ matrix:
env: DJANGO_VERSION=1.7 env: DJANGO_VERSION=1.7
- python: "3.3" - python: "3.3"
env: DJANGO_VERSION=1.9 env: DJANGO_VERSION=1.9
- python: "3.3"
env: DJANGO_VERSION=1.10
before_install: before_install:
- sudo apt-get update -qq - sudo apt-get update -qq
- sudo apt-get install -qq sloccount - sudo apt-get install -qq sloccount
...@@ -35,7 +38,7 @@ install: ...@@ -35,7 +38,7 @@ install:
script: script:
- mkdir /home/travis/test_root/ -p - mkdir /home/travis/test_root/ -p
- export TEST_PROJECT_ROOT=/home/travis/test_root/ - export TEST_PROJECT_ROOT=/home/travis/test_root/
- coverage run runtests.py test djangobower 2>test_out - coverage run runtests.py test djangobower > >(tee stdout.log) 2> >(tee test_out >&2)
after_success: after_success:
- coverage report - coverage report
- pip install --quiet python-coveralls - pip install --quiet python-coveralls
......
...@@ -10,6 +10,10 @@ class BaseBowerCommand(BaseCommand): ...@@ -10,6 +10,10 @@ class BaseBowerCommand(BaseCommand):
requires_system_checks = False requires_system_checks = False
# add fake .options_list for Django>=1.10
if not hasattr(BaseCommand, 'option_list'):
option_list = ()
def handle(self, *args, **options): def handle(self, *args, **options):
self._check_bower_exists() self._check_bower_exists()
bower_adapter.create_components_root() bower_adapter.create_components_root()
......
...@@ -7,8 +7,13 @@ class Command(BaseBowerCommand): ...@@ -7,8 +7,13 @@ class Command(BaseBowerCommand):
help = 'Call bower in components root ({0}).'.format( help = 'Call bower in components root ({0}).'.format(
bower_adapter._components_root) bower_adapter._components_root)
# for Django>=1.10
def add_arguments(self, parser):
parser.add_argument('command', nargs='*')
def handle(self, *args, **options): def handle(self, *args, **options):
super(Command, self).handle(*args, **options) super(Command, self).handle(*args, **options)
args = args or tuple(options.pop('command'))
if self._is_single_command('install', args): if self._is_single_command('install', args):
self._install([]) self._install([])
elif self._is_single_command('freeze', args): elif self._is_single_command('freeze', args):
......
...@@ -5,6 +5,7 @@ from ..base import BaseBowerCommand ...@@ -5,6 +5,7 @@ from ..base import BaseBowerCommand
class Command(BaseBowerCommand): class Command(BaseBowerCommand):
help = 'Install bower apps' help = 'Install bower apps'
# for Django<1.10
option_list = BaseBowerCommand.option_list + ( option_list = BaseBowerCommand.option_list + (
make_option('-F', make_option('-F',
action='store_true', action='store_true',
...@@ -17,6 +18,20 @@ class Command(BaseBowerCommand): ...@@ -17,6 +18,20 @@ class Command(BaseBowerCommand):
default=False, default=False,
help='Allow installing bower packages even when user executing this script is root'), help='Allow installing bower packages even when user executing this script is root'),
) )
# for Django>=1.10
def add_arguments(self, parser):
parser.add_argument('--force',
'-F',
action='store_true',
dest='force',
default=False,
help='Force installation of latest package version on conflict')
parser.add_argument('--allow-root',
'-R',
action='store_true',
dest='allow-root',
default=False,
help='Allow installing bower packages even when user executing this script is root')
def handle(self, *args, **options): def handle(self, *args, **options):
super(Command, self).handle(*args, **options) super(Command, self).handle(*args, **options)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment