lp:~thedac/ubuntu/wily/python-django-compressor/debian-merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/wily/python-django-compressor

Corey Bryant: Approve on 2015-08-20

Ubuntu branches: Pending requested 2015-08-20

Diff: 2565 lines (+680/-930)

53 files modified

.pc/.quilt_patches (+0/-1)
.pc/.quilt_series (+0/-1)
.pc/.version (+0/-1)
.pc/applied-patches (+0/-2)
.pc/disable-coffin-tests.patch/compressor/test_settings.py (+0/-40)
.pc/disable-coffin-tests.patch/compressor/tests/test_offline.py (+0/-499)
.pc/fix-test_settings.py-for-django-1.7.patch/compressor/test_settings.py (+0/-40)
.travis.yml (+15/-10)
AUTHORS (+1/-0)
README.rst (+10/-7)
compressor/__init__.py (+1/-1)
compressor/base.py (+8/-2)
compressor/cache.py (+13/-3)
compressor/conf.py (+2/-0)
compressor/css.py (+1/-1)
compressor/filters/base.py (+27/-3)
compressor/filters/cleancss.py (+10/-0)
compressor/filters/css_default.py (+3/-9)
compressor/js.py (+32/-4)
compressor/management/commands/compress.py (+25/-18)
compressor/offline/django.py (+27/-16)
compressor/parser/__init__.py (+5/-2)
compressor/templates/compressor/js_file.html (+1/-1)
compressor/test_settings.py (+19/-2)
compressor/tests/precompiler.py (+4/-4)
compressor/tests/static/css/filename with spaces.css (+1/-0)
compressor/tests/static/css/utf-8_with-BOM.css (+1/-0)
compressor/tests/static/js/three.js (+1/-0)
compressor/tests/static/js/two.js (+1/-0)
compressor/tests/test_base.py (+66/-3)
compressor/tests/test_filters.py (+135/-59)
compressor/tests/test_jinja2ext.py (+1/-2)
compressor/tests/test_offline.py (+20/-19)
compressor/tests/test_templates/test_block_super_base_compressed/test_compressor_offline.html (+5/-0)
compressor/utils/staticfiles.py (+4/-14)
debian/changelog (+20/-0)
debian/control (+44/-12)
debian/gbp.conf (+1/-1)
debian/patches/disable-coffin-tests.patch (+6/-6)
debian/patches/fix-test_settings.py-for-django-1.7.patch (+0/-16)
debian/patches/remove-failed-test.patch (+43/-0)
debian/patches/series (+1/-1)
debian/rules (+18/-14)
debian/watch (+2/-1)
docs/changelog.txt (+38/-4)
docs/contributing.txt (+5/-4)
docs/django-sekizai.txt (+4/-4)
docs/jinja2.txt (+5/-6)
docs/quickstart.txt (+3/-5)
docs/remote-storages.txt (+5/-7)
docs/settings.txt (+22/-6)
docs/usage.txt (+1/-1)
tox.ini (+23/-78)

api

Related source package recipes

No recipes using this branch. (?)

Related snap packages

Related bugs

Related blueprints

9. By David Ames on 2015-08-20

Fix d/watch

8. By David Ames on 2015-08-20

Sync up d/control

7. By David Ames on 2015-08-20

* Merge from Debian unstable. Remaining changes:
  - d/control: Drop BD on python-coffin.
  - d/p/disable-coffin-tests.patch: Rebase.
* New upstream release.
* Added Python 3 support.
* Removed django 1.7 patche.
* Added patch to not run a unit test that fails:
  - compressor.tests.test_base.JsAsyncDeferTestCase
* Fixed PyPi watch file.

6. By James Page on 2015-01-06

d/control: Drop BD on python-coffin.

5. By James Page on 2014-03-07

* d/control: Drop python-beautifulsoup from BD's (LP: #1252627), its
  only required to run tests and is a optional parser at runtime.
* d/rules: Correct path for django-admin.py so tests actually run,
  even if the result is ignored.

4. By Chuck Short on 2013-07-19

New upstream release.

3. By Thomas Goirand <email address hidden> on 2013-05-12

Uploading to unstable.

2. By Thomas Goirand <email address hidden> on 2012-10-14

Initial release.

1. By Thomas Goirand <email address hidden> on 2012-10-14

Import upstream version 1.2