Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • AlekSIS/libs/django-yarnpkg
  • edward/django-yarnpkg
  • detiste-guest/django-yarnpkg
3 results
Show changes
Commits on Source (2)
Version 6.1.0 (2023-02-19)
=====================================================
* Pass on yarn's exit code
Version 6.0.3 (2022-11-01) Version 6.0.3 (2022-11-01)
===================================================== =====================================================
......
...@@ -24,4 +24,4 @@ class BaseYarnCommand(BaseCommand): ...@@ -24,4 +24,4 @@ class BaseYarnCommand(BaseCommand):
raise YarnNotInstalled() raise YarnNotInstalled()
def _install(self, args): def _install(self, args):
yarn_adapter.install(settings.YARN_INSTALLED_APPS, *args) return yarn_adapter.install(settings.YARN_INSTALLED_APPS, *args)
import sys
from ...yarn import yarn_adapter from ...yarn import yarn_adapter
from ..base import BaseYarnCommand from ..base import BaseYarnCommand
from argparse import REMAINDER from argparse import REMAINDER
...@@ -14,9 +15,10 @@ class Command(BaseYarnCommand): ...@@ -14,9 +15,10 @@ class Command(BaseYarnCommand):
super(Command, self).handle(*args, **options) super(Command, self).handle(*args, **options)
args = args or tuple(options.pop('command')) args = args or tuple(options.pop('command'))
if self._is_single_command('install', args): if self._is_single_command('install', args):
self._install([]) ret = self._install([])
else: else:
yarn_adapter.call_yarn(args) ret = yarn_adapter.call_yarn(args)
sys.exit(ret)
def _is_single_command(self, name, args): def _is_single_command(self, name, args):
return len(args) == 1 and args[0] == name return len(args) == 1 and args[0] == name
import sys
from optparse import make_option from optparse import make_option
from ..base import BaseYarnCommand from ..base import BaseYarnCommand
...@@ -7,4 +8,5 @@ class Command(BaseYarnCommand): ...@@ -7,4 +8,5 @@ class Command(BaseYarnCommand):
def handle(self, *args, **options): def handle(self, *args, **options):
super(Command, self).handle(*args, **options) super(Command, self).handle(*args, **options)
self._install(args) ret = self._install(args)
sys.exit(ret)
...@@ -31,11 +31,11 @@ class YarnAdapter(object): ...@@ -31,11 +31,11 @@ class YarnAdapter(object):
proc = subprocess.Popen( proc = subprocess.Popen(
[self._yarn_path] + list(args), [self._yarn_path] + list(args),
cwd=self._node_modules_root) cwd=self._node_modules_root)
proc.wait() return proc.wait()
def install(self, packages, *options): def install(self, packages, *options):
"""Install packages from yarn""" """Install packages from yarn"""
self.call_yarn(['add'] + list(options) + list(packages)) return self.call_yarn(['add'] + list(options) + list(packages))
def _accumulate_dependencies(self, data): def _accumulate_dependencies(self, data):
"""Accumulate dependencies""" """Accumulate dependencies"""
......
from setuptools import setup, find_packages from setuptools import setup, find_packages
version = '6.0.3' version = '6.1.0'
setup( setup(
name='django-yarnpkg', name='django-yarnpkg',
......