Merge branch 'release/1.3.3'

.travis.yml

@@ -15,14 +15,19 @@ after_success:
 env:
   - TOXENV=py27-django18
   - TOXENV=py27-django19
+  - TOXENV=py27-django110
 
   - TOXENV=pypy-django18
   - TOXENV=pypy-django19
+  - TOXENV=pypy-django110
 
   - TOXENV=py33-django18
 
   - TOXENV=py34-django18
   - TOXENV=py34-django19
+  - TOXENV=py34-django110
 
   - TOXENV=py35-django18
   - TOXENV=py35-django19
+  - TOXENV=py35-django110
+

Changelog.rst

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+1.3.3
+-----
+
+* Optimization: build a bundle only once. Before, if a bundle was used in
+  multiple templates, it would be bundled again for every appearance. Thanks to
+  **pcompassion** for the report (`#15`_).
+
+.. _#15: https://github.com/sergei-maertens/django-systemjs/issues/15
+
 1.3.2
 -----
 
@@ -31,7 +40,7 @@ Changelog
 
 Fixes loading of the configuration options in tests.
 
-In previous releases, using `django.test.utils.override_settings` in certain
+In previous releases, using ``django.test.utils.override_settings`` in certain
 ways happened before the django-systemjs settings were appended. This was
 probably only the case for Django < 1.9.
 
@@ -78,14 +87,14 @@ Fixes some mistakes from 0.3.3. Mondays...
 
 0.3.3
 -----
-Added post-processing of `jspm_packages/system.js` if it is within
-`settings.STATIC_ROOT`.
+Added post-processing of ``jspm_packages/system.js`` if it is within
+``settings.STATIC_ROOT``.
 
-This introduces a new setting: `SYSTEMJS_PACKAGE_JSON_DIR`. Set this to the path
-of the folder containing `package.json`. `package.json` will be inspected to
+This introduces a new setting: ``SYSTEMJS_PACKAGE_JSON_DIR``. Set this to the path
+of the folder containing ``package.json``. ``package.json`` will be inspected to
 figure out the install path of jspm - and only post-process if the latter path
-is within `settings.STATIC_ROOT`. By default, `settings.BASE_DIR` (provided by
-the default `django-admin.py startproject` template) will be chosen for this
+is within ``settings.STATIC_ROOT``. By default, ``settings.BASE_DIR`` (provided by
+the default ``django-admin.py startproject`` template) will be chosen for this
 directory.
 
 0.3.2
@@ -98,21 +107,21 @@ Fixed incorrect passing of the --log option.
 No API changes where made - this release is preparation for Django 1.9 and
 improves robustness of bundling.
 
-In version 0.16.3 `--log` was added to JSPM. This allows us to properly check
+In version 0.16.3 ``--log`` was added to JSPM. This allows us to properly check
 for build errors, where before you would find out the hard way. Build errors
 will now show as output from the management command.
 
 An check has been added to figure out the JSPM version. If you get a
-`BundleError` saying that the JSPM version could not be determined, check that
-`jspm` is available in your path or modify the `SYSTEMJS_JSPM_EXECUTABLE`
+``BundleError`` saying that the JSPM version could not be determined, check that
+``jspm`` is available in your path or modify the ``SYSTEMJS_JSPM_EXECUTABLE``
 setting accordingly.
 
 
 0.3.0
 -----
 
 Changed the templatetag to add the .js extension. Existing code should still
-work, possibly you need to set System.defaultJSExtensions to `true`.
+work, possibly you need to set System.defaultJSExtensions to ``true``.
 
 
 .. note::

docs/getting_started.rst

@@ -203,6 +203,13 @@ Options
 
         python manage.py systemjs_bundle --sfx
 
+* ``--template, -t``: pass the name of a template (for example ``myapp/base.html``),
+  and Django SystemJS will only look in those files for imported apps. It will
+  no longer parse all project templates. This option can be specified multiple
+  times to look in a set of templates.
+
+  .. note:: Added in 1.4.
+
 
 Example workflow
 ================

docs/index.rst

@@ -35,8 +35,8 @@ and ties in perfectly with ``django.contrib.staticfiles``.
 Requirements
 ============
 
-Django-Systemjs runs on Python 2.7, 3.3, 3.4 and 3.5. Django versions 1.8 and
-1.9 are supported.
+Django-Systemjs runs on Python 2.7, 3.3, 3.4 and 3.5. Django versions 1.8, 1.9 and
+1.10 are supported.
 
 
 

example/jspm_0_17/.gitignore

@@ -0,0 +1,5 @@
+*.sqlite3
+
+staticfiles
+node_modules
+jspm_packages